From 1008c8c2925767928b47d87b1e4b64004ea3d51b Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 20 Mar 2008 06:21:19 +0000 Subject: [PATCH] merge --- packages/gypsy/files/docs-reference-am.patch | 17 ----------------- .../.mtn2git_empty | 0 .../assassin_svn.bb | 0 .../diversity-daemon_svn.bb | 0 .../diversity-nav_svn.bb | 0 .../illume/.mtn2git_empty | 0 .../illume/include-path.diff | 0 .../illume_svn.bb | 0 .../tangogps/.mtn2git_empty | 0 .../tangogps/global-config-h.patch | 0 .../tangogps_0.7.bb | 0 .../.mtn2git_empty | 0 .../files/.mtn2git_empty | 0 .../files/disable-docbook2man.patch | 0 .../packagekit_git.bb | 0 15 files changed, 17 deletions(-) delete mode 100644 packages/gypsy/files/docs-reference-am.patch rename packages/{openmoko-projects => openmoko-projects.merge}/.mtn2git_empty (100%) rename packages/{openmoko-projects => openmoko-projects.merge}/assassin_svn.bb (100%) rename packages/{openmoko-projects => openmoko-projects.merge}/diversity-daemon_svn.bb (100%) rename packages/{openmoko-projects => openmoko-projects.merge}/diversity-nav_svn.bb (100%) rename packages/{openmoko-projects => openmoko-projects.merge}/illume/.mtn2git_empty (100%) rename packages/{openmoko-projects => openmoko-projects.merge}/illume/include-path.diff (100%) rename packages/{openmoko-projects => openmoko-projects.merge}/illume_svn.bb (100%) rename packages/{openmoko-projects => openmoko-projects.merge}/tangogps/.mtn2git_empty (100%) rename packages/{openmoko-projects => openmoko-projects.merge}/tangogps/global-config-h.patch (100%) rename packages/{openmoko-projects => openmoko-projects.merge}/tangogps_0.7.bb (100%) rename packages/{packagekit => packagekit.merge}/.mtn2git_empty (100%) rename packages/{packagekit => packagekit.merge}/files/.mtn2git_empty (100%) rename packages/{packagekit => packagekit.merge}/files/disable-docbook2man.patch (100%) rename packages/{packagekit => packagekit.merge}/packagekit_git.bb (100%) diff --git a/packages/gypsy/files/docs-reference-am.patch b/packages/gypsy/files/docs-reference-am.patch deleted file mode 100644 index 9eb0051d79..0000000000 --- a/packages/gypsy/files/docs-reference-am.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: gypsy/docs/reference/Makefile.am -=================================================================== ---- gypsy.orig/docs/reference/Makefile.am 2008-03-10 13:15:06.000000000 +0800 -+++ gypsy/docs/reference/Makefile.am 2008-03-10 13:15:24.000000000 +0800 -@@ -88,10 +88,10 @@ - - # Other files to distribute - # e.g. EXTRA_DIST += version.xml.in --EXTRA_DIST += version.xml.in \ -+EXTRA_DIST = version.xml.in \ - gypsy-design.png - --CLEANFILES += $(dbus_docs) -+CLEANFILES = $(dbus_docs) - - ref-%.xml: $(top_srcdir)/interfaces/%-full.xml - $(XSLT) -o $@ $(top_srcdir)/docs/tools/spec-to-docbook.xsl $< diff --git a/packages/openmoko-projects/.mtn2git_empty b/packages/openmoko-projects.merge/.mtn2git_empty similarity index 100% rename from packages/openmoko-projects/.mtn2git_empty rename to packages/openmoko-projects.merge/.mtn2git_empty diff --git a/packages/openmoko-projects/assassin_svn.bb b/packages/openmoko-projects.merge/assassin_svn.bb similarity index 100% rename from packages/openmoko-projects/assassin_svn.bb rename to packages/openmoko-projects.merge/assassin_svn.bb diff --git a/packages/openmoko-projects/diversity-daemon_svn.bb b/packages/openmoko-projects.merge/diversity-daemon_svn.bb similarity index 100% rename from packages/openmoko-projects/diversity-daemon_svn.bb rename to packages/openmoko-projects.merge/diversity-daemon_svn.bb diff --git a/packages/openmoko-projects/diversity-nav_svn.bb b/packages/openmoko-projects.merge/diversity-nav_svn.bb similarity index 100% rename from packages/openmoko-projects/diversity-nav_svn.bb rename to packages/openmoko-projects.merge/diversity-nav_svn.bb diff --git a/packages/openmoko-projects/illume/.mtn2git_empty b/packages/openmoko-projects.merge/illume/.mtn2git_empty similarity index 100% rename from packages/openmoko-projects/illume/.mtn2git_empty rename to packages/openmoko-projects.merge/illume/.mtn2git_empty diff --git a/packages/openmoko-projects/illume/include-path.diff b/packages/openmoko-projects.merge/illume/include-path.diff similarity index 100% rename from packages/openmoko-projects/illume/include-path.diff rename to packages/openmoko-projects.merge/illume/include-path.diff diff --git a/packages/openmoko-projects/illume_svn.bb b/packages/openmoko-projects.merge/illume_svn.bb similarity index 100% rename from packages/openmoko-projects/illume_svn.bb rename to packages/openmoko-projects.merge/illume_svn.bb diff --git a/packages/openmoko-projects/tangogps/.mtn2git_empty b/packages/openmoko-projects.merge/tangogps/.mtn2git_empty similarity index 100% rename from packages/openmoko-projects/tangogps/.mtn2git_empty rename to packages/openmoko-projects.merge/tangogps/.mtn2git_empty diff --git a/packages/openmoko-projects/tangogps/global-config-h.patch b/packages/openmoko-projects.merge/tangogps/global-config-h.patch similarity index 100% rename from packages/openmoko-projects/tangogps/global-config-h.patch rename to packages/openmoko-projects.merge/tangogps/global-config-h.patch diff --git a/packages/openmoko-projects/tangogps_0.7.bb b/packages/openmoko-projects.merge/tangogps_0.7.bb similarity index 100% rename from packages/openmoko-projects/tangogps_0.7.bb rename to packages/openmoko-projects.merge/tangogps_0.7.bb diff --git a/packages/packagekit/.mtn2git_empty b/packages/packagekit.merge/.mtn2git_empty similarity index 100% rename from packages/packagekit/.mtn2git_empty rename to packages/packagekit.merge/.mtn2git_empty diff --git a/packages/packagekit/files/.mtn2git_empty b/packages/packagekit.merge/files/.mtn2git_empty similarity index 100% rename from packages/packagekit/files/.mtn2git_empty rename to packages/packagekit.merge/files/.mtn2git_empty diff --git a/packages/packagekit/files/disable-docbook2man.patch b/packages/packagekit.merge/files/disable-docbook2man.patch similarity index 100% rename from packages/packagekit/files/disable-docbook2man.patch rename to packages/packagekit.merge/files/disable-docbook2man.patch diff --git a/packages/packagekit/packagekit_git.bb b/packages/packagekit.merge/packagekit_git.bb similarity index 100% rename from packages/packagekit/packagekit_git.bb rename to packages/packagekit.merge/packagekit_git.bb -- 2.39.5