From 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 9 Dec 2004 09:47:41 +0000 Subject: Merge oe-devel@oe-devel.bkbits.net:openembedded into hyperion.kergoth.com:/home/kergoth/code/openembedded 2004/12/09 03:39:39-06:00 kergoth.com!kergoth Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit. BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA --- .../gpe-package-0.0.10/fix_interface_c.patch | 14 --- gpe-package/gpe-package-0.0.10/fix_makefile.patch | 37 ------- gpe-package/gpe-package-0.0.12/use-filesel.patch | 37 ------- .../gpe-package-0.0.9-1/fix_interface_c.patch | 14 --- .../gpe-package-0.0.9-1/fix_makefiles.patch | 123 --------------------- gpe-package/gpe-package_0.0.10.bb | 0 gpe-package/gpe-package_0.0.12.bb | 0 gpe-package/gpe-package_0.0.9-1.bb | 0 8 files changed, 225 deletions(-) delete mode 100644 gpe-package/gpe-package-0.0.10/fix_interface_c.patch delete mode 100644 gpe-package/gpe-package-0.0.10/fix_makefile.patch delete mode 100644 gpe-package/gpe-package-0.0.12/use-filesel.patch delete mode 100644 gpe-package/gpe-package-0.0.9-1/fix_interface_c.patch delete mode 100644 gpe-package/gpe-package-0.0.9-1/fix_makefiles.patch delete mode 100644 gpe-package/gpe-package_0.0.10.bb delete mode 100644 gpe-package/gpe-package_0.0.12.bb delete mode 100644 gpe-package/gpe-package_0.0.9-1.bb (limited to 'gpe-package') diff --git a/gpe-package/gpe-package-0.0.10/fix_interface_c.patch b/gpe-package/gpe-package-0.0.10/fix_interface_c.patch deleted file mode 100644 index 56764a646a..0000000000 --- a/gpe-package/gpe-package-0.0.10/fix_interface_c.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -urNd ../gpe-package-0.0.9-1-r0/gpe-package-0.0.9-1/interface.c gpe-package-0.0.9-1/interface.c ---- ../gpe-package-0.0.9-1-r0/gpe-package-0.0.9-1/interface.c 2004-03-12 12:00:46.000000000 +0000 -+++ gpe-package-0.0.9-1/interface.c 2004-07-27 14:40:06.000000000 +0100 -@@ -61,8 +61,8 @@ - #define TREE_SHOW_INST 0x01 - #define TREE_SHOW_NOTINST 0x02 - --#define HELPMESSAGE "GPE-Package\nVersion " VERSION \ -- "\nGPE frontend for ipkg\n\nflorian@handhelds.org" -+#define HELPMESSAGE "GPE-Package\nVersion " -+#define VERSION "\nGPE frontend for ipkg\n\nflorian@handhelds.org" - - #define NOHELPMESSAGE N_("Displaying help failed.") - diff --git a/gpe-package/gpe-package-0.0.10/fix_makefile.patch b/gpe-package/gpe-package-0.0.10/fix_makefile.patch deleted file mode 100644 index 73ae52867c..0000000000 --- a/gpe-package/gpe-package-0.0.10/fix_makefile.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -urNd ../gpe-package-0.0.10-r0/gpe-package-0.0.10/Makefile gpe-package-0.0.10/Makefile ---- ../gpe-package-0.0.10-r0/gpe-package-0.0.10/Makefile 2004-07-29 14:44:24.000000000 +0100 -+++ gpe-package-0.0.10/Makefile 2004-08-03 14:02:56.000000000 +0100 -@@ -3,7 +3,6 @@ - CVSBUILD = no - DEBUG = no - INSTALL = install --STRIP = strip - PREFIX = /usr/local - DESTDIR = / - -@@ -28,13 +27,13 @@ - - PACKAGE_CFLAGS += -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -D_GNU_SOURCE - PACKAGE_CFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" --PACKAGE_CFLAGS += -DIPKG_LIB -I/skiff/local/arm-linux/include/libipkg -+PACKAGE_CFLAGS += -DIPKG_LIB -I$(STAGING_INCDIR)/libipkg - - GTKCFLAGS = `pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0 libipkg` - GTKLDFLAGS = `pkg-config --libs gtk+-2.0 gdk-2.0 gdk-pixbuf-2.0 libipkg` - - PACKAGE_CFLAGS += $(GPECFLAGS) $(GTKCFLAGS) $(STANDARD_CFLAGS) --PACKAGE_LDFLAGS += $(GPELIBS) $(GTKLDFLAGS) $(STANDARD_LDFLAGS) -+PACKAGE_LDFLAGS += $(GPELIBS) $(GTKLDFLAGS) $(STANDARD_LDFLAGS) -lipkg - - OBJS = $(patsubst %,%.o,$(MEMBERS)) - DEPS = $(patsubst %,%.d,$(MEMBERS)) -@@ -53,8 +52,7 @@ - sed -e s/VERSION/$(VERSION)/ < familiar/control > $(DESTDIR)/CONTROL/control - mkdir -p $(DESTDIR)/etc/gpe - mkdir -p $(DESTDIR)/$(PREFIX)/bin -- $(INSTALL) $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) -- $(STRIP) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) -+ $(INSTALL) -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) - mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps - for i in $(PIXMAPS); do install -m 644 -D pixmaps/$$i $(DESTDIR)$(PREFIX)/share/pixmaps/$$i; done - mkdir -p $(DESTDIR)$(PREFIX)/share/applications diff --git a/gpe-package/gpe-package-0.0.12/use-filesel.patch b/gpe-package/gpe-package-0.0.12/use-filesel.patch deleted file mode 100644 index e15df6e199..0000000000 --- a/gpe-package/gpe-package-0.0.12/use-filesel.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -urNd ../gpe-package-0.0.12-r1/gpe-package-0.0.12/interface.c gpe-package-0.0.12/interface.c ---- ../gpe-package-0.0.12-r1/gpe-package-0.0.12/interface.c 2004-08-25 16:00:59.000000000 +0100 -+++ gpe-package-0.0.12/interface.c 2004-09-13 21:05:18.000000000 +0100 -@@ -42,8 +42,8 @@ - #include "packages.h" - #include "interface.h" - #include "main.h" --//#include "filesel.h" --#include "filechooser.h" -+#include "filesel.h" -+//#include "filechooser.h" - - #define N_(x) (x) - -@@ -730,8 +730,8 @@ - - void on_select_local(GtkButton *button, gpointer user_data) - { -- //ask_user_a_file("/tmp",_("Select package file"),do_local_install,NULL,NULL); -- package_choose(fMain, do_local_install); -+ ask_user_a_file("/tmp",_("Select package file"),do_local_install,NULL,NULL); -+ //package_choose(fMain, do_local_install); - } - - -diff -urNd ../gpe-package-0.0.12-r1/gpe-package-0.0.12/Makefile gpe-package-0.0.12/Makefile ---- ../gpe-package-0.0.12-r1/gpe-package-0.0.12/Makefile 2004-08-25 19:10:54.000000000 +0100 -+++ gpe-package-0.0.12/Makefile 2004-09-13 21:22:44.000000000 +0100 -@@ -18,7 +18,7 @@ - BUILD = build - endif - --MEMBERS = main interface packages filechooser -+MEMBERS = main interface packages filesel - - ifeq ($(DEBUG),yes) - CFLAGS += -g -DDEBUG diff --git a/gpe-package/gpe-package-0.0.9-1/fix_interface_c.patch b/gpe-package/gpe-package-0.0.9-1/fix_interface_c.patch deleted file mode 100644 index 56764a646a..0000000000 --- a/gpe-package/gpe-package-0.0.9-1/fix_interface_c.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -urNd ../gpe-package-0.0.9-1-r0/gpe-package-0.0.9-1/interface.c gpe-package-0.0.9-1/interface.c ---- ../gpe-package-0.0.9-1-r0/gpe-package-0.0.9-1/interface.c 2004-03-12 12:00:46.000000000 +0000 -+++ gpe-package-0.0.9-1/interface.c 2004-07-27 14:40:06.000000000 +0100 -@@ -61,8 +61,8 @@ - #define TREE_SHOW_INST 0x01 - #define TREE_SHOW_NOTINST 0x02 - --#define HELPMESSAGE "GPE-Package\nVersion " VERSION \ -- "\nGPE frontend for ipkg\n\nflorian@handhelds.org" -+#define HELPMESSAGE "GPE-Package\nVersion " -+#define VERSION "\nGPE frontend for ipkg\n\nflorian@handhelds.org" - - #define NOHELPMESSAGE N_("Displaying help failed.") - diff --git a/gpe-package/gpe-package-0.0.9-1/fix_makefiles.patch b/gpe-package/gpe-package-0.0.9-1/fix_makefiles.patch deleted file mode 100644 index 4e2a913af8..0000000000 --- a/gpe-package/gpe-package-0.0.9-1/fix_makefiles.patch +++ /dev/null @@ -1,123 +0,0 @@ -diff -urNd ../gpe-package-0.0.9-1-r0/gpe-package-0.0.9-1/build/Makefile.dpkg_ipkg gpe-package-0.0.9-1/build/Makefile.dpkg_ipkg ---- ../gpe-package-0.0.9-1-r0/gpe-package-0.0.9-1/build/Makefile.dpkg_ipkg 2004-03-19 12:26:57.000000000 +0000 -+++ gpe-package-0.0.9-1/build/Makefile.dpkg_ipkg 2004-07-27 21:21:30.000000000 +0100 -@@ -61,7 +61,7 @@ - clean: clean-dist - - check-source: -- @if ! grep -q '^Source:' familiar/$(CONTROL); then echo -e "\nNo Source: field in control file. Aborting.\n"; exit 1; fi -+ @if [ -e familiar ] && ! grep -q '^Source:' familiar/$(CONTROL); then echo -e "\nNo Source: field in control file. Aborting.\n"; exit 1; fi - - ipkg: check-source ipkg-prep clean - rm -rf familiar/dist -diff -urNd ../gpe-package-0.0.9-1-r0/gpe-package-0.0.9-1/Makefile gpe-package-0.0.9-1/Makefile ---- ../gpe-package-0.0.9-1-r0/gpe-package-0.0.9-1/Makefile 2004-03-19 12:26:57.000000000 +0000 -+++ gpe-package-0.0.9-1/Makefile 2004-07-27 22:02:38.000000000 +0100 -@@ -1,65 +1,27 @@ - PACKAGE = gpe-package - VERSION = 0.0.9-1 --NATIVE = yes - CVSBUILD = no - DEBUG = no --INSTALL = install --PREFIX = /usr/ --DESTDIR = / -+PREFIX = /usr - - LINGUAS = - --EXTRA_DESKTOPS = gpe-package.desktop.in -+EXTRA_DESKTOPS = gpe-package.desktop.in - HELPFILE = gpe-package.html - - ifeq ($(CVSBUILD),yes) --LDFLAGS += -L../libgpewidget -L../libdisplaymigration -ldisplaymigration -L. --CFLAGS += -Wall -I../libgpewidget -I. -I/home/fuchs/Projekte/gpe/familiar/dist/ipkg/C -+PACKAGE_CPPFLAGS += -I../libgpewidget -I../libdisplaymigration -I../libipkg -+PACKAGE_LDFLAGS += -L../libgpewidget -L../libdisplaymigration -L../libipkg - BUILD = ../build - else --CFLAGS += -I/usr/local/include/gpe -+PACKAGE_CPPFLAGS += $(STANDARD_CPPFLAGS) -+PACKAGE_CFLAGS += $(STANDARD_CFLAGS) $(GPECFLAGS) -I$(STAGING_INCDIR)/libipkg -DIPKG_LIB -+PACKAGE_LDFLAGS += $(STANDARD_LDFLAGS) $(GPELIBS) -lgpewidget -ldisplaymigration -lipkg - BUILD = build - endif - - MEMBERS = main interface packages filesel - --ifeq ($(DEBUG),yes) --CFLAGS += -g -DDEBUG --else --CFLAGS += -Os -fomit-frame-pointer --endif -- --CFLAGS += -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -D_GNU_SOURCE --CFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" --CFLAGS += -DIPKG_LIB -- --GTKCFLAGS = `pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0` --GTKLDFLAGS += `pkg-config --libs gtk+-2.0 gdk-2.0 gdk-pixbuf-2.0` -- --# setup how to compile --ifeq ($(NATIVE),yes) -- --STRIP=strip --CC=gcc -- --CFLAGS += $(GTKCFLAGS) -Wall --LDFLAGS += -lgpewidget `pkg-config --libs gtk+-2.0 gdk-pixbuf-2.0` --LDFLAGS += -lipkg -- --else # we do cross-compile... -- --CC=arm-linux-gcc --STRIP=arm-linux-strip -- --CFLAGS += -march=armv4 -mtune=strongarm --CFLAGS += $(GTKCFLAGS) -Wall --LDFLAGS += -lgpewidget $(GTKLDFLAGS) -Wall --LDFLAGS += -lipkg --LDFLAGS += -lXinerama -- --endif #native or cross-compile -- -- - OBJS = $(patsubst %,%.o,$(MEMBERS)) - DEPS = $(patsubst %,%.d,$(MEMBERS)) - SOURCES = $(patsubst %,%.c,$(MEMBERS)) -@@ -67,27 +29,27 @@ - - PIXMAPS = gpe-package.png local-package-16.png - --all: $(PACKAGE) -+all: $(PACKAGE) - - $(PACKAGE): $(OBJS) -- $(CC) -g -o $@ $(OBJS) $(LDFLAGS) -+ $(CC) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS) - - install-program: $(PACKAGE) all-desktop - mkdir -p $(DESTDIR)/CONTROL - sed -e s/VERSION/$(VERSION)/ < familiar/control > $(DESTDIR)/CONTROL/control - mkdir -p $(DESTDIR)/etc/gpe - mkdir -p $(DESTDIR)/$(PREFIX)/bin -- $(INSTALL) $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) -- $(STRIP) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) -+ install -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) - mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps - for i in $(PIXMAPS); do install -m 644 -D pixmaps/$$i $(DESTDIR)$(PREFIX)/share/pixmaps/$$i; done - mkdir -p $(DESTDIR)$(PREFIX)/share/applications -- $(INSTALL) -m 644 *.desktop $(DESTDIR)$(PREFIX)/share/applications -+ install -m 644 *.desktop $(DESTDIR)$(PREFIX)/share/applications - mkdir -p $(DESTDIR)$(PREFIX)/share/doc/gpe -- $(INSTALL) -m 644 $(HELPFILE) $(DESTDIR)$(PREFIX)/share/doc/gpe/ -+ install -m 644 $(HELPFILE) $(DESTDIR)$(PREFIX)/share/doc/gpe/ - - clean: - rm -f $(PACKAGE) $(OBJS) *~ */*~ *.ipk *.o - --include $(BUILD)/Makefile.dpkg_ipkg - include $(BUILD)/Makefile.translation -+include $(BUILD)/Makefile.dpkg_ipkg -+-include $(DEPS) diff --git a/gpe-package/gpe-package_0.0.10.bb b/gpe-package/gpe-package_0.0.10.bb deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/gpe-package/gpe-package_0.0.12.bb b/gpe-package/gpe-package_0.0.12.bb deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/gpe-package/gpe-package_0.0.9-1.bb b/gpe-package/gpe-package_0.0.9-1.bb deleted file mode 100644 index e69de29bb2..0000000000 -- cgit v1.2.3