[Pkg-utopia-commits] r2652 - in /packages/experimental/knetworkmanager/debian: changelog rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue Dec 16 03:17:58 2008
New Revision: 2652

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=2652
Log:
Revert r2641, instead add support for both libtool 1.x and 2.x

This is, to shrink the list of dependencies considerably.

Modified:
    packages/experimental/knetworkmanager/debian/changelog
    packages/experimental/knetworkmanager/debian/rules

Modified: packages/experimental/knetworkmanager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/knetworkmanager/debian/changelog?rev=2652&op=diff
==============================================================================
--- packages/experimental/knetworkmanager/debian/changelog (original)
+++ packages/experimental/knetworkmanager/debian/changelog Tue Dec 16 03:17:58 2008
@@ -10,11 +10,10 @@
     - Bump Standards-Version to 3.8.0. Add README.source as recommended by the
       new policy.
   * debian/rules
-    - Do not copy ltmain.sh and libtool.m4 anymore, as this will fail with
-      libtool 2.x.
     - Install autostart desktop file into /usr/share/autostart/.
     - Install icons into /usr/share/icons/hicolor/ so KDE4 can find them.
       Closes: #487303
+    - Add support for both libtool 1.x and 2.x.
   * Switch patch management system to quilt.
   * debian/patches/04-dbus_access.patch
     - Refresh and update.

Modified: packages/experimental/knetworkmanager/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/knetworkmanager/debian/rules?rev=2652&op=diff
==============================================================================
--- packages/experimental/knetworkmanager/debian/rules (original)
+++ packages/experimental/knetworkmanager/debian/rules Tue Dec 16 03:17:58 2008
@@ -11,12 +11,18 @@
 post-patches:: debian/stamp-bootstrap
 
 debian/stamp-bootstrap:
+	! [ -f /usr/share/libtool/ltmain.sh ] || \
+		cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
+	! [ -f /usr/share/libtool/config/ltmain.sh ] || \
+		cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+	
 	make -f admin/Makefile.common cvs
 	touch debian/stamp-bootstrap
 
 binary-install/network-manager-kde::
 	# Install autostart file
-	install -D knetworkmanager-0.7/src/knetworkmanager.desktop \
+	install -D -m 644 knetworkmanager-0.7/src/knetworkmanager.desktop \
 		debian/network-manager-kde/usr/share/autostart/knetworkmanager.desktop
 	# Install icons, so GNOME and KDE4 can find them
 	mv debian/network-manager-kde/usr/share/icons/crystalsvg \
@@ -31,4 +37,6 @@
 	rm -f config.h.in
 	rm -f stamp-h.in
 	rm -f subdirs	
+	rm -f admin/ltmain.sh
+	rm -f admin/libtool.m4.in
 	rm -f debian/stamp-bootstrap