diff options
| author | Michael Biebl <biebl@debian.org> | 2007-08-26 22:17:40 +0000 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2007-08-26 22:17:40 +0000 |
| commit | 614e759115bb291136e155f2b37af80780ef0ab3 (patch) | |
| tree | 8fb708daaae644c04e6b52fbf22209f091df9c6f /debian/patches | |
| parent | 5b85762af7b4dd320c5b526a69dba9b9f380e285 (diff) | |
* Upstream has split nm-applet into a separate package. This means we no
longer build the network-manager-gnome binary package from this source
package.
- Removed files that are now part of the new nm-applet source package
+ debian/network-manager-gnome.README.Debian
+ debian/patches/10-po_fr.patch
+ debian/patches/14-po_de.patch
+ debian/patches/03-dbus_access_nm_applet.patch
+ debian/network-manager-gnome.manpages
+ debian/nm-applet.sgml
+ debian/network-manager.install
+ debian/network-manager-gnome.install
- debian/control
+ Remove the binary package network-manager-gnome.
+ Add Conflicts/Replaces: network-manager-gnome (<< 0.6.5-1) as
nm-vpn-properties is now part of the network-manager binary package.
+ Update Build-Depends. Add autotools-dev and libglib2.0-dev, remove
libpanel-applet2-dev.
- debian/rules
+ Do not build the nm-applet.1 manpage anymore.
+ Exclude nm-vpn-properties from dh_shlibdeps. This is a temporary
workaround until this binary has also been moved into the nm-applet
source package.
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1675 ceb527fc-18e6-0310-9fe2-813c157c29e7
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/03-dbus_access_nm_applet.patch | 11 | ||||
| -rw-r--r-- | debian/patches/10-po_fr.patch | 37 | ||||
| -rw-r--r-- | debian/patches/14-po_de.patch | 13 |
3 files changed, 0 insertions, 61 deletions
diff --git a/debian/patches/03-dbus_access_nm_applet.patch b/debian/patches/03-dbus_access_nm_applet.patch deleted file mode 100644 index 94053ea2..00000000 --- a/debian/patches/03-dbus_access_nm_applet.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gnome/applet/nm-applet.conf.orig 2006-02-07 04:22:39.000000000 +0100 -+++ gnome/applet/nm-applet.conf 2006-02-07 04:23:00.000000000 +0100 -@@ -8,7 +8,7 @@ - <allow send_destination="org.freedesktop.NetworkManagerInfo"/> - <allow send_interface="org.freedesktop.NetworkManagerInfo"/> - </policy> -- <policy at_console="true"> -+ <policy group="netdev"> - <allow own="org.freedesktop.NetworkManagerInfo"/> - - <allow send_destination="org.freedesktop.NetworkManagerInfo"/> diff --git a/debian/patches/10-po_fr.patch b/debian/patches/10-po_fr.patch deleted file mode 100644 index e2c2b4f6..00000000 --- a/debian/patches/10-po_fr.patch +++ /dev/null @@ -1,37 +0,0 @@ -Index: po/fr.po -=================================================================== -RCS file: /cvs/gnome/NetworkManager/po/fr.po,v -retrieving revision 1.2.6.2 -diff -u -3 -p -r1.2.6.2 fr.po ---- po/fr.po 12 Jun 2006 15:47:57 -0000 1.2.6.2 -+++ po/fr.po 30 Nov 2006 17:29:17 -0000 -@@ -250,7 +250,7 @@ msgstr "_Se connecter à un autre résea - - #: ../gnome/applet/applet.c:1562 - msgid "Create _New Wireless Network..." --msgstr "Créer_un nouveau réseau sans fil..." -+msgstr "Créer _un nouveau réseau sans fil..." - - #: ../gnome/applet/applet.c:1685 - msgid "_VPN Connections" -@@ -290,17 +290,17 @@ msgstr "NetworkManager n'est pas lancé. - #. 'Enable Networking' item - #: ../gnome/applet/applet.c:2170 - msgid "Enable _Networking" --msgstr "Activer_le réseau" -+msgstr "Activer _le réseau" - - #. 'Enable Wireless' item - #: ../gnome/applet/applet.c:2176 - msgid "Enable _Wireless" --msgstr "Activer la_connexion sans fil" -+msgstr "Activer la _connexion sans fil" - - #. 'Connection Information' item - #: ../gnome/applet/applet.c:2182 - msgid "Connection _Information" --msgstr "Informations sur la_connexion" -+msgstr "Informations sur la _connexion" - - #. Help item - #: ../gnome/applet/applet.c:2193 diff --git a/debian/patches/14-po_de.patch b/debian/patches/14-po_de.patch deleted file mode 100644 index 25ceff26..00000000 --- a/debian/patches/14-po_de.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: po/de.po -=================================================================== ---- po/de.po (Revision 2227) -+++ po/de.po (Arbeitskopie) -@@ -276,7 +276,7 @@ - #. 'Enable Networking' item - #: ../gnome/applet/applet.c:2170 - msgid "Enable _Networking" --msgstr "Netzwerk_aktivieren" -+msgstr "Netzwerk _aktivieren" - - #. 'Enable Wireless' item - #: ../gnome/applet/applet.c:2176 |