packages: Fix PV naming of svn/git based recipes to have +gitr/+svnr in the PV

    According to the policy add an 'r' if we build a certain SCM
    revision. Bump the PE to be sure that the package is bigger, may
    alphanumeric math is too bad...

    # my failure of shell knowledge...
    git grep "^PV" packages/ | grep SRCREV | grep "\(git\\$\)\|\(svn\\$\)"

25 files changed, 50 insertions, 26 deletions

diff --git a/packages/accelges/accelges_svn.bb b/packages/accelges/accelges_svn.bb
index 73c274a3d7..27abf44806 100644
--- a/packages/accelges/accelges_svn.bb
+++ b/packages/accelges/accelges_svn.bb
@@ -3,8 +3,9 @@ HOMEPAGE = "http://code.google.com/p/accelges/"
 AUTHOR = "Paul V. Borza"
 LICENSE = "GPL"
 DEPENDS = "libnotify"
-PV = "0.2+svn${SRCREV}"
+PV = "0.2+svnr${SRCREV}"
 PR = "r1"
+PE = "1"
 
 SRC_URI = "svn://accelges.googlecode.com/svn/;module=trunk;proto=http"
 S = "${WORKDIR}/trunk"
diff --git a/packages/alsa/alsa-scenario_git.bb b/packages/alsa/alsa-scenario_git.bb
index 02edd31619..74c25c247e 100644
--- a/packages/alsa/alsa-scenario_git.bb
+++ b/packages/alsa/alsa-scenario_git.bb
@@ -3,8 +3,9 @@ HOMEPAGE = "http://opensource.wolfsonmicro.com/node/22"
 SECTION = "console/utils"
 LICENSE = "GPL"
 DEPENDS = "alsa-lib ncurses"
-PV = "0.1+git${SRCREV}"
+PV = "0.1+gitr${SRCREV}"
 PR = "r0"
+PE = "1"
 
 SRC_URI = "git://opensource.wolfsonmicro.com/alsa-scenario;branch=master;protocol=git"
 S = "${WORKDIR}/git"
diff --git a/packages/clutter/moblin-proto_git.bb b/packages/clutter/moblin-proto_git.bb
index 25e0418b5d..3f61f496c5 100644
--- a/packages/clutter/moblin-proto_git.bb
+++ b/packages/clutter/moblin-proto_git.bb
@@ -1,7 +1,8 @@
 DEPENDS = "clutter-box2d"
 
-PV = "0.0+git${SRCREV}"
+PV = "0.0+gitr${SRCREV}"
 PR = "r1"
+PE = "1"
 
 SRC_URI = "git://git.moblin.org/repos/users/pippin/prototype.git/;protocol=http \
            file://paths.patch;patch=1"
diff --git a/packages/connman/connman_git.bb b/packages/connman/connman_git.bb
index 5e2ab2ea68..bc5840fb4c 100644
--- a/packages/connman/connman_git.bb
+++ b/packages/connman/connman_git.bb
@@ -1,7 +1,8 @@
 HOMEPAGE = "http://www.moblin.org/projects/projects_connman.php"
 SUMMARY  = "Moblin Connection Manager"
-PV       = "0.0+git${SRCREV}"
+PV       = "0.0+gitr${SRCREV}"
 PR       = "r4.02"
+PE       = "1"
 S        = "${WORKDIR}/git"
 LICENSE  = "GPL"
 
diff --git a/packages/freesmartphone/pylgrim_svn.bb b/packages/freesmartphone/pylgrim_svn.bb
index e70c839da8..beeb44c110 100644
--- a/packages/freesmartphone/pylgrim_svn.bb
+++ b/packages/freesmartphone/pylgrim_svn.bb
@@ -5,7 +5,8 @@ LICENSE = "GPL"
 SECTION = "x11/navigation"
 DEPENDS = "edje-native"
 RDEPENDS = "task-python-efl python-textutils"
-PV = "0.0+svn${SRCREV}"
+PV = "0.0+svnr${SRCREV}"
+PE = "1"
 
 SRC_URI = "svn://neo1973-germany.de/svn;module=pylgrim;proto=http"
 S = "${WORKDIR}/pylgrim"
diff --git a/packages/gimp/babl_svn.bb b/packages/gimp/babl_svn.bb
index a98cb0a057..332595ee6b 100644
--- a/packages/gimp/babl_svn.bb
+++ b/packages/gimp/babl_svn.bb
@@ -2,8 +2,9 @@ DESCRIPTION = "Babl is a dynamic, any to any, pixel format conversion library."
 LICENSE = "LGPL"
 
 SRCREV = "349"
-PV = "0.0.23+svn${SRCREV}"
+PV = "0.0.23+svnr${SRCREV}"
 PR = "r1"
