[oe-commits] org.oe.dev merge of '1381c99b5b235453ffd6d1e9c2eaeae4f080910b'

Mon Sep 1 18:10:03 UTC 2008

merge of '1381c99b5b235453ffd6d1e9c2eaeae4f080910b'
     and 'dbeff9227117d6552a46cabd79dc42643b6feebe'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: df7aebb70b0a281903694dd4a1221fae63e2c7b6
ViewMTN: http://monotone.openembedded.org/revision/info/df7aebb70b0a281903694dd4a1221fae63e2c7b6
Files:
1
packages/gpe-memo
packages/gpe-memo/gpe-memo_0.2.bb
packages/maemo4/osso-gnome-vfs2_2.16.3.bb
conf/distro/include/sane-srcrevs.inc
packages/apt/apt-native_0.6.46.2.bb
packages/apt/apt-native_0.7.2.bb
packages/apt/apt-native_0.7.3.bb
packages/apt/apt-package.inc
packages/apt/apt_0.5.28.6.bb
packages/apt/apt_0.6.25.bb
packages/apt/apt_0.6.46.2.bb
packages/apt/apt_0.7.2.bb
packages/apt/apt_0.7.3.bb
Diffs:

#
# mt diff -r1381c99b5b235453ffd6d1e9c2eaeae4f080910b -rdf7aebb70b0a281903694dd4a1221fae63e2c7b6
#
#
#
# add_dir "packages/gpe-memo"
# 
# add_file "packages/gpe-memo/gpe-memo_0.2.bb"
#  content [388b2fac728542b4c47ba5fa38942475892fd5e8]
# 
# patch "packages/maemo4/osso-gnome-vfs2_2.16.3.bb"
#  from [3665eb673cea6a75e2df36a17daa87464aeb50c4]
#    to [7586b901cf335cd8829daea1fe516b43468ba635]
#
============================================================

--- packages/gpe-memo/gpe-memo_0.2.bb	388b2fac728542b4c47ba5fa38942475892fd5e8
+++ packages/gpe-memo/gpe-memo_0.2.bb	388b2fac728542b4c47ba5fa38942475892fd5e8
@@ -0,0 +1,9 @@
+DESCRIPTION = "GPE Voice Notes Recorder"
+SECTION = "gpe/multimedia"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "gtk+ libgpewidget libgsm gpe-soundserver"
+
+GPE_TARBALL_SUFFIX = "bz2"
+inherit gpe autotools
+
============================================================
--- packages/maemo4/osso-gnome-vfs2_2.16.3.bb	3665eb673cea6a75e2df36a17daa87464aeb50c4
+++ packages/maemo4/osso-gnome-vfs2_2.16.3.bb	7586b901cf335cd8829daea1fe516b43468ba635
@@ -26,6 +26,9 @@ do_configure_prepend() {
 	# remove Werror from VFS_CFLAGS
 	sed -i s:-Werror::g configure.in
 
+	# G_GNUC_FUNCTION is deprecated
+	sed -i -e s,-DG_DISABLE_DEPRECATED,-DSED_ROCKS_DUDE, */Makefile.am
+
 	touch gtk-doc.make
 }
 


#
# mt diff -rdbeff9227117d6552a46cabd79dc42643b6feebe -rdf7aebb70b0a281903694dd4a1221fae63e2c7b6
#
#
#
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [3695a9c6c8bc8f564bfab557a07a7e454aa63eb3]
#    to [cf047c3c8c3891be3a3ebe03a25ca6e2f491fb49]
# 
# patch "packages/apt/apt-native_0.6.46.2.bb"
#  from [df9f37be753866b1cc3ed597d51f32c1b95bfb30]
#    to [8dc4f447d98f36e642ab9f2f30fcdbee93e157fa]
# 
# patch "packages/apt/apt-native_0.7.2.bb"
#  from [8dc4f447d98f36e642ab9f2f30fcdbee93e157fa]
#    to [b0989d5e0870cc4e217b461d8365a97faa3193c6]
# 
# patch "packages/apt/apt-native_0.7.3.bb"
#  from [b0989d5e0870cc4e217b461d8365a97faa3193c6]
#    to [b296813333921222120126bf76051ba8dcbd29cd]
# 
# patch "packages/apt/apt-package.inc"
#  from [776b438ed4e20204678a1baba2ed113b69e73334]
#    to [82aefdf060f85e22aa8a3f790687444c01de80c1]
# 
# patch "packages/apt/apt_0.5.28.6.bb"
#  from [97cef0ebac33a0363846bc944cb9e768a614e2fa]
#    to [dd4e71e08d5ca242b3f590ca87ea5d555a20bce4]
# 
# patch "packages/apt/apt_0.6.25.bb"
#  from [0f3a5a95b1f9de3a0c08c450223a098240be0e11]
#    to [16d6cbc9351adceca7f15831bf0bfba0c2c82c12]
# 
# patch "packages/apt/apt_0.6.46.2.bb"
#  from [f19c6a43f30f0f7b3b2bb4f99efa8133afc8082c]
#    to [ae7a0357c0bb8db7bbe66b435fc016d45fb1db98]
# 
# patch "packages/apt/apt_0.7.2.bb"
#  from [63322e840f089261ba0cacb99e97bda6eb5b1998]
#    to [4c83441a8d95f0cfcd8f51265118cf5956ff58ae]
# 
# patch "packages/apt/apt_0.7.3.bb"
#  from [b35d540f7bc7597c24ad2ee48b326f68b11b2a73]
#    to [4c83441a8d95f0cfcd8f51265118cf5956ff58ae]
#
============================================================
--- conf/distro/include/sane-srcrevs.inc	3695a9c6c8bc8f564bfab557a07a7e454aa63eb3
+++ conf/distro/include/sane-srcrevs.inc	cf047c3c8c3891be3a3ebe03a25ca6e2f491fb49
@@ -57,6 +57,7 @@ SRCREV_pn-libgsmd ?= "4335"
 SRCREV_pn-libexalt-dbus ?= "76"
 SRCREV_pn-libfakekey ?= "1455"
 SRCREV_pn-libgsmd ?= "4335"
