diff options
-rw-r--r-- | packages/angstrom/angstrom-feed-configs.bb | 11 | ||||
-rw-r--r-- | packages/angstrom/angstrom-version.bb | 3 | ||||
-rw-r--r-- | packages/ffmpeg/ffmpeg_svn.bb | 2 | ||||
-rw-r--r-- | packages/libowl/libowl_svn.bb | 2 | ||||
-rw-r--r-- | packages/libxosd/libxosd_svn.bb | 2 | ||||
-rw-r--r-- | packages/matchbox-keyboard/matchbox-keyboard_svn.bb | 10 | ||||
-rw-r--r-- | packages/matchbox-panel/matchbox-panel_svn.bb | 2 | ||||
-rw-r--r-- | packages/matchbox-themes-extra/matchbox-theme-sato_svn.bb | 4 | ||||
-rw-r--r-- | packages/matchbox2/matchbox-desktop-2_svn.bb | 2 | ||||
-rw-r--r-- | packages/matchbox2/matchbox-panel-2_svn.bb | 2 | ||||
-rw-r--r-- | packages/sphyrna/sphyrna_svn.bb | 2 | ||||
-rw-r--r-- | packages/tinymail/libtinymail_svn.bb | 2 | ||||
-rw-r--r-- | packages/xoo/xoo_svn.bb | 2 |
13 files changed, 29 insertions, 17 deletions
diff --git a/packages/angstrom/angstrom-feed-configs.bb b/packages/angstrom/angstrom-feed-configs.bb index 7645ee61ec..6730b6a044 100644 --- a/packages/angstrom/angstrom-feed-configs.bb +++ b/packages/angstrom/angstrom-feed-configs.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Configuration files for online package repositories aka feeds" -PR = "0" +PR = "1" PACKAGE_ARCH = "${MACHINE_ARCH}" FEED_BASEPATH ?= "unstable/feed/" @@ -21,3 +21,12 @@ do_install () { install -m 0644 ${S}/${sysconfdir}/ipkg/* ${D}${sysconfdir}/ipkg/ } +CONFFILES_${PN} += "${sysconfdir}/ipkg/base-feed.conf \ + ${sysconfdir}/ipkg/debug-feed.conf \ + ${sysconfdir}/ipkg/perl-feed.conf \ + ${sysconfdir}/ipkg/python-feed.conf \ + ${sysconfdir}/ipkg/gstreamer-feed.conf \ + ${sysconfdir}/ipkg/${MACHINE_ARCH}-feed.conf \ + ${sysconfdir}/ipkg/noarch-feed.conf \ + " + diff --git a/packages/angstrom/angstrom-version.bb b/packages/angstrom/angstrom-version.bb index 2488255b53..32f3f01635 100644 --- a/packages/angstrom/angstrom-version.bb +++ b/packages/angstrom/angstrom-version.bb @@ -1,9 +1,10 @@ PV = "${DISTRO_VERSION}" +PR = "r1" PACKAGES = "${PN}" PACKAGE_ARCH = "${MACHINE_ARCH}" -do_compile() { +do_install() { mkdir -p ${D}${sysconfdir} echo "Angstrom ${DISTRO_VERSION}" > ${D}${sysconfdir}/angstrom-version diff --git a/packages/ffmpeg/ffmpeg_svn.bb b/packages/ffmpeg/ffmpeg_svn.bb index 051363474e..5276a8fef6 100644 --- a/packages/ffmpeg/ffmpeg_svn.bb +++ b/packages/ffmpeg/ffmpeg_svn.bb @@ -3,7 +3,7 @@ SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "libogg zlib libvorbis faac liba52 lame" -PV = "0.4.9+svn${SRCDATE}" +PV = "0.4.9+svnr${SRCREV}" PR = "r1" DEFAULT_PREFERENCE = "-1" diff --git a/packages/libowl/libowl_svn.bb b/packages/libowl/libowl_svn.bb index 2126e3d4d0..7abc5e409d 100644 --- a/packages/libowl/libowl_svn.bb +++ b/packages/libowl/libowl_svn.bb @@ -12,7 +12,7 @@ HOMEPAGE = "http://www.o-hand.com" LICENSE = "LGPL" SECTION = "libs" PR = "r3" -PV = "0.0+svn${SRCDATE}" +PV = "0.0+svnr${SRCREV}" DEPENDS = "gtk+ glib-2.0" PACKAGES = "" diff --git a/packages/libxosd/libxosd_svn.bb b/packages/libxosd/libxosd_svn.bb index 7dfd05d5d9..bb16f7f09a 100644 --- a/packages/libxosd/libxosd_svn.bb +++ b/packages/libxosd/libxosd_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "A library for displaying a TV-like on-screen display in X." SECTION = "libs/x11" DEPENDS = "virtual/libx11 libxext" LICENSE = "LGPL" -PV = "2.2.15+svn${SRCDATE}" +PV = "2.2.15+svnr${SRCREV}" PR = "r5" SRC_URI = "svn://libxosd.svn.sourceforge.net/svnroot/libxosd/source;module=current;proto=https \ diff --git a/packages/matchbox-keyboard/matchbox-keyboard_svn.bb b/packages/matchbox-keyboard/matchbox-keyboard_svn.bb index ba002869c7..27ea4aea1d 100644 --- a/packages/matchbox-keyboard/matchbox-keyboard_svn.bb +++ b/packages/matchbox-keyboard/matchbox-keyboard_svn.bb @@ -4,14 +4,14 @@ DEPENDS = "libfakekey expat libxft" RCONFLICTS = matchbox-keyboard-inputmethod RPROVIDES_${PN} = matchbox-keyboard-inputmethod SECTION = "x11" -PV = "0.0+svn${SRCDATE}" +PV = "0.0+svnr${SRCREV}" PR="r6" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ file://smallscreen-fontsize.patch;patch=1 \ - file://2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch;patch=1 \ - file://3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch;patch=1 \ - file://4-Add-rendering-debug-logging.patch;patch=1 \ +# file://2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch;patch=1 \ +# file://3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch;patch=1 \ +# file://4-Add-rendering-debug-logging.patch;patch=1 \ file://5-Add-support-for-loading-multiple-independent-layouts.patch;patch=1 \ file://6-Add-layout-switch-key-to-all-layouts.patch;patch=1 \ " @@ -26,5 +26,5 @@ EXTRA_OECONF = "--disable-cairo" FILES_${PN} = "${bindir}/* \ ${datadir}/applications \ ${datadir}/pixmaps \ - ${datadir}/matchbox-keyboard" + ${datadir}/matchbox-keyboard" diff --git a/packages/matchbox-panel/matchbox-panel_svn.bb b/packages/matchbox-panel/matchbox-panel_svn.bb index 3ff258fe8f..e7fb3e6439 100644 --- a/packages/matchbox-panel/matchbox-panel_svn.bb +++ b/packages/matchbox-panel/matchbox-panel_svn.bb @@ -1,5 +1,5 @@ require matchbox-panel.inc -PV = "0.9.2+svn${SRCDATE}" +PV = "0.9.2+svnr${SRCREV}" DEFAULT_PREFERENCE = "-1" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" diff --git a/packages/matchbox-themes-extra/matchbox-theme-sato_svn.bb b/packages/matchbox-themes-extra/matchbox-theme-sato_svn.bb index 39b035bc7a..4972444211 100644 --- a/packages/matchbox-themes-extra/matchbox-theme-sato_svn.bb +++ b/packages/matchbox-themes-extra/matchbox-theme-sato_svn.bb @@ -3,7 +3,9 @@ LICENSE = "GPL" DEPENDS = "matchbox-wm" SECTION = "x11/wm" -PV = "0.1+svn${SRCDATE}" +DEFAULT_PREFERENCE = "-1" + +PV = "0.1+svnr${SRCREV}" PR = "r0" PACKAGE_ARCH = "all" diff --git a/packages/matchbox2/matchbox-desktop-2_svn.bb b/packages/matchbox2/matchbox-desktop-2_svn.bb index 31a6b9836d..8dc74ef509 100644 --- a/packages/matchbox2/matchbox-desktop-2_svn.bb +++ b/packages/matchbox2/matchbox-desktop-2_svn.bb @@ -3,7 +3,7 @@ LICENSE = "GPL" SECTION = "x11/panels" DEPENDS = "gtk+ startup-notification" -PV = "0.1+svn${SRCDATE}" +PV = "0.1+svnr${SRCREV}" PR = "r0" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" diff --git a/packages/matchbox2/matchbox-panel-2_svn.bb b/packages/matchbox2/matchbox-panel-2_svn.bb index 44d23e1a55..79fafff202 100644 --- a/packages/matchbox2/matchbox-panel-2_svn.bb +++ b/packages/matchbox2/matchbox-panel-2_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "matchbox-panel-2 is a lightweight dock (system tray) application LICENSE = "GPL" SECTION = "x11/panels" DEPENDS = "gtk+ apmd startup-notification" -PV = "0.1+svn${SRCDATE}" +PV = "0.1+svnr${SRCREV}" PR = "r8" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" diff --git a/packages/sphyrna/sphyrna_svn.bb b/packages/sphyrna/sphyrna_svn.bb index 048d001905..d2e90cf8f2 100644 --- a/packages/sphyrna/sphyrna_svn.bb +++ b/packages/sphyrna/sphyrna_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Sphyrna - Hammerhead Reverse Engineering" HOMEPAGE = "http://projects.linuxtogo.org/projects/sphyrna" LICENSE = "GPLv2" DEPENDS = "readline" -PV = "0.0+svn${SRCDATE}" +PV = "0.0+svnr${SRCREV}" PR = "r0" SRC_URI = "svn://projects.linuxtogo.org/svn;module=sphyrna" diff --git a/packages/tinymail/libtinymail_svn.bb b/packages/tinymail/libtinymail_svn.bb index 6792154e7a..300fee2cfa 100644 --- a/packages/tinymail/libtinymail_svn.bb +++ b/packages/tinymail/libtinymail_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "TinyMail is an attempt to create an E-mail framework for mobile d SECTION = "x11/utils" LICENSE = "LGPL" DEPENDS = "gtk+ glib-2.0 gnome-vfs gconf-dbus libgnomeui" -PV = "0.0.1+svn${SRCDATE}" +PV = "0.0.1+svnr${SRCREV}" PR = "r3" DEFAULT_PREFERENCE = "-1" diff --git a/packages/xoo/xoo_svn.bb b/packages/xoo/xoo_svn.bb index 71a39b057d..231122194b 100644 --- a/packages/xoo/xoo_svn.bb +++ b/packages/xoo/xoo_svn.bb @@ -4,7 +4,7 @@ It is intended for embedded developers that want to simulate a target device \ HOMEPAGE = "http://projects.o-hand.com/xoo" LICENSE = "GPL" DEPENDS = "virtual/libx11 libxtst gtk+ libglade" -PV = "0.7+svn${SRCDATE}" +PV = "0.7+svnr${SRCREV}" PR = "r1" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=Xoo;proto=http \ |