+PE = "1"
 
 inherit gnome
 
diff --git a/packages/gimp/gegl_svn.bb b/packages/gimp/gegl_svn.bb
index 7cdc86ae21..134e699425 100644
--- a/packages/gimp/gegl_svn.bb
+++ b/packages/gimp/gegl_svn.bb
@@ -3,7 +3,8 @@ LICENSE = "LGPL"
 DEPENDS = "babl librsvg glib-2.0 gtk+ pango cairo expat zlib libpng jpeg virtual/libsdl"
 
 SRCREV = "2543"
-PV = "0.0.19+svn${SRCREV}"
+PV = "0.0.19+svnr${SRCREV}"
+PE = "1"
 
 inherit gnome
 
diff --git a/packages/hal/ohm_git.bb b/packages/hal/ohm_git.bb
index a747c2ff1c..ffdbb07b88 100644
--- a/packages/hal/ohm_git.bb
+++ b/packages/hal/ohm_git.bb
@@ -8,7 +8,8 @@ SRC_URI = "git://anongit.freedesktop.org/git/ohm/;protocol=git \
            file://fix_configure.patch;patch=1"
 
 SRCREV = "edfe25d49d67884bf004de7ae0724c162bb5e65e"
-PV = "0.1.2+${PR}+git${SRCREV}"
+PV = "0.1.2+${PR}+gitr${SRCREV}"
+PE = "1"
 
 S = "${WORKDIR}/git"
 
diff --git a/packages/libw100/libw100_svn.bb b/packages/libw100/libw100_svn.bb
index 4f33c625ca..462163e115 100644
--- a/packages/libw100/libw100_svn.bb
+++ b/packages/libw100/libw100_svn.bb
@@ -1,7 +1,8 @@
 DESCRIPTION = "Acceleration library for ATI imageon chipsets (w100 and w3220)"
 LICENSE = "GPLv2"
 
-PV = "0.0.2+svn${SRCREV}"
+PV = "0.0.2+svnr${SRCREV}"
+PE = "1"
 SRC_URI = "svn://libw100.svn.sourceforge.net/svnroot/libw100;module=trunk;proto=https"
 
 S = "${WORKDIR}/trunk"
diff --git a/packages/lightmediascanner/lightmediascanner_svn.bb b/packages/lightmediascanner/lightmediascanner_svn.bb
index 702dcbe3f3..145d2c15a4 100644
--- a/packages/lightmediascanner/lightmediascanner_svn.bb
+++ b/packages/lightmediascanner/lightmediascanner_svn.bb
@@ -4,7 +4,8 @@ HOMEPAGE = "http://lms.garage.maemo.org/"
 AUTHOR = "Gustavo Barbieri"
 LICENSE = "LGPL"
 DEPENDS = "sqlite3"
-PV = "0.1.0+svn${SRCREV}"
+PV = "0.1.0+svnr${SRCREV}"
+PE = "1"
 
 SRC_URI = "svn://garage.maemo.org/svn/lms/;module=lightmediascanner;proto=https"
 S = "${WORKDIR}/lightmediascanner"
diff --git a/packages/linux/linux-kaiser_2.6.24+git.bb b/packages/linux/linux-kaiser_2.6.24+git.bb
index 73eb1e3b46..1fd64bfb9e 100644
--- a/packages/linux/linux-kaiser_2.6.24+git.bb
+++ b/packages/linux/linux-kaiser_2.6.24+git.bb
@@ -1,7 +1,8 @@
 require linux.inc
 
-PV = "2.6.24+git${SRCREV}"
+PV = "2.6.24+gitr${SRCREV}"
 PR = "r1"
+PE = "1"
 
 COMPATIBLE_MACHINE = "htckaiser|htcpolaris"
 
diff --git a/packages/linux/linux-neuros_git.bb b/packages/linux/linux-neuros_git.bb
index 883bb69a2a..97e32cdac4 100644
--- a/packages/linux/linux-neuros_git.bb
+++ b/packages/linux/linux-neuros_git.bb
@@ -4,8 +4,9 @@ DESCRIPTION = "Linux kernel for Neuros OSD devices"
 
 SRCREV = "2eaa4a30d599203ceed1b5a42d713b29151a39eb"
 
-PV = "2.6.23-${PR}+git${SRCREV}"
+PV = "2.6.23-${PR}+gitr${SRCREV}"
 PR = "r13"
+PE = "1"
 
 COMPATIBLE_MACHINE = "(neuros-osd|neuros-osd2)"
 
