debian packaging: split Debian package into subpackages

Split Debian package into three packages, following the introduction of
RPM tools. Now the Debian packaging resembles the default RPM packaging:
- git-buildpackage-common contains the common code for Deb and RPM tools
- git-buildpackage contains the Debian-specific modules/tools
- git-buildpackage-rpm contains the RPM-specific modules/tools

Signed-off-by: Zhang Qiang <qiang.z.zhang@intel.com>
Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

12 files changed, 66 insertions, 8 deletions

diff --git a/debian/control b/debian/control
index 89dd522a..2ea969af 100644
--- a/debian/control
+++ b/debian/control
@@ -13,11 +13,20 @@ Vcs-Browser: http://git.debian.org/?p=users/agx/git-buildpackage.git
 Homepage: https://honk.sigxcpu.org/piki/projects/git-buildpackage/
 X-Python-Version: >= 2.6
 
+
+Package: git-buildpackage-common
+Architecture: all
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, git, man-db
+Recommends: pristine-tar (>= 0.5)
+Suggests: python-notify, unzip
+Description: Suite to help with packaging in Git repositories
+ This package contains the common API and scripts for Debian and rpm packaging
+
+
 Package: git-buildpackage
 Architecture: all
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, devscripts (>= 2.10.66~),
- git (>= 1:1.7.9.1-1~), man-db
-Recommends: pristine-tar (>= 0.5), cowbuilder
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, devscripts (>= 2.10.66~), git-buildpackage-common (= ${binary:Version})
+Recommends: cowbuilder
 Suggests: python-notify, unzip
 Description: Suite to help with Debian packages in Git repositories
  This package contains the following tools:
@@ -30,3 +39,15 @@ Description: Suite to help with Debian packages in Git repositories
   * gbp-{pull,clone}: clone and pull from remote repos
   * gbp-pq: manage debian/patches easily
   * gbp-create-remote-repo: create remote repositories
+
+
+Package: git-buildpackage-rpm
+Architecture: all
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-rpm, git-buildpackage-common (= ${binary:Version}), rpm2cpio
+Description: Suite to help with rpm packages in Git repositories
+ This package contains the following tools:
+  * git-import-srpm: import existing rpm source packages into a git
+    repository
+  * git-import-orig-rpm: import a new upstream version into the git repository
+  * git-buildpackage-rpm: build a package out of a git repository, check for local
+    modifications and tag appropriately
diff --git a/debian/doc-base b/debian/git-buildpackage-common.doc-base
index a7d60d01..b377b272 100644
--- a/debian/doc-base
+++ b/debian/git-buildpackage-common.doc-base
@@ -7,5 +7,5 @@ Abstract: git-buildpackage is a suite to help with Debian packages in Git
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/git-buildpackage/manual-html/index.html
-Files: /usr/share/doc/git-buildpackage/manual-html/*.html
+Index: /usr/share/doc/git-buildpackage-common/manual-html/index.html
+Files: /usr/share/doc/git-buildpackage-common/manual-html/*.html
diff --git a/debian/docs b/debian/git-buildpackage-common.docs
index ce06068d..ce06068d 100644
--- a/debian/docs
+++ b/debian/git-buildpackage-common.docs
diff --git a/debian/examples b/debian/git-buildpackage-common.examples
index e39721e2..e39721e2 100644
--- a/debian/examples
+++ b/debian/git-buildpackage-common.examples
diff --git a/debian/git-buildpackage-common.install b/debian/git-buildpackage-common.install
new file mode 100644
index 00000000..24446a54
--- /dev/null
+++ b/debian/git-buildpackage-common.install
@@ -0,0 +1,10 @@
+usr/bin/gbp-clone
+usr/bin/gbp-pull
+usr/lib/python*/dist-packages/gbp/*.py*
+usr/lib/python*/dist-packages/gbp/scripts/__init__.py*
+usr/lib/python*/dist-packages/gbp/scripts/clone.py*
+usr/lib/python*/dist-packages/gbp/scripts/pull.py*
+usr/lib/python*/dist-packages/gbp/scripts/common/*.py*
+usr/lib/python*/dist-packages/gbp/git/*.py*
+usr/lib/python*/dist-packages/gbp/pkg/*.py*
+etc/git-buildpackage/gbp.conf
diff --git a/debian/git-buildpackage-common.links b/debian/git-buildpackage-common.links
new file mode 100644
index 00000000..e74ac0b9
--- /dev/null
+++ b/debian/git-buildpackage-common.links
@@ -0,0 +1 @@
+/usr/share/doc/git-buildpackage-common/manual-html/gbp.html /usr/share/doc/git-buildpackage-common/manual-html/index.html
diff --git a/debian/git-buildpackage-common.manpages b/debian/git-buildpackage-common.manpages
new file mode 100644
index 00000000..812e42f7
--- /dev/null
+++ b/debian/git-buildpackage-common.manpages
@@ -0,0 +1,3 @@
+docs/gbp-clone.1
+docs/gbp-pull.1
+docs/*.5
diff --git a/debian/git-buildpackage-rpm.install b/debian/git-buildpackage-rpm.install
new file mode 100644
index 00000000..8c49491e
--- /dev/null
+++ b/debian/git-buildpackage-rpm.install
@@ -0,0 +1,3 @@
+usr/bin/*rpm*
+usr/lib/python*/dist-packages/gbp/rpm/*.py*
+usr/lib/python*/dist-packages/gbp/scripts/*rpm*.py*
diff --git a/debian/git-buildpackage.install b/debian/git-buildpackage.install
new file mode 100644
index 00000000..7a276d7e
--- /dev/null
+++ b/debian/git-buildpackage.install
@@ -0,0 +1,16 @@
+usr/bin/gbp-pq
+usr/bin/git-buildpackage
+usr/bin/git-dch
+usr/bin/git-import-dsc
+usr/bin/git-import-dscs
+usr/bin/git-import-orig
+usr/bin/git-pbuilder
+usr/bin/gbp-create-remote-repo
+usr/lib/python*/dist-packages/gbp/deb/*.py*
+usr/lib/python*/dist-packages/gbp/scripts/pq.py*
+usr/lib/python*/dist-packages/gbp/scripts/buildpackage.py*
+usr/lib/python*/dist-packages/gbp/scripts/dch.py*
+usr/lib/python*/dist-packages/gbp/scripts/import_dsc.py*
+usr/lib/python*/dist-packages/gbp/scripts/import_dscs.py*
+usr/lib/python*/dist-packages/gbp/scripts/import_orig.py*
+usr/lib/python*/dist-packages/gbp/scripts/create_remote_repo.py*
diff --git a/debian/git-buildpackage.manpages b/debian/git-buildpackage.manpages
new file mode 100644
index 00000000..fde67af1
--- /dev/null
+++ b/debian/git-buildpackage.manpages
@@ -0,0 +1,7 @@
+docs/git-import-dscs.1
+docs/git-dch.1
+docs/git-import-dsc.1
+docs/git-pbuilder.1
+docs/git-import-orig.1
+docs/git-buildpackage.1
+docs/gbp-pq.1
diff --git a/debian/links b/debian/links
deleted file mode 100644
index 803c8fee..00000000
--- a/debian/links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/doc/git-buildpackage/manual-html/gbp.html /usr/share/doc/git-buildpackage/manual-html/index.html
diff --git a/debian/manpages b/debian/manpages
deleted file mode 100644
index 09c93b1d..00000000
--- a/debian/manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-docs/*.1
-docs/*.5