summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-06-18 21:38:30 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-06-18 21:56:35 (GMT)
commit5b88d16b2ea7edfbc1487751fb95f128b2c30330 (patch)
tree372100b92b112ab86a239a2d99e5675d63b46768
parentc63bca677fef97f2cd46ec700641634cb987f335 (diff)
downloadswift-5b88d16b2ea7edfbc1487751fb95f128b2c30330.zip
swift-5b88d16b2ea7edfbc1487751fb95f128b2c30330.tar.bz2
Fixed Debian manpages installation.
-rw-r--r--Swift/Packaging/Debian/debian/control.in2
-rw-r--r--Swift/Packaging/Debian/debian/libswiften-dev.manpages1
-rw-r--r--Swift/Packaging/Debian/debian/libswiften.manpages1
-rw-r--r--Swift/Packaging/Debian/debian/swift-im.manpages2
-rw-r--r--Swift/Packaging/Debian/debian/swift.1 (renamed from Swift/Packaging/Debian/debian/manpages/swift.1)0
-rw-r--r--Swift/Packaging/Debian/debian/swiften-config.1 (renamed from Swift/Packaging/Debian/debian/manpages/swiften-config.1)0
-rwxr-xr-xSwift/Packaging/Debian/package.sh2
7 files changed, 4 insertions, 4 deletions
diff --git a/Swift/Packaging/Debian/debian/control.in b/Swift/Packaging/Debian/debian/control.in
index 0c0b273..572840b 100644
--- a/Swift/Packaging/Debian/debian/control.in
+++ b/Swift/Packaging/Debian/debian/control.in
@@ -36,6 +36,6 @@ Package: swift-im-dbg
Architecture: any
Section: debug
Priority: extra
-Depends: swift-im (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: swift-im (= ${binary:Version}), ${misc:Depends}
Description: Debugging symbols for swift-im.
The Swift IM client.
diff --git a/Swift/Packaging/Debian/debian/libswiften-dev.manpages b/Swift/Packaging/Debian/debian/libswiften-dev.manpages
new file mode 100644
index 0000000..6424391
--- /dev/null
+++ b/Swift/Packaging/Debian/debian/libswiften-dev.manpages
@@ -0,0 +1 @@
+debian/swiften-config.1
diff --git a/Swift/Packaging/Debian/debian/libswiften.manpages b/Swift/Packaging/Debian/debian/libswiften.manpages
deleted file mode 100644
index 8795c12..0000000
--- a/Swift/Packaging/Debian/debian/libswiften.manpages
+++ /dev/null
@@ -1 +0,0 @@
-manpages/swiften-config.1
diff --git a/Swift/Packaging/Debian/debian/swift-im.manpages b/Swift/Packaging/Debian/debian/swift-im.manpages
index 5e83a38..f3fb91e 100644
--- a/Swift/Packaging/Debian/debian/swift-im.manpages
+++ b/Swift/Packaging/Debian/debian/swift-im.manpages
@@ -1 +1 @@
-manpages/swift.1
+debian/swift.1
diff --git a/Swift/Packaging/Debian/debian/manpages/swift.1 b/Swift/Packaging/Debian/debian/swift.1
index 6626b40..6626b40 100644
--- a/Swift/Packaging/Debian/debian/manpages/swift.1
+++ b/Swift/Packaging/Debian/debian/swift.1
diff --git a/Swift/Packaging/Debian/debian/manpages/swiften-config.1 b/Swift/Packaging/Debian/debian/swiften-config.1
index 3717df6..3717df6 100644
--- a/Swift/Packaging/Debian/debian/manpages/swiften-config.1
+++ b/Swift/Packaging/Debian/debian/swiften-config.1
diff --git a/Swift/Packaging/Debian/package.sh b/Swift/Packaging/Debian/package.sh
index b98f29d..5ccb6c1 100755
--- a/Swift/Packaging/Debian/package.sh
+++ b/Swift/Packaging/Debian/package.sh
@@ -40,8 +40,8 @@ ln -s Swift/Packaging/Debian/debian $DIRNAME/debian
../../../BuildTools/UpdateDebianChangelog.py $DIRNAME/debian/changelog $DEBIAN_VERSION
cat $DIRNAME/debian/control.in | sed -e "s/%SWIFTEN_SOVERSION%/$SWIFTEN_SOVERSION/g" > $DIRNAME/debian/control
mv $DIRNAME/debian/libswiften.install $DIRNAME/debian/libswiften$SWIFTEN_SOVERSION.install
-mv $DIRNAME/debian/libswiften.manpages $DIRNAME/debian/libswiften$SWIFTEN_SOVERSION.manpages
mv $DIRNAME/debian/libswiften-dev.install $DIRNAME/debian/libswiften$SWIFTEN_SOVERSION-dev.install
+mv $DIRNAME/debian/libswiften-dev.manpages $DIRNAME/debian/libswiften$SWIFTEN_SOVERSION-dev.manpages
# Build
cd $DIRNAME