[Pkg-xfce-commits] r104 - in desktop/trunk: libxfce4util/debian libxfcegui4/debian

Simon Huggins huggie-guest@costa.debian.org
Sun, 15 May 2005 13:08:58 +0000


Author: huggie-guest
Date: 2005-05-15 13:08:58 +0000 (Sun, 15 May 2005)
New Revision: 104

Modified:
   desktop/trunk/libxfce4util/debian/changelog
   desktop/trunk/libxfce4util/debian/rules
   desktop/trunk/libxfcegui4/debian/changelog
   desktop/trunk/libxfcegui4/debian/control
   desktop/trunk/libxfcegui4/debian/rules
Log:
Fixup upstream's soname breakage.  This should help upgrades.


Modified: desktop/trunk/libxfce4util/debian/changelog
===================================================================
--- desktop/trunk/libxfce4util/debian/changelog	2005-05-15 11:20:37 UTC (rev 103)
+++ desktop/trunk/libxfce4util/debian/changelog	2005-05-15 13:08:58 UTC (rev 104)
@@ -1,3 +1,9 @@
+libxfce4util (4.2.1-2) experimental; urgency=low
+
+  * Fix shlibs to be > 4.2.0 to help fix upstream's soname breakage
+  
+ -- Simon Huggins <huggie@earth.li>  Sun, 15 May 2005 13:58:22 +0100
+
 libxfce4util (4.2.1-1) experimental; urgency=low
 
   * ML: New Upstream Release (Xfce 4.2.1)

Modified: desktop/trunk/libxfce4util/debian/rules
===================================================================
--- desktop/trunk/libxfce4util/debian/rules	2005-05-15 11:20:37 UTC (rev 103)
+++ desktop/trunk/libxfce4util/debian/rules	2005-05-15 13:08:58 UTC (rev 104)
@@ -66,9 +66,9 @@
 	dh_fixperms
 	
 	dh_installdeb
-	dh_makeshlibs
+	dh_makeshlibs -V 'libxfce4util-1 (>= 4.2.0)'
 
-	dh_shlibdeps -l`pwd`/debian/libxfce4util-1/usr/lib
+	dh_shlibdeps
 	dh_gencontrol
 	
 	dh_md5sums

Modified: desktop/trunk/libxfcegui4/debian/changelog
===================================================================
--- desktop/trunk/libxfcegui4/debian/changelog	2005-05-15 11:20:37 UTC (rev 103)
+++ desktop/trunk/libxfcegui4/debian/changelog	2005-05-15 13:08:58 UTC (rev 104)
@@ -4,8 +4,10 @@
                                                                closes: #309180
   * Add dependency on libstartup-notification0-dev to the -dev package
                                                                closes: #309145
+  * Depend on the version of util that has a versioned shlibs so that we can
+    fix upgrade issues (thanks to Kurt Koeckx)
 
- -- Simon Huggins <huggie@earth.li>
+ -- Simon Huggins <huggie@earth.li>  Sun, 15 May 2005 11:29:18 +0000
 
 libxfcegui4 (4.2.1-1) experimental; urgency=low
 

Modified: desktop/trunk/libxfcegui4/debian/control
===================================================================
--- desktop/trunk/libxfcegui4/debian/control	2005-05-15 11:20:37 UTC (rev 103)
+++ desktop/trunk/libxfcegui4/debian/control	2005-05-15 13:08:58 UTC (rev 104)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel@lists.alioth.debian.org>
 Uploaders: Martin Loschwitz <madkiss@debian.org>, Emanuele Rocca <ema@debian.org>, Simon Huggins <huggie@earth.li>
-Build-Depends: debhelper (>> 4.0.0), libgtk2.0-dev, bison, libxft-dev, libxfce4util-dev (>= 4.2.1-1), xlibs-static-pic, libxt-dev, libdbh1.0-dev (>= 1.0.20-1), libxml2-dev, libstartup-notification0-dev
+Build-Depends: debhelper (>> 4.0.0), libgtk2.0-dev, bison, libxft-dev, libxfce4util-dev (>= 4.2.1-2), xlibs-static-pic, libxt-dev, libdbh1.0-dev (>= 1.0.20-1), libxml2-dev, libstartup-notification0-dev
 Standards-Version: 3.6.1
 
 Package: libxfcegui4-dev

Modified: desktop/trunk/libxfcegui4/debian/rules
===================================================================
--- desktop/trunk/libxfcegui4/debian/rules	2005-05-15 11:20:37 UTC (rev 103)
+++ desktop/trunk/libxfcegui4/debian/rules	2005-05-15 13:08:58 UTC (rev 104)
@@ -67,7 +67,7 @@
 	dh_installdeb
 	dh_makeshlibs
 	
-	dh_shlibdeps -l`pwd`/debian/libxfcegui4-1/usr/lib
+	dh_shlibdeps
 	dh_gencontrol
 	
 	dh_md5sums