diff options
| -rw-r--r-- | packages/gypsy/files/docs-reference-am.patch | 17 | ||||
| -rw-r--r-- | packages/openmoko-projects.merge/.mtn2git_empty (renamed from packages/openmoko-projects/.mtn2git_empty) | 0 | ||||
| -rw-r--r-- | packages/openmoko-projects.merge/assassin_svn.bb (renamed from packages/openmoko-projects/assassin_svn.bb) | 0 | ||||
| -rw-r--r-- | packages/openmoko-projects.merge/diversity-daemon_svn.bb (renamed from packages/openmoko-projects/diversity-daemon_svn.bb) | 0 | ||||
| -rw-r--r-- | packages/openmoko-projects.merge/diversity-nav_svn.bb (renamed from packages/openmoko-projects/diversity-nav_svn.bb) | 0 | ||||
| -rw-r--r-- | packages/openmoko-projects.merge/illume/.mtn2git_empty (renamed from packages/openmoko-projects/illume/.mtn2git_empty) | 0 | ||||
| -rw-r--r-- | packages/openmoko-projects.merge/illume/include-path.diff (renamed from packages/openmoko-projects/illume/include-path.diff) | 0 | ||||
| -rw-r--r-- | packages/openmoko-projects.merge/illume_svn.bb (renamed from packages/openmoko-projects/illume_svn.bb) | 0 | ||||
| -rw-r--r-- | packages/openmoko-projects.merge/tangogps/.mtn2git_empty (renamed from packages/openmoko-projects/tangogps/.mtn2git_empty) | 0 | ||||
| -rw-r--r-- | packages/openmoko-projects.merge/tangogps/global-config-h.patch (renamed from packages/openmoko-projects/tangogps/global-config-h.patch) | 0 | ||||
| -rw-r--r-- | packages/openmoko-projects.merge/tangogps_0.7.bb (renamed from packages/openmoko-projects/tangogps_0.7.bb) | 0 | ||||
| -rw-r--r-- | packages/packagekit.merge/.mtn2git_empty (renamed from packages/packagekit/.mtn2git_empty) | 0 | ||||
| -rw-r--r-- | packages/packagekit.merge/files/.mtn2git_empty (renamed from packages/packagekit/files/.mtn2git_empty) | 0 | ||||
| -rw-r--r-- | packages/packagekit.merge/files/disable-docbook2man.patch (renamed from packages/packagekit/files/disable-docbook2man.patch) | 0 | ||||
| -rw-r--r-- | packages/packagekit.merge/packagekit_git.bb (renamed from packages/packagekit/packagekit_git.bb) | 0 |
15 files changed, 0 insertions, 17 deletions
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 index e69de29bb2..e69de29bb2 100644 --- a/packages/openmoko-projects/.mtn2git_empty +++ b/packages/openmoko-projects.merge/.mtn2git_empty diff --git a/packages/openmoko-projects/assassin_svn.bb b/packages/openmoko-projects.merge/assassin_svn.bb index 987d44070d..987d44070d 100644 --- a/packages/openmoko-projects/assassin_svn.bb +++ b/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 index 02e1ea29bb..02e1ea29bb 100644 --- a/packages/openmoko-projects/diversity-daemon_svn.bb +++ b/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 index 23d6b4daf6..23d6b4daf6 100644 --- a/packages/openmoko-projects/diversity-nav_svn.bb +++ b/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 index e69de29bb2..e69de29bb2 100644 --- a/packages/openmoko-projects/illume/.mtn2git_empty +++ b/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 index 0b5ed8add8..0b5ed8add8 100644 --- a/packages/openmoko-projects/illume/include-path.diff +++ b/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 index f7dec16890..f7dec16890 100644 --- a/packages/openmoko-projects/illume_svn.bb +++ b/packages/openmoko-projects.merge/illume_svn.bb diff --git a/packages/openmoko-projects/tangogps/.mtn2git_empty b/packages/openmoko-projects.merge/tangogps/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/openmoko-projects/tangogps/.mtn2git_empty +++ b/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 index 973710c942..973710c942 100644 --- a/packages/openmoko-projects/tangogps/global-config-h.patch +++ b/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 index 63513ffe00..63513ffe00 100644 --- a/packages/openmoko-projects/tangogps_0.7.bb +++ b/packages/openmoko-projects.merge/tangogps_0.7.bb diff --git a/packages/packagekit/.mtn2git_empty b/packages/packagekit.merge/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/packagekit/.mtn2git_empty +++ b/packages/packagekit.merge/.mtn2git_empty diff --git a/packages/packagekit/files/.mtn2git_empty b/packages/packagekit.merge/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/packagekit/files/.mtn2git_empty +++ b/packages/packagekit.merge/files/.mtn2git_empty diff --git a/packages/packagekit/files/disable-docbook2man.patch b/packages/packagekit.merge/files/disable-docbook2man.patch index 0c7d4239d4..0c7d4239d4 100644 --- a/packages/packagekit/files/disable-docbook2man.patch +++ b/packages/packagekit.merge/files/disable-docbook2man.patch diff --git a/packages/packagekit/packagekit_git.bb b/packages/packagekit.merge/packagekit_git.bb index 6f3419a60a..6f3419a60a 100644 --- a/packages/packagekit/packagekit_git.bb +++ b/packages/packagekit.merge/packagekit_git.bb |