From fc18901f97a5d066b80420a4f15efa2e1eb5f39b Mon Sep 17 00:00:00 2001
From: tnut <thierryn1 at hispeed dot ch>
Date: Fri, 25 Dec 2009 16:02:01 +0100
Subject: lxde-common, ajustement pour le look 2009.2

---
 extra/lxde-common/.footprint                       |   4 +-
 extra/lxde-common/.md5sum                          |   4 +-
 extra/lxde-common/Pkgfile                          |  10 ++---
 extra/lxde-common/bouton03.png                     | Bin 5183 -> 0 bytes
 extra/lxde-common/lxde-common-0.5.0-nutyx-01.patch |  42 ---------------------
 extra/lxde-common/lxde-common-0.5.0-nutyx-02.patch |  42 +++++++++++++++++++++
 extra/lxde-common/nutyx2009_2.png                  | Bin 0 -> 34507 bytes
 7 files changed, 51 insertions(+), 51 deletions(-)
 delete mode 100644 extra/lxde-common/bouton03.png
 delete mode 100644 extra/lxde-common/lxde-common-0.5.0-nutyx-01.patch
 create mode 100644 extra/lxde-common/lxde-common-0.5.0-nutyx-02.patch
 create mode 100644 extra/lxde-common/nutyx2009_2.png

(limited to 'extra/lxde-common')

diff --git a/extra/lxde-common/.footprint b/extra/lxde-common/.footprint
index f27fcac3f..ead7cfb64 100644
--- a/extra/lxde-common/.footprint
+++ b/extra/lxde-common/.footprint
@@ -13,9 +13,9 @@ drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/lxde/
 -rw-r--r--	root/root	usr/share/lxde/config
 drwxr-xr-x	root/root	usr/share/lxde/images/
--rw-r--r--	root/root	usr/share/lxde/images/bouton03.png
 -rw-r--r--	root/root	usr/share/lxde/images/logout-banner.png
 -rw-r--r--	root/root	usr/share/lxde/images/lxde-icon.png
+-rw-r--r--	root/root	usr/share/lxde/images/nutyx2009_2.png
 drwxr-xr-x	root/root	usr/share/lxde/openbox/
 -rw-r--r--	root/root	usr/share/lxde/openbox/menu.xml
 -rw-r--r--	root/root	usr/share/lxde/openbox/rc.xml
@@ -25,7 +25,7 @@ drwxr-xr-x	root/root	usr/share/lxde/wallpapers/
 -rw-r--r--	root/root	usr/share/lxde/wallpapers/lxde_blue.jpg
 -rw-r--r--	root/root	usr/share/lxde/wallpapers/lxde_green.jpg
 -rw-r--r--	root/root	usr/share/lxde/wallpapers/lxde_red.jpg
--rw-r--r--	root/root	usr/share/lxde/wallpapers/nutng.png
+-rw-r--r--	root/root	usr/share/lxde/wallpapers/nutyx2009_2.jpg
 drwxr-xr-x	root/root	usr/share/lxpanel/
 drwxr-xr-x	root/root	usr/share/lxpanel/images/
 -rw-r--r--	root/root	usr/share/lxpanel/images/chrystal_red_root.png
diff --git a/extra/lxde-common/.md5sum b/extra/lxde-common/.md5sum
index 9d9f5ee23..a49512fa7 100644
--- a/extra/lxde-common/.md5sum
+++ b/extra/lxde-common/.md5sum
@@ -1,6 +1,6 @@
-5c3ce5abd4f148be96f5951aef82874a  bouton03.png
 e2a82f004df713ec853e348f7d1d14d2  chrystal_red_root.png
 6c82b9d53cf2abad74f140d1abc12546  config
-4a1470efd99b4a77a21678f60b0c1b44  lxde-common-0.5.0-nutyx-01.patch
+1a52dcbbe64eda43d618cbf384ea3134  lxde-common-0.5.0-nutyx-02.patch
 23606ab3d6e1039386d62a4b68b4ffc6  lxde-common-0.5.0.tar.gz
 79f93fb1cd0bff442030ede794943a04  nutyx2009_2.jpg
