rev 6808 - kde-extras/ktorrent/trunk/debian

[Modestas Vainius]

Author: modax-guest
Date: 2007-07-23 18:52:29 +0000 (Mon, 23 Jul 2007)
New Revision: 6808

Modified:
   kde-extras/ktorrent/trunk/debian/README.Debian
   kde-extras/ktorrent/trunk/debian/changelog
   kde-extras/ktorrent/trunk/debian/rules
Log:
2.2.1 is ready to go to unstable


Modified: kde-extras/ktorrent/trunk/debian/README.Debian
===================================================================
--- kde-extras/ktorrent/trunk/debian/README.Debian	2007-07-23 06:11:16 UTC (rev 6807)
+++ kde-extras/ktorrent/trunk/debian/README.Debian	2007-07-23 18:52:29 UTC (rev 6808)
@@ -17,13 +17,12 @@
 system once you obtain a proper database file (geoip.dat).
 
 The KTorrent builtin country flag images are also not distributed with this
-package due to obscure license. However, KTorrent has been patched to use
-country flag images provided by the kdebase-data package. If you would like
-to see country flags next to the country names, please install kdebase-data
-package (that is recommended by the ktorrent binary package).
+package due to obscure license. If you would like to see country flags next
+to the country names, please install kdebase-data package (that is
+recommended by the ktorrent binary package).
 
 The commands used to modify upstream source tarball can be found at debian/rules 
 "prune-tarball" target.
 
- -- Modestas Vainius <modestas at vainius.eu>  Sun, 04 Jul 2007 15:07:07 +0300
+ -- Modestas Vainius <modestas at vainius.eu>  Mon, 23 Jul 2007 21:25:17 +0300
 

Modified: kde-extras/ktorrent/trunk/debian/changelog
===================================================================
--- kde-extras/ktorrent/trunk/debian/changelog	2007-07-23 06:11:16 UTC (rev 6807)
+++ kde-extras/ktorrent/trunk/debian/changelog	2007-07-23 18:52:29 UTC (rev 6808)
@@ -1,12 +1,14 @@
-ktorrent (2.2.1.dfsg.1-1~pre1) UNRELEASED; urgency=low
+ktorrent (2.2.1.dfsg.1-1) unstable; urgency=low
 
   * New upstream release:
-    - Fixes a few output format issues with ktshell. Thanks to Avi Rozen
-      <avi.rozen at mobileye.com> for the patches (Closes: #432433, #432655).
+    - Fixes a few output format issues with ktshell. Thanks to
+      Avi Rozen for the patches (Closes: #432433, #432655).
+    - Also fixes the file selection bug and a number of other bugs.
   * Corrent README.Debian. The patches mentioned there have been merged
     upstream.
+  * Don't build with --enable-final on arm.
 
- -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Mon, 16 Jul 2007 15:20:58 +0300
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Mon, 23 Jul 2007 21:47:47 +0300
 
 ktorrent (2.2.0.dfsg.1-1) unstable; urgency=low
 

Modified: kde-extras/ktorrent/trunk/debian/rules
===================================================================
--- kde-extras/ktorrent/trunk/debian/rules	2007-07-23 06:11:16 UTC (rev 6807)
+++ kde-extras/ktorrent/trunk/debian/rules	2007-07-23 18:52:29 UTC (rev 6808)
@@ -7,6 +7,7 @@
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 include /usr/share/quilt/quilt.make
 
@@ -21,6 +22,13 @@
 	CXXFLAGS += -O2
 endif
 
+# Disable --enable-final on arm to hopefully make it build
+ifeq ($(DEB_HOST_ARCH),arm)
+    ENABLE_FINAL :=
+else
+    ENABLE_FINAL := --enable-final
+endif
+
 config.status: $(QUILT_STAMPFN)
 	dh_testdir
 	test -L config.sub || ln -sf /usr/share/misc/config.sub config.sub
@@ -29,7 +37,7 @@
 	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \
 		--build=$(DEB_BUILD_GNU_TYPE) \
 		--prefix=/usr --mandir=\$${prefix}/share/man --disable-rpath \
-		--enable-final --enable-largefile \
+		$(ENABLE_FINAL) --enable-largefile \
 		--enable-system-geoip --disable-builtin-country-flags