From e4ef43d6982dd49a4edb3a954c9c812a4e889d4f Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Thu, 11 Jul 2019 17:11:11 +0300
Subject: Adjust with new libpkgconf repository

---
 .gitmodules | 9 +++++----
 README-GIT  | 8 ++++----
 libpkgconf  | 2 +-
 pkgconf     | 1 +
 4 files changed, 11 insertions(+), 9 deletions(-)
 mode change 160000 => 120000 libpkgconf
 create mode 160000 pkgconf

diff --git a/.gitmodules b/.gitmodules
index be801fd..923e17b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -24,10 +24,11 @@
 	path = libodb-sqlite
 	url = https://scm.codesynthesis.com/odb/libodb-sqlite.git
 	update = none
-[submodule "libpkgconf"]
-	path = libpkgconf
-	url = https://git.build2.org/packaging/pkgconf/libpkgconf.git
-	update = none
 [submodule "sqlite"]
 	path = sqlite
 	url = https://git.build2.org/packaging/sqlite/sqlite.git
+	update = none
+[submodule "pkgconf"]
+	path = pkgconf
+	url = https://git.build2.org/packaging/pkgconf/pkgconf.git
+	update = none
diff --git a/README-GIT b/README-GIT
index 89ef247..7a2cae1 100644
--- a/README-GIT
+++ b/README-GIT
@@ -25,15 +25,15 @@ A few additional notes:
    commits)' next to submodules (i.e., git "thinks" you have modified the
    member project by "setting back" its subproject commit).
 
-2. The libpkgconf, libsqlite3 and libodb* submodules are not updated by default
+2. The pkgconf, sqlite and libodb* submodules are not updated by default
    (e.g., with the above command). This is achieved with:
 
-   git config --file .gitmodules submodule.libsqlite3.update none
+   git config --file .gitmodules submodule.sqlite.update none
 
    Instead, their updates (normally to something tagged) must be requested
    explicitly:
 
-   git submodule update --remote --checkout libsqlite3
+   git submodule update --remote --checkout sqlite
 
    Note that you need a fairly recent git (e.g., 2.9) for this enforcement
-   to work.
\ No newline at end of file
+   to work.
diff --git a/libpkgconf b/libpkgconf
deleted file mode 160000
index c9bb33b..0000000
--- a/libpkgconf
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c9bb33b358a72cf91c648ad1cb6a19bf10f5bbde
diff --git a/libpkgconf b/libpkgconf
new file mode 120000
index 0000000..198d89a
--- /dev/null
+++ b/libpkgconf
@@ -0,0 +1 @@
+pkgconf/libpkgconf
\ No newline at end of file
diff --git a/pkgconf b/pkgconf
new file mode 160000
index 0000000..a0cb899
--- /dev/null
+++ b/pkgconf
@@ -0,0 +1 @@
+Subproject commit a0cb8991b2cb61e9c0f3d8075759939cc61d57f0
-- 
cgit v1.1