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

[biebl at users.alioth.debian.org]

Author: biebl
Date: Mon Dec 15 22:41:34 2008
New Revision: 2620

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

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

Modified: packages/experimental/network-manager-openvpn/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/network-manager-openvpn/debian/changelog?rev=2620&op=diff
==============================================================================
--- packages/experimental/network-manager-openvpn/debian/changelog (original)
+++ packages/experimental/network-manager-openvpn/debian/changelog Mon Dec 15 22:41:34 2008
@@ -11,6 +11,10 @@
   * debian/rules
     - Do not run autogen.sh, the upstream tarball contains a proper build
       system now.
+    - Install plugins into /usr/lib/NetworkManager, so NetworkManager can find
+      them.
+  * debian/*.install
+    - Update accordingly.
   * Switch patch management system to quilt.
   * Drop obsolete patches
     - debian/patches/01_fix_dbus_signal_name.diff

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

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

Modified: packages/experimental/network-manager-openvpn/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/network-manager-openvpn/debian/rules?rev=2620&op=diff
==============================================================================
--- packages/experimental/network-manager-openvpn/debian/rules (original)
+++ packages/experimental/network-manager-openvpn/debian/rules Mon Dec 15 22:41:34 2008
@@ -4,8 +4,11 @@
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS=--bindir=/usr/lib/network-manager-openvpn --libdir=/usr/lib/network-manager-openvpn --disable-static
+DEB_CONFIGURE_LIBEXECDIR := "\$$(prefix)/lib/NetworkManager"
 
-DEB_DH_MAKESHLIBS_ARGS_network-manager-openvpn-gnome := -X/usr/lib/network-manager-openvpn/
+DEB_CONFIGURE_EXTRA_FLAGS = --disable-static
+
+DEB_DH_MAKESHLIBS_ARGS := -X/usr/lib/NetworkManager/
+
 DEB_DH_INSTALL_SOURCEDIR := debian/tmp