[Pkg-utopia-commits] r2864 - in /packages/unstable/network-manager-openvpn: ./ debian/ debian/patches/

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Fri Feb 20 11:28:14 UTC 2009 

Author: biebl
Date: Fri Feb 20 11:28:13 2009
New Revision: 2864

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=2864
Log:
Merged revisions 2585,2588,2592,2598-2599,2601-2602,2604,2614,2617,2620-2624,2628,2632,2638,2693,2769-2773 via svnmerge from 
svn+ssh://biebl@svn.debian.org/svn/pkg-utopia/packages/experimental/network-manager-openvpn

........
  r2585 | biebl | 2008-12-15 21:16:59 +0100 (Mo, 15 Dez 2008) | 1 line
  
  New upstream release.
........
  r2588 | biebl | 2008-12-15 21:23:45 +0100 (Mo, 15 Dez 2008) | 1 line
  
  Set pkg-utopia as maintainer
........
  r2592 | biebl | 2008-12-15 21:32:32 +0100 (Mo, 15 Dez 2008) | 1 line
  
  Add misc:Depends
........
  r2598 | biebl | 2008-12-15 21:54:57 +0100 (Mo, 15 Dez 2008) | 2 lines
  
  Add Homepage field
........
  r2599 | biebl | 2008-12-15 21:57:50 +0100 (Mo, 15 Dez 2008) | 3 lines
  
  * debian/rules
    - Do not run autogen.sh, the upstream tarball contains a proper build
      system now.
........
  r2601 | biebl | 2008-12-15 22:20:44 +0100 (Mo, 15 Dez 2008) | 1 line
  
  Switch patch system to quilt.
........
  r2602 | biebl | 2008-12-15 22:26:57 +0100 (Mo, 15 Dez 2008) | 8 lines
  
  * Drop obsolete patches
    - debian/patches/01_fix_dbus_signal_name.diff
    - debian/patches/02_fix_wrong_awk_path.diff
    - debian/patches/07_nm-openvpn-server-name.diff
  * Disable patches which do not apply cleanly anymore
    - debian/patches/03_allow_servercert_override.diff
    - debian/patches/04_increase_timeout.diff
    - debian/patches/06_pull_dns_domain.diff
........
  r2604 | biebl | 2008-12-15 22:32:26 +0100 (Mo, 15 Dez 2008) | 1 line
  
  minor changelog tweak
........
  r2614 | biebl | 2008-12-15 23:29:21 +0100 (Mo, 15 Dez 2008) | 3 lines
  
  * debian/network-manager-openvpn.postinst
    - Do no longer restart NetworkManager, only tell dbus to reload the config
      files.
........
  r2617 | biebl | 2008-12-15 23:35:18 +0100 (Mo, 15 Dez 2008) | 2 lines
  
  * debian/watch
    - Add watch file which allows to track new upstream releases.
