[Pkg-utopia-commits] r2307 - in /packages/experimental/network-manager-applet/debian: changelog control nm-vpn-properties.sgml patches/01-dbus_access_nm_applet.patch patches/02-hal_deprecated_keys.patch patches/03-nm_editor_category.patch patches/series rules

sjoerd at users.alioth.debian.org sjoerd at users.alioth.debian.org
Wed Jun 18 14:13:15 UTC 2008 

Author: sjoerd
Date: Wed Jun 18 14:13:15 2008
New Revision: 2307

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=2307
Log:
Merge mbiebls nm applet 0.7 snapshot

Added:
    packages/experimental/network-manager-applet/debian/nm-vpn-properties.sgml
    packages/experimental/network-manager-applet/debian/patches/series
Removed:
    packages/experimental/network-manager-applet/debian/patches/02-hal_deprecated_keys.patch
    packages/experimental/network-manager-applet/debian/patches/03-nm_editor_category.patch
Modified:
    packages/experimental/network-manager-applet/debian/changelog
    packages/experimental/network-manager-applet/debian/control
    packages/experimental/network-manager-applet/debian/patches/01-dbus_access_nm_applet.patch
    packages/experimental/network-manager-applet/debian/rules

Modified: packages/experimental/network-manager-applet/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/network-manager-applet/debian/changelog?rev=2307&op=diff
==============================================================================
--- packages/experimental/network-manager-applet/debian/changelog (original)
+++ packages/experimental/network-manager-applet/debian/changelog Wed Jun 18 14:13:15 2008
@@ -1,3 +1,16 @@
+network-manager-applet (0.7.0~svn755-1) UNRELEASED; urgency=low
+
+  * debian/rules: Updated, switch to quilt as a patch system
+  * debian/control: Updated
+  * debian/nm-vpn-properties.sgml: Added
+  * debian/network-manager-gnome.manpages: Add nm-vpn-properties.1
+  * debian/patches/01-dbus_access_nm_applet.patch: Updated
+  * Removed obsolete patches:
+    - debian/patches/02-hal_deprecated_keys.patch
+    - debian/patches/03-nm_editor_category.patch
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 23 Apr 2008 07:07:11 +0200
+
 network-manager-applet (0.6.6-2) unstable; urgency=low
 
   * debian/control

Modified: packages/experimental/network-manager-applet/debian/control
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/network-manager-applet/debian/control?rev=2307&op=diff
==============================================================================
--- packages/experimental/network-manager-applet/debian/control (original)
+++ packages/experimental/network-manager-applet/debian/control Wed Jun 18 14:13:15 2008
@@ -3,7 +3,11 @@
 Priority: optional
 Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers at lists.alioth.debian.org>
 Uploaders: Michael Biebl <biebl at debian.org>
-Build-Depends: debhelper (>= 5.0.0), cdbs, autotools-dev, pkg-config, intltool, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnome2-dev, libgnomeui-dev, libgnome-keyring-dev, libglade2-dev, libgtk2.0-dev, libglib2.0-dev (>= 2.10), libgconf2-dev, libnotify-dev (>= 0.3.0), libnm-util-dev (>= 0.6.6), network-manager-dev (>= 0.6.6), docbook-to-man
+Build-Depends: debhelper (>= 5.0.0), cdbs, autotools-dev, intltool, quilt,
+ libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnome2-dev,
+ libgnomeui-dev, libgnome-keyring-dev, libglade2-dev, libgtk2.0-dev,
+ libglib2.0-dev (>= 2.10), libgconf2-dev, libnotify-dev (>= 0.3.0),
+ libnm-util-dev (>= 0.7), libnm-glib-dev (>= 0.7), network-manager-dev (>= 0.7), docbook-to-man, libpolkit-gnome-dev
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/network-manager-applet
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-applet
@@ -12,9 +16,8 @@
 Package: network-manager-gnome
 Architecture: any
 Section: gnome
-Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.6.5)
-Recommends: notification-daemon, libpam-keyring, network-manager-openvpn-gnome, network-manager-vpnc-gnome
-Provides: nm-applet
+Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7)
+Recommends: notification-daemon, libpam-keyring, policykit-gnome
 Description: network management framework (GNOME frontend)
  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