diff --git a/packages/linux/linux-xilinx-slab_git.bb b/packages/linux/linux-xilinx-slab_git.bb
index df71fee865..2900ad9516 100644
--- a/packages/linux/linux-xilinx-slab_git.bb
+++ b/packages/linux/linux-xilinx-slab_git.bb
@@ -8,7 +8,8 @@ LICENSE = "GPL"
 SRCREV = "d7ed933b578d9c4dec0e23a5a6f78c464b31c47c"
 
 PR = "r3"
-PV = "2.6.25+2.6.26+${PR}+git${SRCREV}"
+PV = "2.6.25+2.6.26+${PR}+gitr${SRCREV}"
+PE = "1"
 
 COMPATIBLE_MACHINE = "xilinx-ml403"
 
diff --git a/packages/mesa/mesa-dri_git.bb b/packages/mesa/mesa-dri_git.bb
index d9e61d8a5c..ec4557f426 100644
--- a/packages/mesa/mesa-dri_git.bb
+++ b/packages/mesa/mesa-dri_git.bb
@@ -5,8 +5,9 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
 
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
 
-PV = "7.2+git${SRCREV}"
+PV = "7.2+gitr${SRCREV}"
 PR = "r1"
+PE = "1"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/mplayer/mplayer-maemo_svn.bb b/packages/mplayer/mplayer-maemo_svn.bb
index 5fb3425e64..4e794d0fbe 100644
--- a/packages/mplayer/mplayer-maemo_svn.bb
+++ b/packages/mplayer/mplayer-maemo_svn.bb
@@ -6,7 +6,8 @@ DEPENDS = "virtual/libsdl xsp libmad zlib libpng jpeg liba52 freetype fontconfig
 
 DEFAULT_PREFERENCE_avr32 = "-1"
 
-PV = "0.0+1.0rc1+svn${SRCREV}"
+PV = "0.0+1.0rc1+svnr${SRCREV}"
+PE = "1"
 
 RCONFLICTS_${PN} = "mplayer"
 
diff --git a/packages/openmoko-projects/enlazar_svn.bb b/packages/openmoko-projects/enlazar_svn.bb
index 38fdab4747..4d86dc6a06 100644
--- a/packages/openmoko-projects/enlazar_svn.bb
+++ b/packages/openmoko-projects/enlazar_svn.bb
@@ -3,9 +3,9 @@ HOMEPAGE = "http://enlazar.projects.openmoko.org/"
 LICENSE = "GPL"
 DEPENDS = "evas edje ecore edbus"
 RDEPENDS = "networkmanager"
-PV = "0.1+svn${SRCREV}"
+PV = "0.1+svnr${SRCREV}"
 PR = "r3"
-PE = "1"
+PE = "2"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/enlazar;module=trunk;proto=http"
 
diff --git a/packages/python/python-lightmediascanner_svn.bb b/packages/python/python-lightmediascanner_svn.bb
index 003b718d4b..3d81c625de 100644
--- a/packages/python/python-lightmediascanner_svn.bb
+++ b/packages/python/python-lightmediascanner_svn.bb
@@ -4,7 +4,8 @@ HOMEPAGE = "http://lms.garage.maemo.org/"
 AUTHOR = "Gustavo Barbieri"
 LICENSE = "LGPL"
 DEPENDS = "lightmediascanner python-cython-native"
-PV = "0.1.0+svn${SRCREV}"
+PV = "0.1.0+svnr${SRCREV}"
+PE = "1"
 
 SRC_URI = "svn://garage.maemo.org/svn/lms/;module=python-lightmediascanner;proto=https"
 S = "${WORKDIR}/python-lightmediascanner"
diff --git a/packages/remoko/remoko-server_svn.bb b/packages/remoko/remoko-server_svn.bb
index 6e049d7c70..d246e1d2c5 100644
--- a/packages/remoko/remoko-server_svn.bb
+++ b/packages/remoko/remoko-server_svn.bb
@@ -3,7 +3,8 @@ HOMEPAGE = "http://code.google.com/p/remoko/"
 AUTHOR = "Valério Valério"
 LICENSE = "GPL"
 SECTION = "console/network"
-PV = "0.2+svn${SRCREV}"
+PV = "0.2+svnr${SRCREV}"
+PE = "1"
 
 SRC_URI = "svn://remoko.googlecode.com/svn/trunk;module=BT_HID_Server;proto=http"
 S = "${WORKDIR}/BT_HID_Server"
diff --git a/packages/remoko/remoko_svn.bb b/packages/remoko/remoko_svn.bb
index 551a54b79e..475e3cc81e 100644
--- a/packages/remoko/remoko_svn.bb
+++ b/packages/remoko/remoko_svn.bb
@@ -4,7 +4,8 @@ AUTHOR = "Valério Valério"
 LICENSE = "GPL"
 SECTION = "console/network"
 DEPENDS = "edje-native"
