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

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Fri Feb 20 12:22:41 UTC 2009 

Author: biebl
Date: Fri Feb 20 12:22:41 2009
New Revision: 2868

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=2868
Log:
Merged revisions 2587,2590,2593-2594,2597,2606,2608-2612,2616,2619,2630-2631,2634-2636,2679-2680,2692,2695,2775-2780 via svnmerge from 
svn+ssh://biebl@svn.debian.org/svn/pkg-utopia/packages/experimental/network-manager-pptp

........
  r2587 | biebl | 2008-12-15 21:18:21 +0100 (Mo, 15 Dez 2008) | 1 line
  
  New upstream release. 
........
  r2590 | biebl | 2008-12-15 21:23:54 +0100 (Mo, 15 Dez 2008) | 1 line
  
  Set pkg-utopia as maintainer
........
  r2593 | biebl | 2008-12-15 21:33:16 +0100 (Mo, 15 Dez 2008) | 2 lines
  
  Reorder debian/control a bit, to be more in line with the existing vpn plugins
........
  r2594 | biebl | 2008-12-15 21:49:15 +0100 (Mo, 15 Dez 2008) | 1 line
  
  Update Vcs-* fields.
........
  r2597 | biebl | 2008-12-15 21:54:38 +0100 (Mo, 15 Dez 2008) | 1 line
  
  Add Homepage field
........
  r2606 | biebl | 2008-12-15 22:40:21 +0100 (Mo, 15 Dez 2008) | 1 line
  
  Switch patch management system to quilt.
........
  r2608 | biebl | 2008-12-15 22:50:49 +0100 (Mo, 15 Dez 2008) | 2 lines
  
  * debian/patches/icon-name.patch
    - Rename and refresh patch to apply cleanly.
........
  r2609 | biebl | 2008-12-15 22:53:03 +0100 (Mo, 15 Dez 2008) | 1 line
  
  Fix quilt include path
........
  r2610 | biebl | 2008-12-15 22:58:35 +0100 (Mo, 15 Dez 2008) | 2 lines
  
  * debian/{nm-ppp-starter.1,network-manager-pptp.manpages}
    - Remove obsolete man page.
........
  r2611 | biebl | 2008-12-15 23:06:56 +0100 (Mo, 15 Dez 2008) | 2 lines
  
  Drop this file, it is superfluous
........
  r2612 | biebl | 2008-12-15 23:11:00 +0100 (Mo, 15 Dez 2008) | 2 lines
  
  Add compat file, set compat level to 5
........
  r2616 | biebl | 2008-12-15 23:35:00 +0100 (Mo, 15 Dez 2008) | 2 lines
  
  * debian/watch
    - Add watch file which allows to track new upstream releases.
