[Pkg-utopia-commits] r2619 - in /packages/experimental/network-manager-pptp/debian: changelog network-manager-pptp-gnome.install network-manager-pptp.install rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Mon Dec 15 22:41:26 2008
New Revision: 2619

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=2619
Log:
* debian/rules
  - Install plugins into /usr/lib/NetworkManager, so NetworkManager can find
    them.
* debian/*.install
  - Update accordingly.

Modified:
    packages/experimental/network-manager-pptp/debian/changelog
    packages/experimental/network-manager-pptp/debian/network-manager-pptp-gnome.install
    packages/experimental/network-manager-pptp/debian/network-manager-pptp.install
    packages/experimental/network-manager-pptp/debian/rules

Modified: packages/experimental/network-manager-pptp/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/network-manager-pptp/debian/changelog?rev=2619&op=diff
==============================================================================
--- packages/experimental/network-manager-pptp/debian/changelog (original)
+++ packages/experimental/network-manager-pptp/debian/changelog Mon Dec 15 22:41:26 2008
@@ -6,6 +6,11 @@
       Uploaders.
     - Update Vcs-* fields.
     - Add Homepage: field.
+  * debian/rules
+    - Install plugins into /usr/lib/NetworkManager, so NetworkManager can find
+      them.
+  * debian/*.install
+    - Update accordingly.
   * Switch patch management system to quilt.
   * debian/patches/icon-name.patch
     - Rename and refresh patch to apply cleanly.

Modified: packages/experimental/network-manager-pptp/debian/network-manager-pptp-gnome.install
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/network-manager-pptp/debian/network-manager-pptp-gnome.install?rev=2619&op=diff
==============================================================================
--- packages/experimental/network-manager-pptp/debian/network-manager-pptp-gnome.install (original)
+++ packages/experimental/network-manager-pptp/debian/network-manager-pptp-gnome.install Mon Dec 15 22:41:26 2008
@@ -1,7 +1,6 @@
-usr/lib/network-manager-pptp/*.so*
-usr/lib/network-manager-pptp/nm-ppp-auth-dialog
-usr/share/applications/nm-ppp.desktop
-usr/share/gnome-vpn-properties/ppp/nm-ppp-dialog.glade
+usr/lib/NetworkManager/*.so*
+usr/lib/NetworkManager/nm-pptp-auth-dialog
 usr/share/gnome-vpn-properties
 usr/share/locale
 usr/share/icons
+usr/share/applications

Modified: packages/experimental/network-manager-pptp/debian/network-manager-pptp.install
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/network-manager-pptp/debian/network-manager-pptp.install?rev=2619&op=diff
==============================================================================
--- packages/experimental/network-manager-pptp/debian/network-manager-pptp.install (original)
+++ packages/experimental/network-manager-pptp/debian/network-manager-pptp.install Mon Dec 15 22:41:26 2008
@@ -1,3 +1,3 @@
 etc
-usr/lib/pppd
-usr/bin
+usr/lib/pppd/*/*.so
+usr/lib/NetworkManager/nm-pptp-service

Modified: packages/experimental/network-manager-pptp/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/network-manager-pptp/debian/rules?rev=2619&op=diff
==============================================================================
--- packages/experimental/network-manager-pptp/debian/rules (original)
+++ packages/experimental/network-manager-pptp/debian/rules Mon Dec 15 22:41:26 2008
@@ -4,16 +4,11 @@
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS := \
-	--libdir=/usr/lib/network-manager-pptp \
- 	--disable-static \
- 	--enable-nm-vpn-dbus-old
+DEB_CONFIGURE_LIBEXECDIR := "\$$(prefix)/lib/NetworkManager"
 
+DEB_CONFIGURE_EXTRA_FLAGS = --disable-static
 
-DEB_DH_MAKESHLIBS_ARGS_network-manager-pptp-gnome := -X/usr/lib/network-manager-pptp/
+DEB_DH_MAKESHLIBS_ARGS := -X/usr/lib/NetworkManager/ -X/usr/lib/pppd/
+
 DEB_DH_INSTALL_SOURCEDIR := debian/tmp
 
-common-install-arch::
-	rm debian/tmp/usr/lib/network-manager-pptp/*.la
-	mv debian/tmp/usr/lib/network-manager-pptp/pppd \
-		debian/tmp/usr/lib/