[SCM] KTorrent Debian packaging. branch, experimental, updated. master/3.2.3+dfsg.1-1-16-g6ddfd06
Modestas Vainius
modax-guest at alioth.debian.org
Tue Aug 11 10:54:54 UTC 2009
The following commit has been merged in the experimental branch:
commit 86d7754ac198c998988e04171befb6aa1af5ce53
Merge: 0f9f7a010c87826323880f1948db2a73b312e4d7 a7b496d874528695603d70492c5d8b45df92ea35
Author: Modestas Vainius <modestas at vainius.eu>
Date: Tue Aug 11 12:16:18 2009 +0300
Merge branch 'master' into experimental
Conflicts:
debian/changelog
debian/changelog | 29 +++++--
debian/control | 4 +-
debian/debhelper/cmake.mk | 25 ------
debian/debhelper/kde.mk | 85 --------------------
.../debian/qt_4.5.2-1_phonon_ftbfs_fix.diff | 26 ++++++
.../general/qt_tracker_default_https_port_fix.diff | 35 --------
debian/patches/series | 2 +-
debian/rules | 13 ++--
8 files changed, 59 insertions(+), 160 deletions(-)
diff --combined debian/changelog
index 1b213f1,083ba23..1cc6dc4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,24 -1,26 +1,41 @@@
+ktorrent (3.3~~svn975833-1) experimental; urgency=low
- ktorrent (3.3~~svn975833-2) UNRELEASED; urgency=low
-
- *
-
- -- Modestas Vainius <modestas at vainius.eu> Tue, 02 Jun 2009 00:26:10 +0300
-
+
+ * New upstream development snapshot:
+ - Last Changed Author: guisson
+ - Last Changed Rev: 975833
+ - Last Changed Date: 2009-05-31 14:16:26 +0300
+ * Change ktorrent-dbg section to debug.
+ * Bump debhelper build depend to 7.0.50.
+ * Bump Standards-Version to 3.8.1 (no changes needed).
+ * Clean up prune-tarball: some files were removed upstream,
+ there is no need to rm them.
+ * Update ktorrent.install: add a shutdown plugin.
+
+ -- Modestas Vainius <modestas at vainius.eu> Mon, 01 Jun 2009 03:47:07 +0300
+
+ ktorrent (3.2.3+dfsg.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Make use of debhelper 7.3 cmake support:
+ - build depend on debhelper 7.3;
+ - build depend on pkg-kde-tools 0.4.11 (for debhelper/kde.mk);
+ - drop custom debian/debhelper snippets;
+ - adjust debian/rules accordingly.
+ * Drop quilt from build depends: unused at the moment.
+ * Bump Standards-Version to 3.8.2. No changed needed.
+ * Add patch debian/qt_4.5.2-1_phonon_ftbfs_fix which workarounds a FTBFS
+ against Qt 4.5.2-1 (Closes: #537023).
+ * Enable quilt.
+
+ -- Modestas Vainius <modestas at vainius.eu> Tue, 11 Aug 2009 10:19:52 +0300
+
+ ktorrent (3.2.2+dfsg.2-1) unstable; urgency=low
+
+ * New upstream tarball for 3.2.2 (3.2.2-1).
+ * Remove general/qt_tracker_default_https_port_fix.diff, fixed upstream.
+
+ -- Modestas Vainius <modestas at vainius.eu> Wed, 03 Jun 2009 21:47:18 +0300
+
ktorrent (3.2.2+dfsg.1-1) unstable; urgency=low
* New upstream release.
diff --combined debian/rules
index 6e8418c,34de03b..a3319d9
--- a/debian/rules
+++ b/debian/rules
@@@ -1,25 -1,26 +1,26 @@@
#!/usr/bin/make -f
- # THIS_SHOULD_GO_TO_UNSTABLE=1
-
- DEB_CMAKE_CUSTOM_FLAGS += -DWITH_SYSTEM_GEOIP:BOOL=ON \
+ DEB_CMAKE_CUSTOM_FLAGS += -DCMAKE_USE_RELATIVE_PATHS=ON \
+ -DWITH_SYSTEM_GEOIP:BOOL=ON \
-DWITH_BUILTIN_COUNTRY_FLAGS:BOOL=OFF
DEB_KDE_LINK_WITH_AS_NEEDED := yes
- DH := dh --with quilt
ifneq (,$(shell which tg))
- include /usr/share/quilt/quilt.make
+ QUILT_PATCH_DIR := debian/patches
include /usr/share/topgit/tg2quilt.mk
endif
- include debian/debhelper/kde.mk
+ include /usr/share/pkg-kde-tools/makefiles/1/debhelper/kde.mk
+
+ %:
+ dh --dbg-package=ktorrent-dbg --with quilt $@
prune-tarball:
# Remove non-free components: flags and geoip stuff
rm -f plugins/infowidget/geoip/*.png
rm -f plugins/infowidget/geoip/FLAGS_LICENCE
- rm -f plugins/infowidget/geoip/geoip.dat
- rm -f plugins/infowidget/geoip/GeoIP-LICENSE.txt
+# rm -f plugins/infowidget/geoip/geoip.dat
+# rm -f plugins/infowidget/geoip/GeoIP-LICENSE.txt
rm -f plugins/infowidget/GeoIP.c
rm -f plugins/infowidget/GeoIP.h
.PHONY: prune-tarball
--
KTorrent Debian packaging.
More information about the pkg-kde-commits
mailing list