+SRCREV_pn-libiac ?= "1590"
 SRCREV_pn-libjana ?= "704"
 SRCREV_pn-libmokogsmd2 ?= "4334"
 SRCREV_pn-libmokojournal2 ?= "3473"
============================================================
--- packages/apt/apt-native_0.6.46.2.bb	df9f37be753866b1cc3ed597d51f32c1b95bfb30
+++ packages/apt/apt-native_0.6.46.2.bb	8dc4f447d98f36e642ab9f2f30fcdbee93e157fa
@@ -1,5 +1,5 @@ require apt-native.inc
 require apt-native.inc
-PR = "r1"
+PR = "r2"
 
 SRC_URI += "file://nodoc.patch;patch=1 \
             file://noconfigure.patch;patch=1"
============================================================
--- packages/apt/apt-native_0.7.2.bb	8dc4f447d98f36e642ab9f2f30fcdbee93e157fa
+++ packages/apt/apt-native_0.7.2.bb	b0989d5e0870cc4e217b461d8365a97faa3193c6
@@ -1,5 +1,5 @@ require apt-native.inc
 require apt-native.inc
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "file://nodoc.patch;patch=1 \
             file://noconfigure.patch;patch=1"
============================================================
--- packages/apt/apt-native_0.7.3.bb	b0989d5e0870cc4e217b461d8365a97faa3193c6
+++ packages/apt/apt-native_0.7.3.bb	b296813333921222120126bf76051ba8dcbd29cd
@@ -1,5 +1,5 @@ require apt-native.inc
 require apt-native.inc
-PR = "r3"
+PR = "r4"
 
 SRC_URI += "file://nodoc.patch;patch=1 \
             file://noconfigure.patch;patch=1"
============================================================
--- packages/apt/apt-package.inc	776b438ed4e20204678a1baba2ed113b69e73334
+++ packages/apt/apt-package.inc	82aefdf060f85e22aa8a3f790687444c01de80c1
@@ -58,6 +58,7 @@ FILES_${PN} = "${bindir}/apt-cdrom ${bin
 	       ${libdir}/apt ${libdir}/libapt*.so.* \
 	       ${localstatedir} ${sysconfdir} \
 	       ${libdir}/dpkg"
+FILES_${PN}-dbg += = "${libdir}/apt/*/.debug"
 FILES_${PN}-utils = "${bindir}/apt-sortpkgs ${bindir}/apt-extracttemplates"
 FILES_${PN}-doc = "${@get_files_apt_doc(d, bb, bb.data.getVar('apt-manpages', d, 1))} \
 		   ${docdir}/apt"
============================================================
--- packages/apt/apt_0.5.28.6.bb	97cef0ebac33a0363846bc944cb9e768a614e2fa
+++ packages/apt/apt_0.5.28.6.bb	dd4e71e08d5ca242b3f590ca87ea5d555a20bce4
@@ -1,5 +1,5 @@ require apt.inc
 require apt.inc
-PR = "r1"
+PR = "r2"
 
 SRC_URI += "file://autofoo.patch;patch=1"
 
============================================================
--- packages/apt/apt_0.6.25.bb	0f3a5a95b1f9de3a0c08c450223a098240be0e11
+++ packages/apt/apt_0.6.25.bb	16d6cbc9351adceca7f15831bf0bfba0c2c82c12
@@ -1,6 +1,6 @@ require apt.inc
 require apt.inc
+PR = "r3"
 
-PR = "r2"
 SRC_URI += "file://autofoo.patch;patch=1"
 
 inherit autotools gettext
============================================================
--- packages/apt/apt_0.6.46.2.bb	f19c6a43f30f0f7b3b2bb4f99efa8133afc8082c
+++ packages/apt/apt_0.6.46.2.bb	ae7a0357c0bb8db7bbe66b435fc016d45fb1db98
@@ -1,4 +1,5 @@ require apt.inc
 require apt.inc
+PR = "r2"
 
 SRC_URI += "file://nodoc.patch;patch=1"
 
@@ -7,5 +8,4 @@ apt-manpages += "doc/apt-key.8"
 FILES_${PN} += "${bindir}/apt-key"
 apt-manpages += "doc/apt-key.8"
 
-PR = "r1"
 
============================================================
--- packages/apt/apt_0.7.2.bb	63322e840f089261ba0cacb99e97bda6eb5b1998
+++ packages/apt/apt_0.7.2.bb	4c83441a8d95f0cfcd8f51265118cf5956ff58ae
@@ -1,5 +1,5 @@ require apt.inc
 require apt.inc
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "file://nodoc.patch;patch=1"
 
============================================================
--- packages/apt/apt_0.7.3.bb	b35d540f7bc7597c24ad2ee48b326f68b11b2a73
+++ packages/apt/apt_0.7.3.bb	4c83441a8d95f0cfcd8f51265118cf5956ff58ae
@@ -1,5 +1,5 @@ require apt.inc
 require apt.inc
-PR = "r1"
+PR = "r3"
 
 SRC_URI += "file://nodoc.patch;patch=1"
 




