Merge bk://openembedded@openembedded.bkbits.net/packages

into stealth.(none):/home/pb/oe/oe-packages

2004/08/09 17:15:33+01:00 (none)!pb
apply UI patch from Florian Boor

BKrev: 4117a337tbJ6l3jnY-JUXc6bN8AWaA

diff --git a/galculator/gnome-calc2.png b/galculator/files/gnome-calc2.png
similarity index 100%
rename from galculator/gnome-calc2.png
rename to galculator/files/gnome-calc2.png

diff --git a/galculator/galculator-1.2.3/src-ui.c.patch b/galculator/galculator-1.2.3/src-ui.c.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/galculator/galculator_1.2.3.oe b/galculator/galculator_1.2.3.oe
index 4c1f73e..efac600 100644 (file)
--- a/galculator/galculator_1.2.3.oe
+++ b/galculator/galculator_1.2.3.oe
@@ -1,4 +1,4 @@
-PR = "r5"
+PR = "r6"
 
 inherit autotools pkgconfig gconf
 
@@ -12,9 +12,9 @@ PRIORITY = "optional"
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
         file://desktop-categories.patch;patch=1 \
        file://gnome-calc2.png \
-        file://Makefile.am.patch;patch=1" 
+        file://Makefile.am.patch;patch=1 \
+        file://src-ui.c.patch;patch=1;pnum=0" 
 
-#EXTRA_OECONF = ""
 
 LDFLAGS += '-Wl,--export-dynamic'
 
@@ -22,4 +22,3 @@ do_install_append () {
         mkdir -p ${D}${datadir}/pixmaps
         install -m 0644 ${WORKDIR}/gnome-calc2.png ${D}${datadir}/pixmaps/gnome-calc2.png
 }
-