........
  r2620 | biebl | 2008-12-15 23:41:34 +0100 (Mo, 15 Dez 2008) | 4 lines
  
    - Install plugins into /usr/lib/NetworkManager, so NetworkManager can find
      them.
  * debian/*.install
    - Update accordingly.
........
  r2621 | biebl | 2008-12-15 23:49:12 +0100 (Mo, 15 Dez 2008) | 1 line
  
  Update build dependencies.
........
  r2622 | biebl | 2008-12-15 23:52:32 +0100 (Mo, 15 Dez 2008) | 2 lines
  
  Bump dependency on openvpn to (>= 2.1~rc9) for the --script-security
  option.
........
  r2623 | biebl | 2008-12-15 23:55:51 +0100 (Mo, 15 Dez 2008) | 2 lines
  
  Bump Standards-Version to 3.8.0. Add REAME.source as recommended by the
  new policy.
........
  r2624 | biebl | 2008-12-16 00:13:09 +0100 (Di, 16 Dez 2008) | 2 lines
  
  * debian/copyright
    - Revised and updated.
........
  r2628 | biebl | 2008-12-16 00:34:19 +0100 (Di, 16 Dez 2008) | 1 line
  
  Upload to experimental
........
  r2632 | biebl | 2008-12-16 00:51:33 +0100 (Di, 16 Dez 2008) | 2 lines
  
  Improve the formatting a bit
........
  r2638 | biebl | 2008-12-16 00:57:28 +0100 (Di, 16 Dez 2008) | 1 line
  
  Refer to the quilt documentation instead of copying it
........
  r2693 | biebl | 2008-12-26 18:18:01 +0100 (Fr, 26 Dez 2008) | 2 lines
  
  Use DEB_DH_MAKESHLIBS_ARGS_ALL as it still allows for per-target arguments.
........
  r2769 | biebl | 2009-02-14 12:42:20 +0100 (Sa, 14 Feb 2009) | 2 lines
  
  * debian/control
    - Wrap build dependencies.
........
  r2770 | biebl | 2009-02-14 12:45:46 +0100 (Sa, 14 Feb 2009) | 1 line
  
  Update debhelper compat mode to 7
........
  r2771 | biebl | 2009-02-14 13:34:21 +0100 (Sa, 14 Feb 2009) | 2 lines
  
  * debian/patches/01_dbus_policy.patch
    - Remove bare send_interface. (Closes: #510730)
........
  r2772 | biebl | 2009-02-14 13:50:08 +0100 (Sa, 14 Feb 2009) | 2 lines
  
  * debian/rules
    - Include gnome.mk cdbs class instead of autotools.mk.
........
  r2773 | biebl | 2009-02-14 13:51:19 +0100 (Sa, 14 Feb 2009) | 1 line
  
  Upload to experimental
........

Added:
    packages/unstable/network-manager-openvpn/debian/README.source
      - copied unchanged from r2773, packages/experimental/network-manager-openvpn/debian/README.source
    packages/unstable/network-manager-openvpn/debian/patches/01_dbus_policy.patch
      - copied unchanged from r2773, packages/experimental/network-manager-openvpn/debian/patches/01_dbus_policy.patch
    packages/unstable/network-manager-openvpn/debian/patches/series
      - copied unchanged from r2773, packages/experimental/network-manager-openvpn/debian/patches/series
    packages/unstable/network-manager-openvpn/debian/watch
      - copied unchanged from r2773, packages/experimental/network-manager-openvpn/debian/watch
Removed:
    packages/unstable/network-manager-openvpn/debian/patches/01_fix_dbus_signal_name.diff
    packages/unstable/network-manager-openvpn/debian/patches/02_fix_wrong_awk_path.diff
    packages/unstable/network-manager-openvpn/debian/patches/07_nm-openvpn-server-name.diff
Modified:
    packages/unstable/network-manager-openvpn/   (props changed)
    packages/unstable/network-manager-openvpn/debian/changelog
    packages/unstable/network-manager-openvpn/debian/compat
    packages/unstable/network-manager-openvpn/debian/control
    packages/unstable/network-manager-openvpn/debian/copyright
    packages/unstable/network-manager-openvpn/debian/network-manager-openvpn-gnome.install
    packages/unstable/network-manager-openvpn/debian/network-manager-openvpn.install
    packages/unstable/network-manager-openvpn/debian/network-manager-openvpn.postinst
    packages/unstable/network-manager-openvpn/debian/rules

Propchange: packages/unstable/network-manager-openvpn/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Feb 20 11:28:13 2009
@@ -1,1 +1,1 @@
-/packages/experimental/network-manager-openvpn:1-2583
+/packages/experimental/network-manager-openvpn:1-2863

Modified: packages/unstable/network-manager-openvpn/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-openvpn/debian/changelog?rev=2864&op=diff
==============================================================================
--- packages/unstable/network-manager-openvpn/debian/changelog (original)
+++ packages/unstable/network-manager-openvpn/debian/changelog Fri Feb 20 11:28:13 2009
@@ -1,11 +1,56 @@
-network-manager-openvpn (0.3.2svn2855-2) UNRELEASED; urgency=low
+network-manager-openvpn (0.7.0-2) experimental; urgency=low
 
-  * debian/control 
+  * debian/control
+    - Wrap build dependencies.
+    - Bump build dependency on debhelper to (>= 7).
+  * debian/compat
+    - Bump to debhelper v7 compat mode.
+  * debian/patches/01_dbus_policy.patch
+    - Remove bare send_interface. (Closes: #510730)
+  * debian/rules
+    - Include gnome.mk cdbs class instead of autotools.mk.
+
+ -- Michael Biebl <biebl at debian.org>  Sat, 14 Feb 2009 13:50:13 +0100
+
+network-manager-openvpn (0.7.0-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/control
     - Add Vcs-* fields pointing to the Subversion repository of the package.
-    - Bump Standards-Version to 3.7.3. No further changes required. 
+    - Bump Standards-Version to 3.8.0. Add REAME.source as recommended by the
+      new policy.
     - Fix GNOME spelling error in the package description.
+    - Set Utopia Maintenance Team as Maintainer, add myself and Soren to
+      Uploaders.
+    - Add Homepage: field.
+    - Update build dependencies.
+    - Bump dependency on openvpn to (>= 2.1~rc9) for the --script-security
+      option.
+  * 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
+    - debian/patches/02_fix_wrong_awk_path.diff
+    - debian/patches/07_nm-openvpn-server-name.diff
+  * Disable patches which do not apply cleanly anymore
+    - debian/patches/03_allow_servercert_override.diff
+    - debian/patches/04_increase_timeout.diff
+    - debian/patches/06_pull_dns_domain.diff
+  * debian/network-manager-openvpn.postinst
+    - Do no longer restart NetworkManager, only tell dbus to reload the config
+      files.
+  * debian/watch
+    - Add watch file which allows to track new upstream releases.
+  * debian/copyright
+    - Revised and updated.
 
- -- Michael Biebl <biebl at debian.org>  Sat, 03 Nov 2007 00:48:09 +0100
+ -- Michael Biebl <biebl at debian.org>  Mon, 15 Dec 2008 21:15:16 +0100
 
 network-manager-openvpn (0.3.2svn2855-1) unstable; urgency=low
 

Modified: packages/unstable/network-manager-openvpn/debian/compat
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-openvpn/debian/compat?rev=2864&op=diff
==============================================================================
--- packages/unstable/network-manager-openvpn/debian/compat (original)
+++ packages/unstable/network-manager-openvpn/debian/compat Fri Feb 20 11:28:13 2009
@@ -1,1 +1,1 @@
-5
+7

Modified: packages/unstable/network-manager-openvpn/debian/control
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-openvpn/debian/control?rev=2864&op=diff
==============================================================================
--- packages/unstable/network-manager-openvpn/debian/control (original)
+++ packages/unstable/network-manager-openvpn/debian/control Fri Feb 20 11:28:13 2009
@@ -1,15 +1,31 @@
 Source: network-manager-openvpn
 Section: net
 Priority: optional
-Maintainer: Soren Hansen <soren at ubuntu.com>
-Build-Depends: cdbs, debhelper (>= 5), network-manager-dev (>= 0.6.2), libnm-util-dev (>= 0.6.2), automake1.9, gnome-common, intltool, libgnomeui-dev, libdbus-glib-1-dev, patchutils 
-Standards-Version: 3.7.3
+Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers at lists.alioth.debian.org>
+Uploaders: Soren Hansen <soren at ubuntu.com>, Michael Biebl <biebl at debian.org>
+Build-Depends: cdbs,
+ debhelper (>= 7),
+ network-manager-dev (>= 0.7.0),
+ libnm-util-dev (>= 0.7.0),
+ libnm-glib-dev (>= 0.7.0),
+ libnm-glib-vpn-dev (>= 0.7.0),
+ intltool,
+ libgnomeui-dev,
+ libdbus-glib-1-dev (>= 0.30),
+ libgnome-keyring-dev,
+ libgtk2.0-dev,
+ libgconf2-dev,
+ libglib2.0-dev,
+ libglade2-dev,
+ quilt
+Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/network-manager-openvpn
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-openvpn
+Homepage: http://www.gnome.org/projects/NetworkManager/
 
 Package: network-manager-openvpn
 Architecture: any
-Depends: ${shlibs:Depends}, openvpn
+Depends: ${shlibs:Depends}, ${misc:Depends}, openvpn (>= 2.1~rc9)
 Description: network management framework (OpenVPN plugin core)
  NetworkManager attempts to keep an active network connection available at
  all times.  It is intended primarily for laptops where it allows easy
@@ -21,7 +37,7 @@
 
 Package: network-manager-openvpn-gnome
 Architecture: any
-Depends: ${shlibs:Depends}, network-manager-openvpn (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager-openvpn (= ${binary:Version})
 Replaces: network-manager-openvpn (<< 0.3.2svn2855-1)
 Conflicts: network-manager-openvpn (<< 0.3.2svn2855-1)
 Description: network management framework (OpenVPN plugin GNOME GUI) 

Modified: packages/unstable/network-manager-openvpn/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-openvpn/debian/copyright?rev=2864&op=diff
==============================================================================
--- packages/unstable/network-manager-openvpn/debian/copyright (original)
+++ packages/unstable/network-manager-openvpn/debian/copyright Fri Feb 20 11:28:13 2009
@@ -1,65 +1,63 @@
 This package was debianized by Soren Hansen <sh at linux2go.dk> on
 Fri, 19 Jan 2007 20:42:50 +0100
 
-It was downloaded from gnome SVN at
-http://svn.gnome.org/svn/NetworkManager/branches/NETWORKMANAGER_0_6_0_RELEASE/vpn-daemons/openvpn
+It was downloaded from 
+http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/
 
-a) auth-dialog/gnome-two-password-dialog.c is Copyright 1999, 2000
-   Eazel, Inc.
 
-b) auth-dialog/gnome-two-password-dialog.h is Copyright 1999, 2000
-   Eazel, Inc, and 2005 Red Hat, Inc.
+auth-dialog/gnome-two-password-dialog.[ch]
 
-c) auth-dialog/main.c is Copyright 2004 Red Hat, Inc. and 2005 Tim
-   Niemueller [www.niemueller.de] 
+Copyright:
 
-d) properties/nm-openvpn.c, src/nm-openvpn-service.[ch], is Copyright
-   2005 Tim Niemueller <tim at niemueller.de>
+  Copyright (C) 1999, 2000 Eazel, Inc.
+  Copyright (C) 2005, Red Hat, Inc.
 
-e) src/nm-openvpn-service-openvpn-helper.c is Copyright 2005 Red Hat,
-   Inc., and 2005 Tim Niemueller
+License:
 
-f) src/nm-utils.[ch] is Copyright 2005 Red Hat, Inc.
+  The Gnome Library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Library General Public License as
+  published by the Free Software Foundation; either version 2 of the
+  License, or (at your option) any later version.
 
-g) The packaging is Copyright 2007 Soren Hansen <sh at linux2go.dk>
+  The Gnome Library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Library General Public License for more details.
 
-License of a) and b) is:
-
-The Gnome Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-The Gnome Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the Gnome Library; see the file COPYING.LIB.  If not,
-write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
-Floor, Boston, MA 02110-1301, USA.
+  You should have received a copy of the GNU Library General Public
+  License along with the Gnome Library; see the file COPYING.LIB.  If not,
+  write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
+  Floor, Boston, MA 02110-1301, USA.
 
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/LGPL-2'.
  
 
 
-License of c), d), e), f) and g):
+All other files are licensed as following
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+Copyright:
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+  Copyright (C) 2004 - 2008 Red Hat, Inc.
+  Copyright (C) 2008 Dan Williams <dcbw at redhat.com>
+  Copyright (C) 2008 Tambet Ingo <tambet at gmail.com>
+  Copyright (C) 2005 Tim Niemueller <tim at niemueller.de>
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software Foundation,
-Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+License:
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL-2'.

Modified: packages/unstable/network-manager-openvpn/debian/network-manager-openvpn-gnome.install
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-openvpn/debian/network-manager-openvpn-gnome.install?rev=2864&op=diff
==============================================================================
--- packages/unstable/network-manager-openvpn/debian/network-manager-openvpn-gnome.install (original)
+++ packages/unstable/network-manager-openvpn/debian/network-manager-openvpn-gnome.install Fri Feb 20 11:28:13 2009
@@ -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/unstable/network-manager-openvpn/debian/network-manager-openvpn.install
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-openvpn/debian/network-manager-openvpn.install?rev=2864&op=diff
==============================================================================
--- packages/unstable/network-manager-openvpn/debian/network-manager-openvpn.install (original)
+++ packages/unstable/network-manager-openvpn/debian/network-manager-openvpn.install Fri Feb 20 11:28:13 2009
@@ -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/unstable/network-manager-openvpn/debian/network-manager-openvpn.postinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-openvpn/debian/network-manager-openvpn.postinst?rev=2864&op=diff
==============================================================================
--- packages/unstable/network-manager-openvpn/debian/network-manager-openvpn.postinst (original)
+++ packages/unstable/network-manager-openvpn/debian/network-manager-openvpn.postinst Fri Feb 20 11:28:13 2009
@@ -4,11 +4,11 @@
 
 case "$1" in
 	configure)
-		if [ -x "/etc/init.d/network-manager" ]; then
+		if [ -x "/etc/init.d/dbus" ]; then
 			if [ -x /usr/sbin/invoke-rc.d ]; then
-				invoke-rc.d network-manager restart
+				invoke-rc.d dbus force-reload || true
 			else
-				/etc/init.d/network-manager restart
+				/etc/init.d/dbus force-reload || true
 			fi
 		fi
         ;;

Modified: packages/unstable/network-manager-openvpn/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-openvpn/debian/rules?rev=2864&op=diff
==============================================================================
--- packages/unstable/network-manager-openvpn/debian/rules (original)
+++ packages/unstable/network-manager-openvpn/debian/rules Fri Feb 20 11:28:13 2009
@@ -1,24 +1,14 @@
 #!/usr/bin/make -f
   
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/class/gnome.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_ALL := -X/usr/lib/NetworkManager/
+
 DEB_DH_INSTALL_SOURCEDIR := debian/tmp
 
-makebuilddir/network-manager-openvpn:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-	NOCONFIGURE=1 ./autogen.sh
-	touch debian/stamp-bootstrap
-
-clean::
-	rm -f aclocal.m4 auth-dialog/Makefile.in compile config.guess \
-	   config.h.in config.sub configure depcomp install-sh \
-	   intltool-extract.in intltool-merge.in intltool-update.in \
-	   ltmain.sh Makefile.in missing mkinstalldirs po/Makefile.in.in \
-	   properties/Makefile.in src/Makefile.in debian/stamp-bootstrap
-

More information about the Pkg-utopia-commits mailing list