Added: packages/experimental/network-manager-applet/debian/nm-vpn-properties.sgml
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/network-manager-applet/debian/nm-vpn-properties.sgml?rev=2307&op=file
==============================================================================
--- packages/experimental/network-manager-applet/debian/nm-vpn-properties.sgml (added)
+++ packages/experimental/network-manager-applet/debian/nm-vpn-properties.sgml Wed Jun 18 14:13:15 2008
@@ -1,0 +1,95 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+
+    
+	The docbook-to-man binary is found in the docbook-to-man package.
+	Please remember that if you create the nroff version in one of the
+	debian/rules file targets (such as build), you will need to include
+	docbook-to-man in your Build-Depends control field.
+
+  -->
+
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY date        "<date>8 February, 2006</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY package     "nm-vpn-properties">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      <email>giskard at autistici.org</email>;
+    </address>
+    <author>
+      <firstname>Riccardo</firstname>
+      <surname>Setti</surname>
+    </author>
+    <copyright>
+      <year>2006</year>
+      <holder>Riccardo Setti</holder>
+    </copyright>
+    &date;
+  </refentryinfo>
+  <refmeta>
+    <refentrytitle>nm-vpn-properties</refentrytitle>
+    <manvolnum>1</manvolnum>
+  </refmeta>
+  <refnamediv>
+    <refname>&package;</refname>
+
+    <refpurpose>Network management framework</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&package;</command>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para><command>&package;</command> is the gnome front-end for the NetworkManager VPN handler</para>
+  </refsect1>
+  <refsect1>
+    <title>SEE ALSO</title>
+
+    <para>NetworkManager (1), nm-applet (1)</para>
+
+    <para>More Information about NetworkManager can be found at
+      http://www.gnome.org/projects/NetworkManager/ .</para>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by Riccardo Setti <email>giskard at autistici.org</email> for
+      the <productname>Debian</productname> system.
+    </para>
+
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->

Modified: packages/experimental/network-manager-applet/debian/patches/01-dbus_access_nm_applet.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/network-manager-applet/debian/patches/01-dbus_access_nm_applet.patch?rev=2307&op=diff
==============================================================================
--- packages/experimental/network-manager-applet/debian/patches/01-dbus_access_nm_applet.patch (original)
+++ packages/experimental/network-manager-applet/debian/patches/01-dbus_access_nm_applet.patch Wed Jun 18 14:13:15 2008
@@ -1,17 +1,20 @@
-Index: nm-applet.conf
+Index: network-manager-applet/nm-applet.conf
 ===================================================================
---- nm-applet.conf	(Revision 52)
-+++ nm-applet.conf	(Arbeitskopie)
-@@ -14,6 +14,12 @@
- 		<allow send_destination="org.freedesktop.NetworkManagerInfo"/>
-                 <allow send_interface="org.freedesktop.NetworkManagerInfo"/>
+--- network-manager-applet.orig/nm-applet.conf	2008-06-08 23:36:33.000000000 +0200
++++ network-manager-applet/nm-applet.conf	2008-06-11 12:44:22.000000000 +0200
+@@ -20,6 +20,15 @@
+ 		<!-- Only root can get secrets -->
+ 		<deny send_interface="org.freedesktop.NetworkManagerSettings.Secrets"/>
  	</policy>
 +	<policy group="netdev">
-+		<allow own="org.freedesktop.NetworkManagerInfo"/>
++		<allow own="org.freedesktop.NetworkManagerUserSettings"/>
 +
-+		<allow send_destination="org.freedesktop.NetworkManagerInfo"/>
-+                <allow send_interface="org.freedesktop.NetworkManagerInfo"/>
++		<allow send_destination="org.freedesktop.NetworkManagerUserSettings"/>
++		<allow send_interface="org.freedesktop.NetworkManagerSettings"/>
++
++		<!-- Only root can get secrets -->
++		<deny send_interface="org.freedesktop.NetworkManagerSettings.Secrets"/>
 +	</policy>
  	<policy context="default">
- 		<deny own="org.freedesktop.NetworkManagerInfo"/>
+ 		<deny own="org.freedesktop.NetworkManagerUserSettings"/>
  

Added: packages/experimental/network-manager-applet/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/network-manager-applet/debian/patches/series?rev=2307&op=file
==============================================================================
--- packages/experimental/network-manager-applet/debian/patches/series (added)
+++ packages/experimental/network-manager-applet/debian/patches/series Wed Jun 18 14:13:15 2008
@@ -1,0 +1,1 @@
+01-dbus_access_nm_applet.patch

Modified: packages/experimental/network-manager-applet/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/network-manager-applet/debian/rules?rev=2307&op=diff
==============================================================================
--- packages/experimental/network-manager-applet/debian/rules (original)
+++ packages/experimental/network-manager-applet/debian/rules Wed Jun 18 14:13:15 2008
@@ -2,15 +2,17 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_INSTALL_DOCS_ALL := CONTRIBUTING
 
-DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
-
-build/network-manager-gnome::
-	/usr/bin/docbook-to-man debian/nm-applet.sgml > debian/nm-applet.1
+DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-z,defs -Wl,--as-needed"
 
 clean::
 	rm -f debian/*.1
 
+
+build/network-manager-gnome::
+	/usr/bin/docbook-to-man debian/nm-vpn-properties.sgml > debian/nm-vpn-properties.1
+	/usr/bin/docbook-to-man debian/nm-applet.sgml > debian/nm-applet.1

More information about the Pkg-utopia-commits mailing list