-PV = "0.3.1+svn${SRCREV}"
+PV = "0.3.1+svnr${SRCREV}"
+PE = "1"
 
 SRC_URI = "svn://remoko.googlecode.com/svn/trunk;module=BT_HID_UI;proto=http"
 S = "${WORKDIR}/BT_HID_UI"
diff --git a/packages/smpeg/smpeg_svn.bb b/packages/smpeg/smpeg_svn.bb
index e6c0f6444a..656980f8cf 100644
--- a/packages/smpeg/smpeg_svn.bb
+++ b/packages/smpeg/smpeg_svn.bb
@@ -4,7 +4,8 @@ LICENSE = "LGPL"
 SECTION = "libs/multimedia"
 DEPENDS = "virtual/libsdl"
 PROVIDES = "smpeg"
-PV = "0.4.5+rsvn${SRCREV}"
+PV = "0.4.5+svnr${SRCREV}"
+PE = "1"
 SRCREV = "370"
 
 SRC_URI = "svn://svn.icculus.org/smpeg/;module=trunk  \
diff --git a/packages/u-boot/u-boot-omap3_git.bb b/packages/u-boot/u-boot-omap3_git.bb
index 56ca67bb60..714ca0b0f1 100644
--- a/packages/u-boot/u-boot-omap3_git.bb
+++ b/packages/u-boot/u-boot-omap3_git.bb
@@ -4,8 +4,9 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-omap3-git/${M
 
 SRCREV = "08d7fdcce5dde5c2dc968fac5b2facf17cbabb5"
 
-PV = "2008.10+${PR}+git${SRCREV}"
+PV = "2008.10+${PR}+gitr${SRCREV}"
 PR ="r2"
+PE = "1"
 
 SRC_URI = "git://www.sakoman.net/git/u-boot-omap3.git;branch=common;protocol=git \
           "
diff --git a/packages/x-load/x-load_git.bb b/packages/x-load/x-load_git.bb
index 439262c048..d7c7a642a5 100644
--- a/packages/x-load/x-load_git.bb
+++ b/packages/x-load/x-load_git.bb
@@ -4,8 +4,9 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/x-load-git/${MACHINE
 
 SRCREV = "73eb0caf065b3b3f407d8af5c4836624e5cc7b69"
 
-PV = "1.42+${PR}+git${SRCREV}"
+PV = "1.42+${PR}+gitr${SRCREV}"
 PR ="r7"
+PE = "1"
 
 SRC_URI = "git://www.sakoman.net/git/x-load-omap3.git;branch=master;protocol=git"
 
diff --git a/packages/xorg-driver/xf86-video-omapfb_git.bb b/packages/xorg-driver/xf86-video-omapfb_git.bb
index d81f7622be..df765d4a6d 100644
--- a/packages/xorg-driver/xf86-video-omapfb_git.bb
+++ b/packages/xorg-driver/xf86-video-omapfb_git.bb
@@ -5,7 +5,8 @@ DESCRIPTION = "X.Org X server -- OMAP display driver"
 PR ="r14"
 
 SRCREV = "e33601fe4c4c5e0d093321f86a633047056c7445"
-PV = "0.0.1+${PR}+git${SRCREV}"
+PV = "0.0.1+${PR}+gitr${SRCREV}"
+PE = "1"
 
 SRC_URI = "git://git.pingu.fi/xf86-video-omapfb.git;protocol=http"
 
diff --git a/packages/xorg-lib/libxcalibrate_git.bb b/packages/xorg-lib/libxcalibrate_git.bb
index 24b4a1f067..f9e1587ef1 100644
--- a/packages/xorg-lib/libxcalibrate_git.bb
+++ b/packages/xorg-lib/libxcalibrate_git.bb
@@ -3,7 +3,8 @@ require xorg-lib-common.inc
 DESCRIPTION = "	Touchscreen calibration client library"
 LICENSE = "BSD-X"
 DEPENDS = "virtual/libx11 calibrateproto libxext"
-PV = "0.0+git${SRCREV}"
+PV = "0.0+gitr${SRCREV}"
+PE = "1"
 
 SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate;protocol=git"
 
diff --git a/packages/xorg-proto/calibrateproto_git.bb b/packages/xorg-proto/calibrateproto_git.bb
index 02d20b5038..fe9e1a43a1 100644
--- a/packages/xorg-proto/calibrateproto_git.bb
+++ b/packages/xorg-proto/calibrateproto_git.bb
@@ -2,8 +2,9 @@ require xorg-proto-common.inc
 
 DESCRIPTION = "Touchscreen calibration protocol"
 
-PV = "0.0+git${SRCREV}"
+PV = "0.0+gitr${SRCREV}"
 PR = "r1"
+PE = "1"
 
 SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto;protocol=git"
 S = "${WORKDIR}/git"