7 files changed, 202 insertions, 10 deletions
diff --git a/debian/README.Debian b/debian/README.Debian
index 20c9ed3d..a34d88d8 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -4,7 +4,7 @@ the user can interact with. Since NetworkManager is not part of
 main yet, you have to add nm-applet to your session once.
 
 (instructions for gnome only)
-First add yourself to the plugdev group
+First add yourself to the netdev group
 Go to System -> Preferences -> Sessions
 In the Startup Programs tab, click Add
 type "nm-applet", click OK.
diff --git a/debian/changelog b/debian/changelog
index 7fbf3992..f1e3703c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,12 @@ network-manager (0.5.1-2) unstable; urgency=low
   - added nm-vpn-properties, nm-applet manpages
   - added debian/network-manager-gnome.manpages
   - modifyed NetworManager*.sgml for reflect the correct website.
-  * uploaded to unstable.
+  * added nm-vpn-properties.desktop, nm-logo.xpm
+  * added dbus_access_network_manager and dbus_access_nm_applet patches:
+  - switched to group netdev
+  - updated the dep on dhcdbd
   * removed network-manager.doc as it was empty. 
+  * uploaded to unstable.
 
  -- Riccardo Setti <giskard@autistici.org>  Thu,  9 Feb 2006 10:18:13 +0100
 
diff --git a/debian/control b/debian/control
index 09660b61..ec8fa06d 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.6.2
 
 Package: network-manager
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.10), lsb-base (>= 2.0-6)
+Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, iputils-arping, dhcdbd (>= 1.10-2), lsb-base (>= 2.0-6)
 Description: network management framework daemon
  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
diff --git a/debian/network-manager-gnome.dirs b/debian/network-manager-gnome.dirs
index e628b1eb..92c4831a 100644
--- a/debian/network-manager-gnome.dirs
+++ b/debian/network-manager-gnome.dirs
@@ -1 +1,2 @@
 etc/dbus-1/system.d/
