summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-04-30 09:28:26 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-04-30 09:43:04 (GMT)
commita10cc927d11bf5a2ef30c07e168922b192a52561 (patch)
tree0123f973657c12b5805158ac0f9ecaabce75141b
parentef641a262d27ef027de3e69733200044e13d02c5 (diff)
downloadswift-contrib-a10cc927d11bf5a2ef30c07e168922b192a52561.zip
swift-contrib-a10cc927d11bf5a2ef30c07e168922b192a52561.tar.bz2
Only install the necessary files in the Debian package.
-rw-r--r--Swift/Packaging/Debian/.gitignore4
-rwxr-xr-xSwift/Packaging/Debian/debian/rules7
-rw-r--r--Swift/Packaging/Debian/debian/swift-im.install3
3 files changed, 7 insertions, 7 deletions
diff --git a/Swift/Packaging/Debian/.gitignore b/Swift/Packaging/Debian/.gitignore
index 33ec6c8..d67fb54 100644
--- a/Swift/Packaging/Debian/.gitignore
+++ b/Swift/Packaging/Debian/.gitignore
@@ -1,2 +1,2 @@
-swift-*
-swift_*
+/swift-*
+/swift_*
diff --git a/Swift/Packaging/Debian/debian/rules b/Swift/Packaging/Debian/debian/rules
index 0c84852..d237c86 100755
--- a/Swift/Packaging/Debian/debian/rules
+++ b/Swift/Packaging/Debian/debian/rules
@@ -13,17 +13,14 @@ install: build
dh_testroot
dh_prep
dh_installdirs
- scons $(SCONS_FLAGS) optimize=1 debug=1 allow_warnings=1 swiften_dll=1 qt=/usr/share/qt4 docbook_xsl=/usr/share/xml/docbook/stylesheet/docbook-xsl docbook_xml=/usr/share/xml/docbook/schema/dtd/4.5 SWIFT_INSTALLDIR=$(CURDIR)/debian/swift-im/usr SWIFTEN_INSTALLDIR=$(CURDIR)/debian/swift-im/usr $(CURDIR)/debian/swift-im
- #mv $(CURDIR)/debian/swift-im/usr/bin/swift $(CURDIR)/debian/swift-im/usr/bin/swift-im
- #mv $(CURDIR)/debian/swift-im/usr/share/pixmaps/swift.xpm $(CURDIR)/debian/swift-im/usr/share/pixmaps/swift-im.xpm
- #mv $(CURDIR)/debian/swift-im/usr/share/swift $(CURDIR)/debian/swift-im/usr/share/swift-im
- #mv $(CURDIR)/debian/swift-im/usr/share/applications/swift.desktop $(CURDIR)/debian/swift-im/usr/share/applications/swift-im.desktop
+ scons $(SCONS_FLAGS) optimize=1 debug=1 allow_warnings=1 swiften_dll=1 qt=/usr/share/qt4 docbook_xsl=/usr/share/xml/docbook/stylesheet/docbook-xsl docbook_xml=/usr/share/xml/docbook/schema/dtd/4.5 SWIFT_INSTALLDIR=$(CURDIR)/debian/tmp/usr SWIFTEN_INSTALLDIR=$(CURDIR)/debian/tmp/usr $(CURDIR)/debian/tmp
binary-indep: install
binary-arch: install
dh_testdir
dh_testroot
+ dh_install --sourcedir=debian/tmp
dh_installchangelogs
dh_installdocs
dh_installmenu
diff --git a/Swift/Packaging/Debian/debian/swift-im.install b/Swift/Packaging/Debian/debian/swift-im.install
new file mode 100644
index 0000000..d4cf441
--- /dev/null
+++ b/Swift/Packaging/Debian/debian/swift-im.install
@@ -0,0 +1,3 @@
+usr/bin/swift
+usr/share
+usr/lib/libSwiften.so.?