[oe-commits] org.oe.dev merge of '5b214d5b98fc841f5638a7aae10346be791d4f6e'

[xjqian commit]

merge of '5b214d5b98fc841f5638a7aae10346be791d4f6e'
     and '77ea16d350b9eb0460b41c2afb44180a4ecdc778'

Author: xjqian at openembedded.org
Branch: org.openembedded.dev
Revision: 5eb9119dd09c221e6e2fefd02b9fae130166b0c8
ViewMTN: http://monotone.openembedded.org/revision/info/5eb9119dd09c221e6e2fefd02b9fae130166b0c8
Files:
1
packages/mpfr/mpfr-native_2.3.0.bb
packages/mpfr/mpfr-native_2.3.1.bb
packages/mpfr/mpfr_2.3.0.bb
packages/mpfr/mpfr_2.3.1.bb
packages/glib-2.0/glib-2.0_2.16.1.bb
Diffs:

#
# mt diff -r5b214d5b98fc841f5638a7aae10346be791d4f6e -r5eb9119dd09c221e6e2fefd02b9fae130166b0c8
#
#
#
# rename "packages/mpfr/mpfr-native_2.3.0.bb"
#     to "packages/mpfr/mpfr-native_2.3.1.bb"
# 
# rename "packages/mpfr/mpfr_2.3.0.bb"
#     to "packages/mpfr/mpfr_2.3.1.bb"
# 
# patch "packages/mpfr/mpfr_2.3.1.bb"
#  from [b20fb238456f28535fb57b617caa5604cb87c127]
#    to [5cddf656cfc181d1b6c96d93b3c84c10bbb47f34]
#
============================================================
--- packages/mpfr/mpfr_2.3.0.bb	b20fb238456f28535fb57b617caa5604cb87c127
+++ packages/mpfr/mpfr_2.3.1.bb	5cddf656cfc181d1b6c96d93b3c84c10bbb47f34
@@ -1,7 +1,7 @@ DEPENDS = "gmp"
 require mpfr.inc
 
 DEPENDS = "gmp"
-PR = "r1"
+PR = "r0"
 
 SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.bz2"
 S = "${WORKDIR}/mpfr-${PV}"


#
# mt diff -r77ea16d350b9eb0460b41c2afb44180a4ecdc778 -r5eb9119dd09c221e6e2fefd02b9fae130166b0c8
#
#
#
# patch "packages/glib-2.0/glib-2.0_2.16.1.bb"
#  from [d529224930628fa212035aa5d6d59d7868e6caf4]
#    to [3a48d903a74285a67c66bab7fd96be2bf1e1270a]
#
============================================================
--- packages/glib-2.0/glib-2.0_2.16.1.bb	d529224930628fa212035aa5d6d59d7868e6caf4
+++ packages/glib-2.0/glib-2.0_2.16.1.bb	3a48d903a74285a67c66bab7fd96be2bf1e1270a
@@ -1,5 +1,7 @@ require glib.inc
 require glib.inc
 
+PR = "r3"
+
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
            file://configure-libtool.patch;patch=1 \