From 293f5a93b77d92fd65db7f3d0df654f102e46cfb Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Sun, 11 Dec 2016 16:04:20 -0800
Subject: Move to flat package hierarchy

Note to self: never try to move submodules again

To migrate your existing submodules (more or less):

	set -x
	set -e

	mkdir .git/modules/pkg
	for old in */*/src ; do
	        new="pkg/${old#*/}"
	        if ! [ -f "$old/.git" ] || [ "${old%%/*}" = pkg ] ; then
			continue
		fi
		git -C ".git/modules/$old" config core.worktree "../../../../../$new"
		rmdir "$new"
		mv "$old" "$new"
	        sed -e "s,$old,$new," "$new/.git" > "$new/.git.tmp"
	        mv "$new/.git.tmp" "$new/.git"
		mkdir ".git/modules/${new%/src}"
	        mv ".git/modules/$old" ".git/modules/$new"

		rm "${old%/src}"/*.ninja
		mv "${old%/src}"/*.tar.{gz,xz,bz2} "${new%/src}/"
		rmdir "${old%/src}" || true
	done
	sed -e 's,^\[submodule "[^/]*/,[submodule "pkg/,' .git/config > .git/config.tmp
	mv .git/config.tmp .git/config
---
 pkg/ii/gen.rc | 9 +++++++++
 pkg/ii/rev    | 1 +
 pkg/ii/src    | 1 +
 3 files changed, 11 insertions(+)
 create mode 100644 pkg/ii/gen.rc
 create mode 100644 pkg/ii/rev
 create mode 160000 pkg/ii/src

(limited to 'pkg/ii')

diff --git a/pkg/ii/gen.rc b/pkg/ii/gen.rc
new file mode 100644
index 00000000..9b8f8e56
--- /dev/null
+++ b/pkg/ii/gen.rc
@@ -0,0 +1,9 @@
+cflags\
+	-Wall\
+	-D 'VERSION=''"1.7-12-g714bd0c"'''
+
+exe ii ii.c
+file bin/ii '$outdir'/ii 755
+file share/man/man1/ii.1 '$srcdir'/ii.1 644
+
+fetch git
diff --git a/pkg/ii/rev b/pkg/ii/rev
new file mode 100644
index 00000000..d00491fd
--- /dev/null
+++ b/pkg/ii/rev
@@ -0,0 +1 @@
+1
diff --git a/pkg/ii/src b/pkg/ii/src
new file mode 160000
index 00000000..714bd0cb
--- /dev/null
+++ b/pkg/ii/src
@@ -0,0 +1 @@
+Subproject commit 714bd0cb6ae1eae57ca69b4dbe9fb5243c7a9456
-- 
cgit v1.2.3