opie-taskbar-images: add prerm script removing alternatives

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

diff --git a/recipes/opie-taskbar/opie-taskbar-images.inc b/recipes/opie-taskbar/opie-taskbar-images.inc
index 3e1a8c8..0286f48 100644 (file)
--- a/recipes/opie-taskbar/opie-taskbar-images.inc
+++ b/recipes/opie-taskbar/opie-taskbar-images.inc
@@ -56,6 +56,10 @@ python do_package_prepend () {
          postinst = 'update-alternatives --install %sfirstuse.jpg opie-firstuse-pixmap %sfirstuse-%s.jpg 50\n' % (dir,dir,res)
          postinst += 'update-alternatives --install %sopie-background.jpg opie-background-pixmap %sopie-background-%s.jpg 50\n' % (dir,dir,res)
          bb.data.setVar('pkg_postinst_%s-%s' % (pn,res),postinst, d)
+         prerm = ''
+         prerm = 'update-alternatives --remove opie-firstuse-pixmap %sfirstuse-%s.jpg 50\n' % (dir,res)
+         prerm += 'update-alternatives --remove opie-background-pixmap %sopie-background-%s.jpg 50\n' % (dir,res)
+         bb.data.setVar('pkg_prerm_%s-%s' % (pn,res),prerm, d)
 }
 
 PACKAGE_ARCH = "all"

diff --git a/recipes/opie-taskbar/opie-taskbar-images_1.2.3+cvs20070922.bb b/recipes/opie-taskbar/opie-taskbar-images_1.2.3+cvs20070922.bb
index a36e85b..8fc49c9 100644 (file)
--- a/recipes/opie-taskbar/opie-taskbar-images_1.2.3+cvs20070922.bb
+++ b/recipes/opie-taskbar/opie-taskbar-images_1.2.3+cvs20070922.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
 
-PR = "r1"
+PR = "r2"
 SRCDATE = "20070922"
 SRC_URI = "${HANDHELDS_CVS};module=opie/pics"

diff --git a/recipes/opie-taskbar/opie-taskbar-images_1.2.3.bb b/recipes/opie-taskbar/opie-taskbar-images_1.2.3.bb
index 74b6c52..5adb25f 100644 (file)
--- a/recipes/opie-taskbar/opie-taskbar-images_1.2.3.bb
+++ b/recipes/opie-taskbar/opie-taskbar-images_1.2.3.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-PR = "r2"
+PR = "r3"
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
 
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"

diff --git a/recipes/opie-taskbar/opie-taskbar-images_1.2.4.bb b/recipes/opie-taskbar/opie-taskbar-images_1.2.4.bb
index afffae5..44c1e5e 100644 (file)
--- a/recipes/opie-taskbar/opie-taskbar-images_1.2.4.bb
+++ b/recipes/opie-taskbar/opie-taskbar-images_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-PR = "r0"
+PR = "r1"
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
 
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"

diff --git a/recipes/opie-taskbar/opie-taskbar-images_cvs.bb b/recipes/opie-taskbar/opie-taskbar-images_cvs.bb
index 3d45118..6c2e807 100644 (file)
--- a/recipes/opie-taskbar/opie-taskbar-images_cvs.bb
+++ b/recipes/opie-taskbar/opie-taskbar-images_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-PR = "r7"
+PR = "r8"
 SRC_URI = "${HANDHELDS_CVS};module=opie/pics"