rev 3069 - in trunk/packages/kdenetwork/debian: . patches

[Christopher Martin]

Author: chrsmrtn
Date: 2006-02-01 21:40:21 +0000 (Wed, 01 Feb 2006)
New Revision: 3069

Added:
   trunk/packages/kdenetwork/debian/patches/18_meanwhile_gsize.diff
Modified:
   trunk/packages/kdenetwork/debian/changelog
   trunk/packages/kdenetwork/debian/rules
Log:
New kdenetwork upload, which I hope will fix the FTBFS...

New patch for the FTBFS. Bump shlibs due to massive changes in BRANCH.


Modified: trunk/packages/kdenetwork/debian/changelog
===================================================================
--- trunk/packages/kdenetwork/debian/changelog	2006-02-01 21:39:23 UTC (rev 3068)
+++ trunk/packages/kdenetwork/debian/changelog	2006-02-01 21:40:21 UTC (rev 3069)
@@ -1,3 +1,17 @@
+kdenetwork (4:3.5.1-2) unstable; urgency=low
+
+  +++ Changes by Christopher Martin:
+
+  * KDE_3_5_BRANCH update (up to r504660).
+
+  * Add a patch (to the last upload's meanwhile patch) which should resolve a
+    FTBFS on architectures where "gsize" isn't the same size as "int".
+    (Closes: #350872)
+
+  * Upload to unstable.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed,  1 Feb 2006 16:31:46 -0500
+
 kdenetwork (4:3.5.1-1) unstable; urgency=low
 
   +++ Changes by Isaac Clerencia:

Added: trunk/packages/kdenetwork/debian/patches/18_meanwhile_gsize.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/18_meanwhile_gsize.diff	2006-02-01 21:39:23 UTC (rev 3068)
+++ trunk/packages/kdenetwork/debian/patches/18_meanwhile_gsize.diff	2006-02-01 21:40:21 UTC (rev 3069)
@@ -0,0 +1,11 @@
+--- kde.orig/kopete/protocols/meanwhile/meanwhilesession.cpp
++++ kde.patched/kopete/protocols/meanwhile/meanwhilesession.cpp
+@@ -584,7 +584,7 @@
+ }
+ 
+ int MeanwhileSession::handleSessionIOWrite(const guchar *buffer,
+-        unsigned int count)
++        gsize count)
+ {
+     HERE;
+ 

Modified: trunk/packages/kdenetwork/debian/rules
===================================================================
--- trunk/packages/kdenetwork/debian/rules	2006-02-01 21:39:23 UTC (rev 3068)
+++ trunk/packages/kdenetwork/debian/rules	2006-02-01 21:40:21 UTC (rev 3069)
@@ -11,8 +11,8 @@
 
 PACKAGES_WITH_LIBS := librss1 kopete ksirc kwifimanager
 
-DEB_DH_MAKESHLIBS_ARGS_librss1	:= -V'librss1 (>= 4:3.5.1-1)'
-DEB_DH_MAKESHLIBS_ARGS_kopete	:= -V'kopete (>= 4:3.5.1-1)'
+DEB_DH_MAKESHLIBS_ARGS_librss1	:= -V'librss1 (>= 4:3.5.1-2)'
+DEB_DH_MAKESHLIBS_ARGS_kopete	:= -V'kopete (>= 4:3.5.1-2)'
 
 #shlibs_ver = 4:3.5.0-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))