[oe-commits] org.oe.dev merge of '4f01b212b98a4b372493c483af8fda8300f38063'

[koen commit]

merge of '4f01b212b98a4b372493c483af8fda8300f38063'
     and '776dc04c7eba19512692b4d40a123d45e6adb862'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 3b3bdcaa9ad2328f02f412cfd58e88c216486d47
ViewMTN: http://monotone.openembedded.org/revision/info/3b3bdcaa9ad2328f02f412cfd58e88c216486d47
Files:
1
packages/gstreamer/gstreamer/po-makefile-fix.patch
packages/gstreamer/gstreamer_0.10.17.bb
conf/distro/include/sane-srcrevs.inc
Diffs:

#
# mt diff -r4f01b212b98a4b372493c483af8fda8300f38063 -r3b3bdcaa9ad2328f02f412cfd58e88c216486d47
#
#
#
# add_file "packages/gstreamer/gstreamer/po-makefile-fix.patch"
#  content [f1f912aed675c4ee4a95afc10ddc87ed6ee8ef9d]
# 
# patch "packages/gstreamer/gstreamer_0.10.17.bb"
#  from [5ed31adc22e5c777ea6a206f57d4e85992cd22b8]
#    to [ec06bc77d66c0e2f9c6286fa2dafe211dfacb017]
#
============================================================
--- packages/gstreamer/gstreamer/po-makefile-fix.patch	f1f912aed675c4ee4a95afc10ddc87ed6ee8ef9d
+++ packages/gstreamer/gstreamer/po-makefile-fix.patch	f1f912aed675c4ee4a95afc10ddc87ed6ee8ef9d
@@ -0,0 +1,13 @@
+Index: gstreamer-0.10.17/po/Makefile.in.in
+===================================================================
+--- gstreamer-0.10.17.orig/po/Makefile.in.in	2008-01-25 23:21:31.000000000 +0800
++++ gstreamer-0.10.17/po/Makefile.in.in	2008-03-20 19:10:54.000000000 +0800
+@@ -30,7 +30,7 @@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
++mkinstalldirs = $(MKINSTALLDIRS)
+ 
+ GMSGFMT = @GMSGFMT@
+ MSGFMT = @MSGFMT@
============================================================
--- packages/gstreamer/gstreamer_0.10.17.bb	5ed31adc22e5c777ea6a206f57d4e85992cd22b8
+++ packages/gstreamer/gstreamer_0.10.17.bb	ec06bc77d66c0e2f9c6286fa2dafe211dfacb017
@@ -1,3 +1,6 @@ require gstreamer.inc
 require gstreamer.inc
 
+PR = "r1"
+
+SRC_URI += "file://po-makefile-fix.patch;patch=1"
+
-PR = "r0"


#
# mt diff -r776dc04c7eba19512692b4d40a123d45e6adb862 -r3b3bdcaa9ad2328f02f412cfd58e88c216486d47
#
#
#
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [64e775c7452446ab8fb516b74096c5aad891a927]
#    to [55633da67c926669fe7beb444ae99d39d9af5462]
#
============================================================
--- conf/distro/include/sane-srcrevs.inc	64e775c7452446ab8fb516b74096c5aad891a927
+++ conf/distro/include/sane-srcrevs.inc	55633da67c926669fe7beb444ae99d39d9af5462
@@ -137,9 +137,9 @@ SRCREV_pn-openocd-native ?= "517"
 SRCREV_pn-openmoko-worldclock2 ?= "3365"
 SRCREV_pn-openocd ?= "517"
 SRCREV_pn-openocd-native ?= "517"
-SRCREV_pn-opkg ?= "4210"
-SRCREV_pn-opkg-native ?= "4210"
-SRCREV_pn-opkg-sdk ?= "4209"
+SRCREV_pn-opkg ?= "4235"
+SRCREV_pn-opkg-native ?= "4235"
+SRCREV_pn-opkg-sdk ?= "4235"
 SRCREV_pn-oprofileui ?= "160"
 SRCREV_pn-psplash ?= "249"
 SRCREV_pn-pylgrim ?= "20"