import clean BK tree at cset 1.3670

5 files changed, 126 insertions, 0 deletions

diff --git a/packages/bazaar/.mtn2git_empty b/packages/bazaar/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/bazaar/.mtn2git_empty
diff --git a/packages/bazaar/bazaar_1.2.bb b/packages/bazaar/bazaar_1.2.bb
index e69de29bb2..9309a7176b 100644
--- a/packages/bazaar/bazaar_1.2.bb
+++ b/packages/bazaar/bazaar_1.2.bb
@@ -0,0 +1,63 @@
+# bazaar OE build file
+# Copyright (C) 2005 Chris Larson <kergoth@handhelds.org>
+# Released under the MIT license (see the COPYING file in this tree)
+#
+# NOTE:
+#   * Does not have an LDFLAGS variable on its link lines, only the "libs"
+#     variable, which makes it troublesome to add -L's to the link.  For now,
+#     we cheat and pass it in CFLAGS.
+
+DEPENDS += "neon"
+DESCRIPTION = "bazaar is an implementation of GNU Arch in C, based on tla."
+HOMEPAGE = "http://bazaar.canonical.com/"
+LICENSE = "GPL"
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+PRIORITY = "optional"
+SECTION = "devel"
+PR = "r2"
+RDEPENDS_${PN} += "patch"
+RSUGGESTS_${PN} += "gnupg"
+
+SRC_URI = "http://bazaar.canonical.com/releases/src/bazaar_${PV}.tar.gz \
+	   file://no_archive_format_guess_msg.patch;patch=1 \
+	   file://import_dirarg.patch;patch=1"
+
+S = "${WORKDIR}/thelove@canonical.com---dists--bazaar--1.2"
+B = "${WORKDIR}/build-${HOST_SYS}"
+
+CFLAGS += "-I${B} -I${S}/src -I${S}/src/baz"
+EXTRA_OEMAKE = "'CC=${CC}' \
+		'CFLAGS=${CFLAGS} ${LDFLAGS}' \
+		\
+		'test-scripts=' \
+		'test-progs=' \
+		'prefix=${D}${prefix}' \
+		'program-install-dir=${D}${bindir}' \
+		'cgi-install-dir=${D}${libdir}/cgi' \
+		'library-install-dir=${D}${libdir}' \
+		'include-install-dir=${D}${includedir}/$(thispath)' \
+		'etc-install-dir=${D}${sysconfdir}' \
+		'libexec-install-dir=${D}${libexecdir}' \
+		'info-install-dir=${D}${infodir}' \
+		'man-install-dir=${D}${mandir}' \
+		'scm-install-dir=${D}${datadir}/scheme' \
+		'doc-install-dir=${D}${docdir}/$(thispath)' \
+		'data-install-dir=${D}${datadir}/$(thispath)' \
+		'locale-install-dir=${D}${datadir}/locale'"
+PARALLEL_MAKE = ""
+
+
+do_configure () {
+	${S}/src/configure ${CONFARGS}
+
+}
+
+do_compile () {
+	oe_runmake
+}
+
+do_install () {
+	oe_runmake install-all
+	sed -e 's,^#!.*$$,#!/usr/bin/gawk -f,' ${S}/src/baz/=gpg-check.awk > \
+		${D}${bindir}/bazaar-gpg-check
+}
diff --git a/packages/bazaar/files/.mtn2git_empty b/packages/bazaar/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/bazaar/files/.mtn2git_empty
diff --git a/packages/bazaar/files/import_dirarg.patch b/packages/bazaar/files/import_dirarg.patch
index e69de29bb2..101be58b56 100644
--- a/packages/bazaar/files/import_dirarg.patch
+++ b/packages/bazaar/files/import_dirarg.patch
@@ -0,0 +1,53 @@
+--- bazaar-1.2.orig/src/baz/tests/test-import-baz.sh
++++ bazaar-1.2/src/baz/tests/test-import-baz.sh
+@@ -23,7 +23,9 @@
+ tla init-tree --nested jane@example.com--2003/hello-world--mainline--1.0
+ tla id-tagging-method explicit
+ tla add hello-world.c README
+-tla import -L 'initial import'
++cd ..
++tla import -d hello-world--mainline--1.0 -L 'initial import'
++cd hello-world--mainline--1.0
+ tla categories -A jane@example.com--2003 >&2
+ test "$(tla categories -A jane@example.com--2003)" = "hello-world"
+ test "$(tla branches jane@example.com--2003/hello-world)" = "hello-world--mainline"
+--- bazaar-1.2.orig/src/baz/commands/import.c
++++ bazaar-1.2/src/baz/commands/import.c
+@@ -32,7 +32,7 @@
+ 
+ 
+ 
+-static t_uchar * usage = N_("[options] [directory] [archive]/version");
++static t_uchar * usage = N_("[options] [directory] [[archive]/version]");
+ 
+ #define OPTS(OP) \
+   OP (opt_help_msg, "h", "help", 0, \
+@@ -42,12 +42,14 @@
+   OP (opt_version, "V", "version", 0, \
+       N_("Display a release identifier string\n" \
+       "and exit.")) \
++  OP (opt_dir, "d", "dir DIR", 1, \
++      N_("Change to DIR first.")) \
+   OP (opt_log, "l", "log FILE", 1, \
+       N_("Commit with log file FILE.")) \
+   OP (opt_summary, "s", "summary TEXT", 1, \
+       N_("log with summary TEXT plus log-for-merge output") ) \
+   OP (opt_automatic, "a", "automatic", 0, \
+-      N_("Initialise dir as a working tree, add all source-looking files in dir and import.") ) \
++      N_("Initialise dir as a working tree, add all source-looking files in dir and import. This requires version to operate.") ) \
+   OP (opt_log_msg, "L", "log-message TEXT", 1, \
+       N_("log with TEXT"))
+ 
+@@ -157,6 +159,12 @@
+           safe_printfmt (2, "ill-formed argument for `%s' (`%s')\n", option->opt_string, option->arg_string);
+           goto usage_error;
+ 
++	case opt_dir:
++	  {
++	    automatic = 0;
++	    break;
++	  }
++
+         case opt_log:
+           {
+             log_file = str_save (0, option->arg_string);
diff --git a/packages/bazaar/files/no_archive_format_guess_msg.patch b/packages/bazaar/files/no_archive_format_guess_msg.patch
index e69de29bb2..893f4e6002 100644
--- a/packages/bazaar/files/no_archive_format_guess_msg.patch
+++ b/packages/bazaar/files/no_archive_format_guess_msg.patch
@@ -0,0 +1,10 @@
+--- bazaar-1.2.orig/src/baz/libarch/archive-pfs.c
++++ bazaar-1.2/src/baz/libarch/archive-pfs.c
+@@ -240,7 +240,6 @@
+   else if (arch_pfs_file_exists (arch->pfs, meta_info_path))
+     {
+       /* most likely a mirror that's missing a .archive-version file */
+-      safe_printfmt (2, _("Guessing archive format as tla 1.0. This is normal with old archives, you can ignore it unless other errors occur.\n"));
+       contents = str_save (0, arch_tree_format_1_str);
+     }
+   else