diff options
author | Remko Tronçon <git@el-tramo.be> | 2011-06-18 15:57:50 (GMT) |
---|---|---|
committer | Remko Tronçon <git@el-tramo.be> | 2011-06-18 15:57:50 (GMT) |
commit | ed0dbffeb8a3b36965d359c8a689bdb41372e481 (patch) | |
tree | d0fd5ff47f95516346832c08c4511740817b762c /Swift/Packaging/Debian/debian | |
parent | c20ecae7c569befc8c970f839ce9e14410c118fb (diff) | |
parent | e45f1cc4ef85ea32b8307f25d22737906a87672c (diff) | |
download | swift-ed0dbffeb8a3b36965d359c8a689bdb41372e481.zip swift-ed0dbffeb8a3b36965d359c8a689bdb41372e481.tar.bz2 |
Merge branch 'swift-1.x'
* swift-1.x:
More Debian packaging tweaks.
Diffstat (limited to 'Swift/Packaging/Debian/debian')
-rw-r--r-- | Swift/Packaging/Debian/debian/changelog | 11 | ||||
-rw-r--r-- | Swift/Packaging/Debian/debian/control.in | 4 | ||||
-rwxr-xr-x | Swift/Packaging/Debian/debian/rules | 17 |
3 files changed, 15 insertions, 17 deletions
diff --git a/Swift/Packaging/Debian/debian/changelog b/Swift/Packaging/Debian/debian/changelog index 9e81511..e69de29 100644 --- a/Swift/Packaging/Debian/debian/changelog +++ b/Swift/Packaging/Debian/debian/changelog @@ -1,11 +0,0 @@ -swift-im (1.0~beta2-1) unstable; urgency=low - - * Upstream release - - -- Swift Package Maintainer <packages@swift.im> Sat, 26 Sep 2009 11:08:32 +0200 - -swift-im (1.0~beta1-1) unstable; urgency=low - - * Upstream release - - -- Swift Package Maintaner <packages@swift.im> Sat, 26 Sep 2009 11:08:32 +0200 diff --git a/Swift/Packaging/Debian/debian/control.in b/Swift/Packaging/Debian/debian/control.in index 95bc159..24ef6d8 100644 --- a/Swift/Packaging/Debian/debian/control.in +++ b/Swift/Packaging/Debian/debian/control.in @@ -3,7 +3,9 @@ Section: net Priority: optional Maintainer: Swift Package Maintainer <packages@swift.im> Build-Depends: debhelper (>= 7), scons (>= 1.2.0), libssl-dev (>= 0.9.8g), libqt4-dev (>= 4.5.0), libexpat1-dev (>= 2.0.1), lintian (>= 2.2.5), libxss-dev (>= 1.2.0), libboost-dev (>= 1.34.1), libboost-filesystem-dev (>= 1.34.1), libboost-program-options-dev (>= 1.34.1), libboost-regex-dev (>= 1.34.1), libboost-signals-dev (>= 1.34.1), libboost-system-dev (>= 1.34.1), libboost-thread-dev (>= 1.34.1), libboost-date-time-dev (>= 1.34.1), libidn11-dev (>= 1.10), docbook-xsl (>= 1.75.0), docbook-xml (>= 4.5), xsltproc, libxml2-utils -Standards-Version: 3.8.4 +Standards-Version: 3.9.1 +Vcs-Git: git://swift.im/swift +Vcs-Browser: http://swift.im/git/swift Homepage: http://swift.im Package: libswiften%SWIFTEN_SOVERSION% diff --git a/Swift/Packaging/Debian/debian/rules b/Swift/Packaging/Debian/debian/rules index 8069c33..4105fec 100755 --- a/Swift/Packaging/Debian/debian/rules +++ b/Swift/Packaging/Debian/debian/rules @@ -2,19 +2,26 @@ #export DH_VERBOSE=1 +SCONS_FLAGS=V=1 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 + +clean: + dh_testdir + dh_clean + scons $(SCONS_FLAGS) $(SCONS_EXTRA_FLAGS) SWIFT_INSTALLDIR=$(CURDIR)/debian/tmp/usr SWIFTEN_INSTALLDIR=$(CURDIR)/debian/tmp/usr -c + -rm -rf .scon* + -rm -rf config.log + configure: build: configure - -clean: + dh_testdir + scons $(SCONS_FLAGS) $(SCONS_EXTRA_FLAGS) Swift Swiften install: build - dh_testdir 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/tmp/usr SWIFTEN_INSTALLDIR=$(CURDIR)/debian/tmp/usr $(CURDIR)/debian/tmp - + scons $(SCONS_FLAGS) $(SCONS_EXTRA_FLAGS) SWIFT_INSTALLDIR=$(CURDIR)/debian/tmp/usr SWIFTEN_INSTALLDIR=$(CURDIR)/debian/tmp/usr $(CURDIR)/debian/tmp binary-indep: install binary-arch: install |