navit: upstream SRC_URL change from cvs to svn

* tag svn srcrev 1096
* remove navit.xml-so.patch from _svn.bb
* partly close oebug 4351, need to bp to stable.

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 8b91857..65765eb 100644 (file)
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -82,6 +82,7 @@ SRCREV_pn-mpd-alsa ?= "6952"
 SRCREV_pn-mplayer ?= "26455"
 SRCREV_pn-mplayer-maemo ?= "342"
 SRCREV_pn-multitap-pad ?= "373"
+SRCREV_pn-navit ?= "1096"
 SRCREV_pn-neod ?= "4336"
 SRCREV_pn-netsurf ?= "3859"
 SRCREV_pn-networkmanager ?= "3202"

diff --git a/packages/navit/navit.inc b/packages/navit/navit.inc
index 23e3f9b..011c058 100644 (file)
--- a/packages/navit/navit.inc
+++ b/packages/navit/navit.inc
@@ -14,7 +14,6 @@ FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug"
 FILES_${PN}-dev += "${libdir}/${PN}/*/*.so ${libdir}/${PN}/*/*.la"
 
 SRC_URI_append = " \
-                  file://navit.xml-so.patch;patch=1 \
                   file://navit.desktop \
                   file://navit.launcher \
                 "

diff --git a/packages/navit/navit_0.0.4.bb b/packages/navit/navit_0.0.4.bb
index f1dfb1c..104495f 100644 (file)
--- a/packages/navit/navit_0.0.4.bb
+++ b/packages/navit/navit_0.0.4.bb
@@ -3,3 +3,5 @@ require navit.inc
 PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz"
+
+SRC_URI_append +=  "file://navit.xml-so.patch;patch=1"

diff --git a/packages/navit/navit_cvs.bb b/packages/navit/navit_cvs.bb
deleted file mode 100644 (file)
index 5739063..0000000
--- a/packages/navit/navit_cvs.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require navit.inc
-
-PV = "0.1.0+cvs${SRCDATE}"
-PR = "r0"
-
-DEFAULT_PREFERENCE = "-1"
-
-S = "${WORKDIR}/navit"
-
-SRC_URI = "cvs://anonymous@navit.cvs.sourceforge.net/cvsroot/navit;module=navit"
-
-EXTRA_AUTORECONF = " -I m4"
-

diff --git a/packages/navit/navit_svn.bb b/packages/navit/navit_svn.bb
new file mode 100644 (file)
index 0000000..2cf3750
--- /dev/null
+++ b/packages/navit/navit_svn.bb
@@ -0,0 +1,12 @@
+require navit.inc
+
+PV = "0.1.0+svnrev${SRCREV}"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+S = "${WORKDIR}/navit"
+
+SRC_URI = "svn://anonymous@navit.svn.sourceforge.net/svnroot/navit/trunk;module=navit;proto=https"
+
+EXTRA_AUTORECONF = " -I m4"