........
  r2619 | biebl | 2008-12-15 23:41:26 +0100 (Mo, 15 Dez 2008) | 5 lines
  
  * debian/rules
    - Install plugins into /usr/lib/NetworkManager, so NetworkManager can find
      them.
  * debian/*.install
    - Update accordingly.
........
  r2630 | biebl | 2008-12-16 00:45:33 +0100 (Di, 16 Dez 2008) | 2 lines
  
  As we reload dbus automatically, there is no special need to document that.
........
  r2631 | biebl | 2008-12-16 00:45:44 +0100 (Di, 16 Dez 2008) | 1 line
  
  Update build dependencies.
........
  r2634 | biebl | 2008-12-16 00:53:12 +0100 (Di, 16 Dez 2008) | 2 lines
  
  * debian/copyright
    - Revised and updated.
........
  r2635 | biebl | 2008-12-16 00:55:50 +0100 (Di, 16 Dez 2008) | 2 lines
  
  Bump Standards-Version to 3.8.0. Add README.source as recommended by the
  new policy.
........
  r2636 | biebl | 2008-12-16 00:56:14 +0100 (Di, 16 Dez 2008) | 1 line
  
  Upload to experimental
........
  r2679 | biebl | 2008-12-17 03:16:07 +0100 (Mi, 17 Dez 2008) | 13 lines
  
  Switch back to UNRELEASED
  
  We first have to fix the conffile upgrade/removal before an upload:
  
  0.6:
  /etc/NetworkManager/VPN/nm-ppp-starter.name
  /etc/dbus-1/system.d/nm-ppp-starter.conf
  
  0.7:
  /etc/NetworkManager/VPN/nm-pptp-service.name
  /etc/dbus-1/system.d/nm-pptp-service.conf
........
  r2680 | biebl | 2008-12-17 05:30:00 +0100 (Mi, 17 Dez 2008) | 4 lines
  
  * debian/network-manager-pptp.preinst
    - Remove obsolete conffiles /etc/NetworkManager/VPN/nm-ppp-starter.name
      and /etc/dbus-1/system.d/nm-ppp-starter.conf on upgrades. If they have
      been locally modified, save them as .dpkg-bak.
........
  r2692 | biebl | 2008-12-26 18:17:32 +0100 (Fr, 26 Dez 2008) | 2 lines
  
  Use DEB_DH_MAKESHLIBS_ARGS_ALL as it still allows for per-target arguments.
........
  r2695 | biebl | 2008-12-26 18:24:42 +0100 (Fr, 26 Dez 2008) | 1 line
  
  Upload to experimental
........
  r2775 | biebl | 2009-02-14 14:57:46 +0100 (Sa, 14 Feb 2009) | 2 lines
  
  * debian/control
    - Wrap build dependencies.
........
  r2776 | biebl | 2009-02-14 14:59:48 +0100 (Sa, 14 Feb 2009) | 3 lines
  
    - Bump build dependency on debhelper to (>= 7).
  * debian/compat
    - Bump to debhelper v7 compat mode.
........
  r2777 | biebl | 2009-02-14 15:14:54 +0100 (Sa, 14 Feb 2009) | 2 lines
  
  * debian/patches/01-dbus_policy.patch
    - Remove bare send_interface policy rules. (Closes: #510732)
........
  r2778 | biebl | 2009-02-14 15:16:00 +0100 (Sa, 14 Feb 2009) | 2 lines
  
  Rename for better sortability and consistency.
........
  r2779 | biebl | 2009-02-14 15:18:42 +0100 (Sa, 14 Feb 2009) | 2 lines
  
  * debian/rules
    - Include gnome.mk cdbs class instead of autotools.mk.
........
  r2780 | biebl | 2009-02-14 15:19:03 +0100 (Sa, 14 Feb 2009) | 1 line
  
  Upload to experimental
........

Added:
    packages/unstable/network-manager-pptp/debian/README.source
      - copied unchanged from r2780, packages/experimental/network-manager-pptp/debian/README.source
    packages/unstable/network-manager-pptp/debian/compat
      - copied unchanged from r2780, packages/experimental/network-manager-pptp/debian/compat
    packages/unstable/network-manager-pptp/debian/network-manager-pptp.preinst
      - copied unchanged from r2780, packages/experimental/network-manager-pptp/debian/network-manager-pptp.preinst
    packages/unstable/network-manager-pptp/debian/patches/01-dbus_policy.patch
      - copied unchanged from r2780, packages/experimental/network-manager-pptp/debian/patches/01-dbus_policy.patch
    packages/unstable/network-manager-pptp/debian/patches/02-icon_name.patch
      - copied unchanged from r2780, packages/experimental/network-manager-pptp/debian/patches/02-icon_name.patch
    packages/unstable/network-manager-pptp/debian/patches/series
      - copied unchanged from r2780, packages/experimental/network-manager-pptp/debian/patches/series
    packages/unstable/network-manager-pptp/debian/watch
      - copied unchanged from r2780, packages/experimental/network-manager-pptp/debian/watch
Removed:
    packages/unstable/network-manager-pptp/debian/README.Debian
    packages/unstable/network-manager-pptp/debian/network-manager-pptp.dirs
    packages/unstable/network-manager-pptp/debian/network-manager-pptp.manpages
    packages/unstable/network-manager-pptp/debian/nm-ppp-starter.1
    packages/unstable/network-manager-pptp/debian/patches/00dpatch.conf
    packages/unstable/network-manager-pptp/debian/patches/00list
    packages/unstable/network-manager-pptp/debian/patches/icon-name.dpatch
Modified:
    packages/unstable/network-manager-pptp/   (props changed)
    packages/unstable/network-manager-pptp/debian/changelog
    packages/unstable/network-manager-pptp/debian/control
    packages/unstable/network-manager-pptp/debian/copyright
    packages/unstable/network-manager-pptp/debian/network-manager-pptp-gnome.install
    packages/unstable/network-manager-pptp/debian/network-manager-pptp.install
    packages/unstable/network-manager-pptp/debian/rules

Propchange: packages/unstable/network-manager-pptp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Feb 20 12:22:41 2009
@@ -1,1 +1,1 @@
-/packages/experimental/network-manager-pptp:1-2584
+/packages/experimental/network-manager-pptp:1-2867

Modified: packages/unstable/network-manager-pptp/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-pptp/debian/changelog?rev=2868&op=diff
==============================================================================
--- packages/unstable/network-manager-pptp/debian/changelog (original)
+++ packages/unstable/network-manager-pptp/debian/changelog Fri Feb 20 12:22:41 2009
@@ -1,3 +1,49 @@
+network-manager-pptp (0.7.0-2) experimental; urgency=low
+
+  * 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 policy rules. (Closes: #510732)
+  * debian/rules
+    - Include gnome.mk cdbs class instead of autotools.mk.
+
+ -- Michael Biebl <biebl at debian.org>  Sat, 14 Feb 2009 15:18:46 +0100
+
+network-manager-pptp (0.7.0-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/control
+    - Set Utopia Maintenance Team as Maintainer, add myself and Enrico to
+      Uploaders.
+    - Update Vcs-* fields.
+    - Add Homepage: field.
+    - Update build dependencies.
+    - Bump Standards-Version to 3.8.0. Add README.source as recommended by the
+      new policy.
+  * 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.
+  * debian/{nm-ppp-starter.1,network-manager-pptp.manpages}
+    - Remove obsolete man page.
+  * debian/watch
+    - Add watch file which allows to track new upstream releases.
+  * debian/copyright
+    - Revised and updated.
+  * debian/network-manager-pptp.preinst
+    - Remove obsolete conffiles /etc/NetworkManager/VPN/nm-ppp-starter.name
+      and /etc/dbus-1/system.d/nm-ppp-starter.conf on upgrades. If they have
+      been locally modified, save them as .dpkg-bak.
+
+ -- Michael Biebl <biebl at debian.org>  Fri, 26 Dec 2008 18:24:20 +0100
+
 network-manager-pptp (0.6.5+svnhead2574+dfsg-2) unstable; urgency=low
 
   * Added recommendation over nm-ppp-gnome (Closes: #484163)

Modified: packages/unstable/network-manager-pptp/debian/control
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-pptp/debian/control?rev=2868&op=diff
==============================================================================
--- packages/unstable/network-manager-pptp/debian/control (original)
+++ packages/unstable/network-manager-pptp/debian/control Fri Feb 20 12:22:41 2009
@@ -1,29 +1,34 @@
 Source: network-manager-pptp
 Section: net
 Priority: optional
-Maintainer: Enrico Tassi <gareuselesinge at debian.org>
-Build-Depends: debhelper (>= 5.0.0), network-manager-dev (>= 0.6.2), ppp-dev, gnome-common, intltool, libgnomeui-dev, libdbus-glib-1-dev, libnm-util-dev, cdbs, dpatch
-Standards-Version: 3.7.3
-Vcs-Svn: svn://svn.debian.org/collab-maint/deb-maint/network-manager-pptp/
-
-Package: network-manager-pptp-gnome
-Depends: network-manager-pptp, ${shlibs:Depends}, ${misc:Depends}
-Architecture: any
-Description: network management framework (PPTP plugin)
- NetworkManager attempts to keep an active network connection available at all
- times. It is intended only for the desktop use-case, and is not intended for
- usage on servers. The point of NetworkManager is to make networking
- configuration and setup as painless and automatic as possible.  If using DHCP,
- NetworkManager is _intended_ to replace default routes, obtain IP addresses
- from a DHCP server, and change nameservers whenever it sees fit.
- .
- This package provides the GNOME bits of NetworkManager's PPTP plugin.
+Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers at lists.alioth.debian.org>
+Uploaders: Enrico Tassi <gareuselesinge at debian.org>, 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),
+ ppp-dev,
+ 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-pptp
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-pptp
+Homepage: http://www.gnome.org/projects/NetworkManager/
 
 Package: network-manager-pptp
 Architecture: any
 Recommends: network-manager-pptp-gnome
-Depends: pptp-linux, ${shlibs:Depends}, ${misc:Depends}
-Description: network management framework (PPTP plugin)
+Depends: ${shlibs:Depends}, ${misc:Depends}, pptp-linux
+Description: network management framework (PPTP plugin core)
  NetworkManager attempts to keep an active network connection available at all
  times. It is intended only for the desktop use-case, and is not intended for
  usage on servers. The point of NetworkManager is to make networking
@@ -34,3 +39,16 @@
  This package provides a VPN plugin for PPTP, commonly used for connecting
  to Microsoft VPN servers.
 
+Package: network-manager-pptp-gnome
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager-pptp (= ${binary:Version})
+Description: network management framework (PPTP plugin GNOME GUI)
+ NetworkManager attempts to keep an active network connection available at all
+ times. It is intended only for the desktop use-case, and is not intended for
+ usage on servers. The point of NetworkManager is to make networking
+ configuration and setup as painless and automatic as possible.  If using DHCP,
+ NetworkManager is _intended_ to replace default routes, obtain IP addresses
+ from a DHCP server, and change nameservers whenever it sees fit.
+ .
+ This package provides the GNOME bits of NetworkManager's PPTP plugin.
+

Modified: packages/unstable/network-manager-pptp/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-pptp/debian/copyright?rev=2868&op=diff
==============================================================================
--- packages/unstable/network-manager-pptp/debian/copyright (original)
+++ packages/unstable/network-manager-pptp/debian/copyright Fri Feb 20 12:22:41 2009
@@ -1,54 +1,63 @@
 This package was debianized by Craig Box <ubuntu at dubculture.co.nz> on
 Sun,  6 Aug 2006 19:30:11 +1200.
 
-It was downloaded from GNOME CVS, module NetworkManager/vpn-daemons/pptp.
+It was downloaded from
+http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/
 
-Copyright © 2008 Anthony Mee, eemynotna at googlemail.com
 
-Stuff in the properties/ directory is Copyright (C) Anthony Mee, based on work
-by Tim Niemueller <tim at niemueller.de> and David Zeuthen, <davidz at redhat.com>,
-and is released under the terms of GNU General Public License version 2 or (at
-your option) any later version.
+auth-dialog/gnome-two-password-dialog.[ch]
 
-The text of the license can be found in `/usr/share/common-licenses/GPL'.
+Copyright:
 
-Stuff in the auth-dialog/ directory is Copyright (C) 1999, 2000 Eazel, Inc. and
-Copyright (C) 2005, Red Hat, Inc. and is redistributed under the terms of the
-GNU Library General Public License version 2 or (at your option) any later
-version. 
- 
-The text of the license can be found in `/usr/share/common-licenses/LGPL`.
+  Copyright (C) 1999, 2000 Eazel, Inc.
+  Copyright (C) 2005, Red Hat, Inc.
 
-The files src/nm-utils.c and src/nm-utils.h are Copyright (C) Ray Strode
-<rstrode at redhat.com> and is distributed under the terms of the GNU General
-Public License version 2 or (at your option) any later version.
+License:
 
-The text of the license can be found in `/usr/share/common-licenses/GPL'.
-  
-Stuff in the po/ directory is Copyrighted as follows:
- 
-  hu.po, sv.po, ca.po, bg.po, pt_BR.po, uk.po, th.po are Copyright (C) Free
-  Software Foundation, Inc. and are released under the same license as the
-  NetworkManager-ppptp (NetworkManager-ppp_vpn) package, that is GPL v2 or
-  later.
+  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.
 
-  pt.po, ja.po, it.po, ar.po, el.po, dz.po, es.po, gl.po, mk.po, pa.po, da.po,
-  en_GB.po and zh_CN.po give Copyright (C) to the NetworkManager-ppptp
-  copyright holder and are released under the same license of
-  NetworkManager-ppptp: GPL v2 or later.
+  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.
 
-  vi.po is Copyright (C) 2007 Gnome i18n Project for Vietnamese.
-  
-  fi.po is Copyright (C) 2006 Ilkka Tuohela.
+  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.
 
-  pl.po is Copyright (C) 2003 SuSE Linux AG.
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/LGPL-2'.
 
-  de.po is Copyright (C) 2005 Dan Williams <dcbw at redhat.com> and is released
-  under the same license of NetworkManager-ppptp: GPL v2 or later.
 
-  nb.po is Copyright (C) 2006-2007 Kjartan Maraas and is released
-  under the same license of NetworkManager-ppptp: GPL v2 or later.
 
-  et.po is Copyright (C) 2007 The GNOME Project and is distributed under the same 
-  license as the epiphany package that is GPLv2 or later.
-  
+All other files are licensed as following
+
+Copyright:
+
+  Copyright (C) 2004 - 2008 Red Hat, Inc.
+  Copyright (C) 2008 Dan Williams <dcbw at redhat.com>
+  Copyright (C) 2007 - 2008 Novell, Inc.
+
+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-pptp/debian/network-manager-pptp-gnome.install
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-pptp/debian/network-manager-pptp-gnome.install?rev=2868&op=diff
==============================================================================
--- packages/unstable/network-manager-pptp/debian/network-manager-pptp-gnome.install (original)
+++ packages/unstable/network-manager-pptp/debian/network-manager-pptp-gnome.install Fri Feb 20 12:22:41 2009
@@ -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/unstable/network-manager-pptp/debian/network-manager-pptp.install
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-pptp/debian/network-manager-pptp.install?rev=2868&op=diff
==============================================================================
--- packages/unstable/network-manager-pptp/debian/network-manager-pptp.install (original)
+++ packages/unstable/network-manager-pptp/debian/network-manager-pptp.install Fri Feb 20 12:22:41 2009
@@ -1,3 +1,3 @@
 etc
-usr/lib/pppd
-usr/bin
+usr/lib/pppd/*/*.so
+usr/lib/NetworkManager/nm-pptp-service

Modified: packages/unstable/network-manager-pptp/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-pptp/debian/rules?rev=2868&op=diff
==============================================================================
--- packages/unstable/network-manager-pptp/debian/rules (original)
+++ packages/unstable/network-manager-pptp/debian/rules Fri Feb 20 12:22:41 2009
@@ -1,19 +1,14 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/class/gnome.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_ALL := -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/

More information about the Pkg-utopia-commits mailing list