From: Koen Kooi <koen@openembedded.org>
Date: Wed, 26 Jul 2006 09:07:19 +0000 (+0000)
Subject: gpe-gallery: fix install badness and remove old versions
X-Git-Tag: Release-2010-05/1~9453^2~1121
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad6612ecfca7ded33e4c4bc8030eeb699629e73c;p=openembedded.git

gpe-gallery: fix install badness and remove old versions
---

diff --git a/packages/gpe-gallery/files/makefile-fix.patch b/packages/gpe-gallery/files/makefile-fix.patch
new file mode 100644
index 0000000000..ae4583573e
--- /dev/null
+++ b/packages/gpe-gallery/files/makefile-fix.patch
@@ -0,0 +1,11 @@
+--- /tmp/Makefile	2006-07-26 11:02:47.000000000 +0200
++++ gpe-gallery-0.97/Makefile	2006-07-26 11:05:07.584411000 +0200
+@@ -28,7 +28,7 @@
+ 	$(CC) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS)
+ 
+ install-program: all
+-	install -Ds $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE)
++	install -D -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE)
+ 	install -D -m 644 $(PACKAGE).png $(DESTDIR)$(PREFIX)/share/pixmaps/$(PACKAGE).png
+ 	install -D -m 644 $(PACKAGE).applications $(DESTDIR)/$(PREFIX)/share/application-registry/$(PACKAGE).applications
+ 	mkdir -p $(DESTDIR)$(PREFIX)/share/applications
diff --git a/packages/gpe-gallery/files/mcheck.patch b/packages/gpe-gallery/files/mcheck.patch
deleted file mode 100644
index a2f2376eba..0000000000
--- a/packages/gpe-gallery/files/mcheck.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: gpe-gallery-0.95/main.c
-===================================================================
---- gpe-gallery-0.95.orig/main.c	2004-09-07 09:01:39.000000000 -0500
-+++ gpe-gallery-0.95/main.c	2004-11-18 15:55:18.856050416 -0600
-@@ -19,7 +19,9 @@
- #include <fcntl.h>
- #include <math.h>
- #include <time.h>
-+#ifdef USE_MCHECK
- #include <mcheck.h>
-+#endif
- 
- #include <gtk/gtk.h>
- #include <gdk/gdk.h>
-@@ -1115,7 +1117,9 @@
-   GdkBitmap *bmap;
-   struct stat arg_stat;
- 
-+#ifdef USE_MCHECK
-   mtrace ();
-+#endif
- 
-   if (gpe_application_init (&argc, &argv) == FALSE)
-     exit (1);
diff --git a/packages/gpe-gallery/gpe-gallery_0.94.bb b/packages/gpe-gallery/gpe-gallery_0.94.bb
deleted file mode 100644
index 4409171f48..0000000000
--- a/packages/gpe-gallery/gpe-gallery_0.94.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-LICENSE = "GPL"
-PR = "r1"
-
-inherit gpe
-
-SRC_URI += "file://mcheck.patch;patch=1"
-DEPENDS = "libgpewidget"
-SECTION = "gpe"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
-
-FILES_${PN} += "${datadir}/gpe/pixmaps"
-FILES_${PN} += "${datadir}/application-registry"
-
-DESCRIPTION = "GPE image viewer application"
-export CVSBUILD = "no"
-
diff --git a/packages/gpe-gallery/gpe-gallery_0.95.bb b/packages/gpe-gallery/gpe-gallery_0.95.bb
deleted file mode 100644
index 4409171f48..0000000000
--- a/packages/gpe-gallery/gpe-gallery_0.95.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-LICENSE = "GPL"
-PR = "r1"
-
-inherit gpe
-
-SRC_URI += "file://mcheck.patch;patch=1"
-DEPENDS = "libgpewidget"
-SECTION = "gpe"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
-
-FILES_${PN} += "${datadir}/gpe/pixmaps"
-FILES_${PN} += "${datadir}/application-registry"
-
-DESCRIPTION = "GPE image viewer application"
-export CVSBUILD = "no"
-
diff --git a/packages/gpe-gallery/gpe-gallery_0.96.bb b/packages/gpe-gallery/gpe-gallery_0.96.bb
deleted file mode 100644
index 4a6a18a430..0000000000
--- a/packages/gpe-gallery/gpe-gallery_0.96.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-LICENSE = "GPL"
-PR = "r0"
-
-inherit gpe
-
-DEPENDS = "libgpewidget"
-SECTION = "gpe"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
-
-FILES_${PN} += "${datadir}/gpe/pixmaps"
-FILES_${PN} += "${datadir}/application-registry"
-
-DESCRIPTION = "GPE image viewer application"
-export CVSBUILD = "no"
-
diff --git a/packages/gpe-gallery/gpe-gallery_0.97.bb b/packages/gpe-gallery/gpe-gallery_0.97.bb
index 4a6a18a430..0f6e747b8a 100644
--- a/packages/gpe-gallery/gpe-gallery_0.97.bb
+++ b/packages/gpe-gallery/gpe-gallery_0.97.bb
@@ -3,6 +3,8 @@ PR = "r0"
 
 inherit gpe
 
+SRC_URI += "file://makefile-fix.patch;patch=1"
+
 DEPENDS = "libgpewidget"
 SECTION = "gpe"
 MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"