+usr/share/pixmaps
diff --git a/debian/nm-logo.xpm b/debian/nm-logo.xpm
new file mode 100644
index 00000000..20e4f020
--- /dev/null
+++ b/debian/nm-logo.xpm
@@ -0,0 +1,182 @@
+/* XPM */
+static char *nm-logo[] = {
+/* columns rows colors chars-per-pixel */
+"31 32 144 2",
+"   c #697677FB7FB8",
+".  c #15175FC087FE",
+"X  c #14835FFE88A6",
+"o  c #09C560CC8FD9",
+"O  c #0694613C9241",
+"+  c #028067169DEF",
+"@  c #04906949A025",
+"#  c #093E62AC9307",
+"$  c #153262348BBC",
+"%  c #1B9F660C8E34",
+"&  c #1186680C96CE",
+"*  c #16976A2597A0",
+"=  c #03E1696AA0B1",
+"-  c #00C16F4DABB9",
+";  c #0C756DE3A2EE",
+":  c #034B71FBAD4D",
+">  c #09437623B01E",
+",  c #028C76FFB4C0",
+"<  c #0137795DB8AD",
+"1  c #005C79D4B9E5",
+"2  c #08FF7AB6B729",
+"3  c #09877E53BBAE",
+"4  c #15B67262A3D0",
+"5  c #136577DAACCF",
+"6  c #14907892AD2C",
+"7  c #22A0630985BE",
+"8  c #2CBB67CA879A",
+"9  c #2F1C6B888C07",
+"0  c #2DF175349ABB",
+"q  c #348968258401",
+"w  c #32B96E2E8E29",
+"e  c #39E47AAF9CD3",
+"r  c #4FF675EE8A6F",
+"t  c #502779EB9088",
+"y  c #502F7A3990FA",
+"u  c #65C47ECF8C0C",
+"i  c #6E487F9D88CD",
+"p  c #72D3800F873E",
+"a  c #108080CFBBC7",
+"s  c #2598838DB523",
+"d  c #57C781DC9893",
+"f  c #57CE81FA98CC",
+"g  c #5BBA80B49439",
+"h  c #5B9284F59B6B",
+"j  c #4ADC8C5EAFB8",
+"k  c #44E68F61B7E9",
+"l  c #4238922EBC42",
+"z  c #536A8C9EAB7A",
+"x  c #59E9895DA2FF",
+"c  c #59368F8CACD6",
+"v  c #52DB9191B37B",
+"b  c #511396CDBCBF",
+"n  c #661981A0903C",
+"m  c #640F8A749F3A",
+"M  c #6AE288009783",
+"N  c #6BD9898C9958",
+"B  c #78608D169801",
+"V  c #7BD08FE89A8C",
+"C  c #7E2992ED9DF4",
+"Z  c #6A0E8FFCA424",
+"A  c #67569352AB01",
+"S  c #6BF492F2A7F4",
+"D  c #74DF9316A33E",
+"F  c #7C51974DA5BE",
+"G  c #7ED79AD6A9AC",
+"H  c #7FFB9FF9B13E",
+"J  c #4F1F9BCEC542",
+"K  c #54D59F6BC7AA",
+"L  c #6264A477C75A",
+"P  c #62B3ABE1D27B",
+"I  c #7853AF66CC76",
+"U  c #816895259FA8",
+"Y  c #8D93976F9CF7",
+"T  c #8A3D98B9A077",
+"R  c #85BC9BE7A7D7",
+"E  c #82F79DAEAC35",
+"W  c #8BF69E05A7D8",
+"Q  c #8C069F78A9E1",
+"!  c #91A09C60A23B",
+"~  c #8EF9A31AADAF",
+"^  c #84F6A213B1CF",
+"/  c #8E61A84AB617",
+"(  c #88D6AB50BD96",
+")  c #9562A30CAA87",
+"_  c #9EA2A871ADF8",
+"`  c #9FF9A966AEA7",
+"'  c #94ECA827B245",
+"]  c #974AAA2FB40E",
+"[  c #96EEAE5DBADF",
+"{  c #9D23AAC4B227",
+"}  c #9DE0B130BB6E",
+"|  c #A150A586A81F",
+" . c #A229A817ABAD",
+".. c #A492AA51ADD7",
+"X. c #A33CAD55B2E1",
+"o. c #A6BFB3D4BAD3",
+"O. c #AB67B1DAB56B",
+"+. c #AC4EB6ACBC49",
+"@. c #B391BB15BF57",
+"#. c #BA39BE37C071",
+"$. c #834DBC15DA10",
+"%. c #AF0CBCC4C429",
+"&. c #B549BDB4C24E",
+"*. c #B988C064C419",
+"=. c #B7F4C2D6C8A5",
+"-. c #BFC1C595C8C4",
+";. c #BED9C7C6CC94",
+":. c #C06CD4B7DF9A",
+">. c #BCFBD5EDE356",
+",. c #BC9FDB03EB09",
+"<. c #C2B1C52AC6BD",
+"1. c #C1F9C6ABC934",
+"2. c #C7A7CB4DCD71",
+"3. c #CCF4CDE3CEAD",
+"4. c #C568CE82D373",
+"5. c #C4F1D554DE16",
+"6. c #CD69D25CD522",
+"7. c #CB6DD60CDBCC",
+"8. c #D582D693D77A",
+"9. c #D89ED89AD921",
+"0. c #D77AD948DA67",
+"q. c #DC43DD4ADE07",
+"w. c #C282D667E0FB",
+"e. c #D5B3DFEDE56A",
+"r. c #CF2FE41FEF10",
+"t. c #D190E603F0AF",
+"y. c #DF33E38BE600",
+"u. c #DA32E4DAEA53",
+"i. c #DDB0E9E8F066",
+"p. c #D43CE848F2FB",
+"a. c #D85EEA77F3FB",
+"s. c #DCEBEBECF3BB",
+"d. c #E5BAE5C4E5FA",
+"f. c #E5C7EAD9EDB0",
+"g. c #ECBAED9DEE40",
+"h. c #E511EECAF447",
+"j. c #ED4EF03AF211",
+"k. c #ED61F2C1F5EE",
+"l. c #ED5BF579F9CD",
+"z. c #F3BDF4FCF604",
+"x. c #F5C2F810F986",
+"c. c #F7EEF9D8FAF4",
+"v. c #F9B0F7FCF723",
+"b. c #FE77FE8FFE9D",
+/* pixels */
+"b.b.b.b.b.b.b.b.z.9.3.8.d.x.8.8.8.8.0.q.g.b.b.b.b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.b.e.X. .....| @. .Y  . . . . .2.b.b.b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.g.X.+.&.@.@.@. .X. .+.@.@.@.@.! q.b.b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.6.{ +.o.X.o.o.o.T  .] o.o.+.+.T *.b.b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.&.~ ' B   U ' ] V @.! n n ~ ' C X.b.b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.[ F G n @.%.D F M +.v.d.=.V G M  .b.b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.H f h r 1.f.m h t ` b.b.7.d h t ) b.b.b.b.b.b.b.b.",
+"b.b.b.b.b.c.A 9 w q 1.x.x w 8 Q b.b.5.w w 8 W b.b.b.b.b.b.b.b.",
+"b.b.b.b.b.c.c $ $ % -.c.z $ X F b.b.5.% $ $ R b.b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.v O # % -.b.j O O D v.b.>.& # o R v.b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.b = = * -.c.k + + S v.b.>.; @ + E b.b.b.b.b.b.b.b.",
+"b.b.b.b.b.c.K , : 4 ;.b.J - - z z.b.,., : ; ^ b.b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.P 3 1 5 ;.b.$.1 < s y.b.,.3 < > / b.b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.I 1 1 6 ;.b.s.l , , L k.,.3 1 > } b.b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.w.a 1 6 ;.b.b.y.[ S S 4.,.3 < 4 =.b.b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.b.I 2 6 ;.b.b.b.b.v.z.c.,.3 > g d.b.b.b.b.b.b.b.b.",
+"b.b.b.v.v.x.x.f.( e @.x.z.j.j.j.j.z.>.0 n 3.v.v.v.c.v.b.b.b.b.",
+"x.v.j.g.g.g.d.d.6.o.<.q.9.9.9.8.9.9.8.X.*.9.d.g.g.j.j.x.c.c.b.",
+"c.c.v.x.z.j.g.u.>.5.q.d.d.d.d.q.q.d.y.5.>.7.d.k.z.z.v.c.c.b.b.",
+"b.b.b.b.b.b.x.r.t.t.g.b.v.j.h.u.u.k.x.r.r.r.g.b.b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.l.p.t.t.z.b.c.s.p.p.h.b.c.a.p.p.j.b.b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.l.a.a.s.z.b.l.a.a.s.c.b.c.s.a.a.h.b.b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.k.a.s.s.x.b.k.s.s.h.b.b.b.s.s.s.k.b.b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.k.h.h.h.x.b.k.s.h.k.b.b.c.h.h.h.k.b.b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.z.h.h.h.c.b.z.h.h.k.b.b.c.k.h.h.z.b.b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.z.l.k.k.c.b.z.k.k.z.b.b.b.k.k.k.z.b.b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.c.z.z.z.c.b.x.l.z.x.b.b.c.z.z.l.c.b.b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.c.c.c.c.v.b.c.c.c.c.b.b.b.c.c.x.c.b.b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.b.c.c.c.b.c.c.c.c.c.b.b.b.c.c.c.c.b.b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.b.b.b.c.c.b.b.b.b.c.b.c.b.c.b.b.b.b.b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.",
+"b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b."
+};
diff --git a/debian/nm-vpn-properties.desktop b/debian/nm-vpn-properties.desktop
new file mode 100644
index 00000000..18647fc9
--- /dev/null
+++ b/debian/nm-vpn-properties.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=NetworkManager VPN Manager
+Name[it]=Gestore di VPN
+Exec=nm-vpn-properties
+Icon=nm-logo.xpm
+Terminal=false
+Type=Application
+Categories=Application;System;Settings; 
diff --git a/debian/rules b/debian/rules
index eec349aa..e860e29a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,11 +28,7 @@ binary-install/network-manager::
 		debian/network-manager/etc/dbus-1/event.d/25NetworkManager
 	install -m 755 debian/network-manager-dispatcher.dbus-event \
 		debian/network-manager/etc/dbus-1/event.d/26NetworkManagerDispatcher
-	install -d -m 755 debian/network-manager/etc/NetworkManager/dispatcher.d
-	install -m 644 debian/network-manager.dbus-conf \
-		debian/network-manager/etc/dbus-1/system.d/NetworkManager.conf
-
-binary-install/network-manager-gnome::	
-	install -m 644 debian/nm-applet.conf \
-		debian/network-manager/etc/dbus-1/system.d/nm-applet.conf
 
+binary-install/network-manger-gnome::
+	install -m 644 debian/nm-logo.xpm \
+		debian/network-manager-gnome/usr/share/pixmaps