+41fa266e6493a17a0dee5c5103f94567  nutyx2009_2.png
diff --git a/extra/lxde-common/Pkgfile b/extra/lxde-common/Pkgfile
index e9770b04c..b73fd83d5 100644
--- a/extra/lxde-common/Pkgfile
+++ b/extra/lxde-common/Pkgfile
@@ -8,12 +8,12 @@ name=lxde-common
 version=0.5.0
 release=2
 source=(http://downloads.sourceforge.net/lxde/files/$name-$version.tar.gz\
-	config chrystal_red_root.png nutyx2009_2.jpg lxde-common-$version-nutyx-01.patch\
-	bouton03.png)
+	config chrystal_red_root.png nutyx2009_2.jpg lxde-common-$version-nutyx-02.patch\
+	nutyx2009_2.png)
 
 build() {
 cd $name-$version
-patch -Np1 -i ../$name-$version-nutyx-01.patch
+patch -Np1 -i ../$name-$version-nutyx-02.patch
 ./configure --prefix=/usr \
 	--sysconfdir=/etc
 make
@@ -26,8 +26,8 @@ install -D -m644 ../config \
 	$PKG/usr/share/lxde/config
 install -D -m644 ../nutyx2009_2.jpg \
 	$PKG/usr/share/lxde/wallpapers/nutyx2009_2.jpg
-install -D -m644 ../bouton03.png \
-	$PKG/usr/share/lxde/images/bouton03.png
+install -D -m644 ../nutyx2009_2.png \
+	$PKG/usr/share/lxde/images/nutyx2009_2.png
 install -D -m644 ../chrystal_red_root.png \
 	$PKG/usr/share/lxpanel/images/chrystal_red_root.png
 }
diff --git a/extra/lxde-common/bouton03.png b/extra/lxde-common/bouton03.png
deleted file mode 100644
index 9d468d728..000000000
Binary files a/extra/lxde-common/bouton03.png and /dev/null differ
diff --git a/extra/lxde-common/lxde-common-0.5.0-nutyx-01.patch b/extra/lxde-common/lxde-common-0.5.0-nutyx-01.patch
deleted file mode 100644
index 1a3be6c53..000000000
--- a/extra/lxde-common/lxde-common-0.5.0-nutyx-01.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- lxde-common-0.5.0/lxpanel/panel.in	2008-06-15 20:30:26.000000000 +0000
-+++ lxde-common-0.5.0/lxpanel/panel.in.new	2009-09-07 17:39:50.000000000 +0000
-@@ -16,7 +16,7 @@
-     usefontcolor=1
-     fontcolor=#ffffff
-     background=1
--    backgroundfile=@prefix@/share/lxpanel/images/background.png
-+    backgroundfile=/usr/share/lxpanel/images/chrystal_red_root.png
- }
- 
- Plugin {
-@@ -29,7 +29,7 @@
- Plugin {
-     type = menu
-     Config {
--        image=@prefix@/share/lxde/images/lxde-icon.png
-+        image=/usr/share/lxde/images/bouton03.png
-         system {
-         }
-         separator {
-@@ -118,7 +118,7 @@
- }
- 
- Plugin {
--    type = tray
-+    type = volumealsa
- }
- 
- Plugin {
-@@ -130,12 +130,3 @@
-     }
- }
- 
--Plugin {
--    type = launchbar
--    Config {
--        Button {
--            id=lxde-logout.desktop
--        }
--    }
--}
--
diff --git a/extra/lxde-common/lxde-common-0.5.0-nutyx-02.patch b/extra/lxde-common/lxde-common-0.5.0-nutyx-02.patch
new file mode 100644
index 000000000..12f2c788a
--- /dev/null
+++ b/extra/lxde-common/lxde-common-0.5.0-nutyx-02.patch
@@ -0,0 +1,42 @@
+--- lxde-common-0.5.0/lxpanel/panel.in	2008-06-15 20:30:26.000000000 +0000
++++ lxde-common-0.5.0/lxpanel/panel.in.new	2009-09-07 17:39:50.000000000 +0000
+@@ -16,7 +16,7 @@
+     usefontcolor=1
+     fontcolor=#ffffff
+     background=1
+-    backgroundfile=@prefix@/share/lxpanel/images/background.png
++    backgroundfile=/usr/share/lxpanel/images/chrystal_red_root.png
+ }
+ 
+ Plugin {
+@@ -29,7 +29,7 @@
+ Plugin {
+     type = menu
+     Config {
+-        image=@prefix@/share/lxde/images/lxde-icon.png
++        image=/usr/share/lxde/images/nutyx2009_2.png
+         system {
+         }
+         separator {
+@@ -118,7 +118,7 @@
+ }
+ 
+ Plugin {
+-    type = tray
++    type = volumealsa
+ }
+ 
+ Plugin {
+@@ -130,12 +130,3 @@
+     }
+ }
+ 
+-Plugin {
+-    type = launchbar
+-    Config {
+-        Button {
+-            id=lxde-logout.desktop
+-        }
+-    }
+-}
+-
diff --git a/extra/lxde-common/nutyx2009_2.png b/extra/lxde-common/nutyx2009_2.png
new file mode 100644
index 000000000..456401172
Binary files /dev/null and b/extra/lxde-common/nutyx2009_2.png differ
-- 
cgit v1.2.3-54-g00ecf