rev 3393 - trunk/packages/kdepim/debian

[Pierre Habouzit]

Author: madcoder
Date: 2006-03-29 14:26:51 +0000 (Wed, 29 Mar 2006)
New Revision: 3393

Modified:
   trunk/packages/kdepim/debian/changelog
   trunk/packages/kdepim/debian/control
   trunk/packages/kdepim/debian/rules
Log:
fix a FTBFS with last cdbs.

Aurelien Jarno was bitten by that.
I guess the amd64 buildd's may also, if kdepim has not been built already.



Modified: trunk/packages/kdepim/debian/changelog
===================================================================
--- trunk/packages/kdepim/debian/changelog	2006-03-29 14:26:23 UTC (rev 3392)
+++ trunk/packages/kdepim/debian/changelog	2006-03-29 14:26:51 UTC (rev 3393)
@@ -8,8 +8,11 @@
   +++ Changes by Pierre Habouzit:
 
   * Update debian/control for kfreebsd-* ports.
+  * Remove DEB_DH_SHLIBDEPS_ARGS_$(cdbs_curpkg) hack, now handled by cdbs.
+    + Causes a FTBFS with cdbs >= 0.4.37.
+    + Update cdbs build-dependency accordingly.
 
- -- Pierre Habouzit <madcoder at debian.org>  Mon, 27 Mar 2006 15:16:56 +0200
+ -- Pierre Habouzit <madcoder at debian.org>  Wed, 29 Mar 2006 16:21:22 +0200
 
 kdepim (4:3.5.0-2) alioth; urgency=medium
 

Modified: trunk/packages/kdepim/debian/control
===================================================================
--- trunk/packages/kdepim/debian/control	2006-03-29 14:26:23 UTC (rev 3392)
+++ trunk/packages/kdepim/debian/control	2006-03-29 14:26:51 UTC (rev 3393)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Daniel Schepler <schepler at debian.org>
-Build-Depends: g++-3.4 [arm m68k hppa], autoconf, automake1.9, bison, byacc, bzip2, cdbs (>= 0.4.27), debhelper (>= 5), flex, gawk, gettext, groff-base, kdelibs4-dev (>= 4:3.5.0), libbluetooth1-dev [!kfreebsd-i386 !kfreebsd-amd64], libgnokii2-dev (>= 0.6.5), libgpgme11-dev, liblockdev1-dev, libmal-dev, libpisock-dev, libreadline5-dev, libsasl2-dev, libssl-dev, libtool (>= 1.5), libxpm-dev, libxss-dev, sharutils, texinfo
+Build-Depends: g++-3.4 [arm m68k hppa], autoconf, automake1.9, bison, byacc, bzip2, cdbs (>= 0.4.37), debhelper (>= 5), flex, gawk, gettext, groff-base, kdelibs4-dev (>= 4:3.5.0), libbluetooth1-dev [!kfreebsd-i386 !kfreebsd-amd64], libgnokii2-dev (>= 0.6.5), libgpgme11-dev, liblockdev1-dev, libmal-dev, libpisock-dev, libreadline5-dev, libsasl2-dev, libssl-dev, libtool (>= 1.5), libxpm-dev, libxss-dev, sharutils, texinfo
 Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, qt3-doc, kdelibs4-doc
 Build-Conflicts: libkleopatra0-dev
 Standards-Version: 3.6.2

Modified: trunk/packages/kdepim/debian/rules
===================================================================
--- trunk/packages/kdepim/debian/rules	2006-03-29 14:26:23 UTC (rev 3392)
+++ trunk/packages/kdepim/debian/rules	2006-03-29 14:26:51 UTC (rev 3393)
@@ -60,7 +60,6 @@
 
 # kontact starts fine without korganizer or kpilot dependencies
 # specialdates is only in recommends to get the kaddressbook dependency there
-DEB_DH_SHLIBDEPS_ARGS += $(DEB_DH_SHLIBDEPS_ARGS_$(cdbs_curpkg))
 kontact_recommends_plugins := korganizer specialdates
 kontact_suggests_plugins := journal kpilot todo