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 --- .../matchbox-panel-0.8.1/automake-lossage.patch | 20 -------------------- .../make-batteryapp-less-strict.patch | 13 ------------- .../matchbox-panel-0.8.1/more-automake-lossage.patch | 10 ---------- .../make-batteryapp-less-strict.patch | 13 ------------- matchbox-panel/matchbox-panel_0.8.1.bb | 0 matchbox-panel/matchbox-panel_0.8.3.bb | 0 matchbox-panel/matchbox-panel_0.8.bb | 0 7 files changed, 56 deletions(-) delete mode 100644 matchbox-panel/matchbox-panel-0.8.1/automake-lossage.patch delete mode 100644 matchbox-panel/matchbox-panel-0.8.1/make-batteryapp-less-strict.patch delete mode 100644 matchbox-panel/matchbox-panel-0.8.1/more-automake-lossage.patch delete mode 100644 matchbox-panel/matchbox-panel-0.8.3/make-batteryapp-less-strict.patch delete mode 100644 matchbox-panel/matchbox-panel_0.8.1.bb delete mode 100644 matchbox-panel/matchbox-panel_0.8.3.bb delete mode 100644 matchbox-panel/matchbox-panel_0.8.bb (limited to 'matchbox-panel') diff --git a/matchbox-panel/matchbox-panel-0.8.1/automake-lossage.patch b/matchbox-panel/matchbox-panel-0.8.1/automake-lossage.patch deleted file mode 100644 index b8a8613779..0000000000 --- a/matchbox-panel/matchbox-panel-0.8.1/automake-lossage.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -urNa matchbox-panel-0.8.1/applets/Makefile.am matchbox-panel-0.8.1-patched/applets/Makefile.am ---- matchbox-panel-0.8.1/applets/Makefile.am 2004-02-07 12:48:56.000000000 -0500 -+++ matchbox-panel-0.8.1-patched/applets/Makefile.am 2004-06-15 21:15:30.000000000 -0400 -@@ -12,10 +12,12 @@ - bin_PROGRAMS = \ - mb-applet-clock mb-applet-menu-launcher mb-applet-wireless \ - mb-applet-launcher mb-applet-system-monitor mb-applet-battery -- -- mb_applet_battery_SOURCES = mb-applet-battery.c -- mb_applet_battery_LDADD = $(LIBMB_LIBS) $(SN_LIBS) -lapm -- -+mb_applet_battery_SOURCES = mb-applet-battery.c -+mb_applet_battery_OBJECTS = mb-applet-battery.$(OBJEXT) -+mb_applet_battery_LDADD = $(LIBMB_LIBS) $(SN_LIBS) -lapm -+mb-applet-battery$(EXEEXT): $(mb_applet_battery_OBJECTS) -+ @rm -f mb-applet-battery$(EXEEXT) -+ $(LINK) $(mb_applet_battery_LDFLAGS) $(mb_applet_battery_OBJECTS) $(mb_applet_battery_LDADD) $(LIBS) - else - bin_PROGRAMS = \ - mb-applet-clock mb-applet-menu-launcher mb-applet-wireless \ diff --git a/matchbox-panel/matchbox-panel-0.8.1/make-batteryapp-less-strict.patch b/matchbox-panel/matchbox-panel-0.8.1/make-batteryapp-less-strict.patch deleted file mode 100644 index 45bff32b9a..0000000000 --- a/matchbox-panel/matchbox-panel-0.8.1/make-batteryapp-less-strict.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -urNd ../matchbox-panel-0.8.1-r4/matchbox-panel-0.8.1/applets/mb-applet-battery.c matchbox-panel-0.8.1/applets/mb-applet-battery.c ---- ../matchbox-panel-0.8.1-r4/matchbox-panel-0.8.1/applets/mb-applet-battery.c 2004-02-25 22:58:09.000000000 +0000 -+++ matchbox-panel-0.8.1/applets/mb-applet-battery.c 2004-09-16 12:17:58.000000000 +0100 -@@ -385,8 +385,7 @@ - sprintf(tray_msg, _("AC Connected\nFully charged.\n")); - } else { - if (apm_vals[PERCENTAGE] > 0 -- && apm_vals[PERCENTAGE] < 100 -- && apm_vals[TIME_LEFT] > 0) -+ && apm_vals[PERCENTAGE] < 100) - { - sprintf(tray_msg, - _("Battery Power\nJuice %.2i %%\nTime left: %.2i mins\n"), apm_vals[PERCENTAGE], apm_vals[TIME_LEFT]); diff --git a/matchbox-panel/matchbox-panel-0.8.1/more-automake-lossage.patch b/matchbox-panel/matchbox-panel-0.8.1/more-automake-lossage.patch deleted file mode 100644 index 48959e0bf4..0000000000 --- a/matchbox-panel/matchbox-panel-0.8.1/more-automake-lossage.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- matchbox-panel-0.8.1/applets/Makefile.am.old 2004-07-03 11:37:03.000000000 +0100 -+++ matchbox-panel-0.8.1/applets/Makefile.am 2004-07-03 11:37:07.000000000 +0100 -@@ -13,7 +13,6 @@ - mb-applet-clock mb-applet-menu-launcher mb-applet-wireless \ - mb-applet-launcher mb-applet-system-monitor mb-applet-battery - mb_applet_battery_SOURCES = mb-applet-battery.c --mb_applet_battery_OBJECTS = mb-applet-battery.$(OBJEXT) - mb_applet_battery_LDADD = $(LIBMB_LIBS) $(SN_LIBS) -lapm - mb-applet-battery$(EXEEXT): $(mb_applet_battery_OBJECTS) - @rm -f mb-applet-battery$(EXEEXT) diff --git a/matchbox-panel/matchbox-panel-0.8.3/make-batteryapp-less-strict.patch b/matchbox-panel/matchbox-panel-0.8.3/make-batteryapp-less-strict.patch deleted file mode 100644 index 45bff32b9a..0000000000 --- a/matchbox-panel/matchbox-panel-0.8.3/make-batteryapp-less-strict.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -urNd ../matchbox-panel-0.8.1-r4/matchbox-panel-0.8.1/applets/mb-applet-battery.c matchbox-panel-0.8.1/applets/mb-applet-battery.c ---- ../matchbox-panel-0.8.1-r4/matchbox-panel-0.8.1/applets/mb-applet-battery.c 2004-02-25 22:58:09.000000000 +0000 -+++ matchbox-panel-0.8.1/applets/mb-applet-battery.c 2004-09-16 12:17:58.000000000 +0100 -@@ -385,8 +385,7 @@ - sprintf(tray_msg, _("AC Connected\nFully charged.\n")); - } else { - if (apm_vals[PERCENTAGE] > 0 -- && apm_vals[PERCENTAGE] < 100 -- && apm_vals[TIME_LEFT] > 0) -+ && apm_vals[PERCENTAGE] < 100) - { - sprintf(tray_msg, - _("Battery Power\nJuice %.2i %%\nTime left: %.2i mins\n"), apm_vals[PERCENTAGE], apm_vals[TIME_LEFT]); diff --git a/matchbox-panel/matchbox-panel_0.8.1.bb b/matchbox-panel/matchbox-panel_0.8.1.bb deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/matchbox-panel/matchbox-panel_0.8.3.bb b/matchbox-panel/matchbox-panel_0.8.3.bb deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/matchbox-panel/matchbox-panel_0.8.bb b/matchbox-panel/matchbox-panel_0.8.bb deleted file mode 100644 index e69de29bb2..0000000000 -- cgit v1.2.3