[oe-commits] David-John Willis : xfce4-power-manager: Remove broken xfce4-power-manager_4.6.1.bb and add latest 0.8.4. 2 to xfce-extras.

[git version control]

Module: openembedded.git
Branch: shr/unstable
Commit: 27ae9191f50d54132dfff568d1ae9ddea87df957
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=27ae9191f50d54132dfff568d1ae9ddea87df957

Author: David-John Willis <John.Willis at Distant-earth.com>
Date:   Sun Jan  3 21:57:27 2010 +0000

xfce4-power-manager: Remove broken xfce4-power-manager_4.6.1.bb and add latest 0.8.4.2 to xfce-extras.

* xfce4-power-manager_4.6.1.bb was a dummy package that never worked (a left over from my Xfce 4.6.1 work). 0.8.4.2 is the correct version to use with Xfce 4.6.* >.

---

 conf/checksums.ini                                 |    8 ++++++++
 recipes/xfce-base/xfce4-power-manager_4.6.1.bb     |    1 -
 recipes/xfce-extras/xfce4-power-manager_0.8.4.2.bb |   16 ++++++++++++++++
 3 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 72b015b..98dc0a5 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -30830,7 +30830,15 @@ sha256=b308ddc96fcb27b3f18ed2fa20aeb3a12fb73cec7676d75914a58d1b27124b83
 md5=88352816c84cbea57121b0c478976976
 sha256=1d8ab1354c73935a5d12f0d7d226d26ae1b90fdd235460bdb57fd5651229bc8b
 
+<<<<<<< HEAD:conf/checksums.ini
 [http://www.us.xfce.org/archive/xfce/4.4.2/src/xfce4-session-4.4.2.tar.bz2]
+=======
+[http://archive.xfce.org/src/apps/xfce4-power-manager/0.8/xfce4-power-manager-0.8.4.2.tar.bz2]
+md5=3131257750766838a64a9bb7f74eb2a1
+sha256=16cc04bf613ecfbc9ea43514ccb5f7d7923b7fc4ebf8117c0ce32fa1422334e1
+
+[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce4-session-4.4.2.tar.bz2]
+>>>>>>> xfce4-power-manager: Remove broken xfce4-power-manager_4.6.1.bb and add latest 0.8.4.2 to xfce-extras.:conf/checksums.ini
 md5=4c3d1acb8ce37ea4dd55d82aeb38e9e7
 sha256=7394906dec7b50789407219f85143ae83b10938949d38adeecdd59eb50c8c1c6
 
diff --git a/recipes/xfce-base/xfce4-power-manager_4.6.1.bb b/recipes/xfce-base/xfce4-power-manager_4.6.1.bb
deleted file mode 100644
index b5dd372..0000000
--- a/recipes/xfce-base/xfce4-power-manager_4.6.1.bb
+++ /dev/null
@@ -1 +0,0 @@
-PR = "r1"
diff --git a/recipes/xfce-extras/xfce4-power-manager_0.8.4.2.bb b/recipes/xfce-extras/xfce4-power-manager_0.8.4.2.bb
new file mode 100644
index 0000000..d970f44
--- /dev/null
+++ b/recipes/xfce-extras/xfce4-power-manager_0.8.4.2.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Xfce panel plugins for power management."
+DEPENDS = "libxfce4util libxfcegui4 libnotify xfconf xfce4-panel"
+RDEPENDS = "libxfce4util libxfcegui4 libnotify xfce4-panel"
+
+SECTION = "x11"
+PR = "r1"
+
+inherit xfce46
+
+XFCE_VERSION = "4.6.1"
+
+SRC_URI = "http://archive.xfce.org/src/apps/${PN}/0.8/${PN}-${PV}.tar.bz2"
+
+FILES_${PN} += "${datadir}/xfce4/panel-plugins/*.desktop"
+
+FILES_${PN}-dbg += "${libexecdir}/xfce4/panel-plugins/.debug/"