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>

diff --git a/debian/control b/debian/control
index c29d6ebc57a2b7e8bf961a9803bc9f6d7818d3a8..7964b5c3eb3cd338da90eb8c14043e726dd0428b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -32,20 +32,28 @@ Vcs-Browser: https://honk.sigxcpu.org/gitweb/?p=git-buildpackage.git
 Homepage: https://honk.sigxcpu.org/piki/projects/git-buildpackage/
 X-Python-Version: >= 2.6
 
-Package: git-buildpackage
+
+Package: git-buildpackage-common
 Architecture: all
 Depends: ${python:Depends},
  ${shlibs:Depends},
  ${misc:Depends},
- devscripts (>= 2.13.5~),
  git (>= 1:1.7.9.1-1~),
  man-db,
- python-pkg-resources,
-# For rpm
- python-rpm,
- rpm2cpio
-Recommends: pristine-tar (>= 0.5), cowbuilder
+ python-pkg-resources
+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.13.5~),
+ git-buildpackage-common (= ${binary:Version})
+Recommends: cowbuilder
 Description: Suite to help with Debian packages in Git repositories
  This package contains the following tools:
   * gbp import-{dsc,dscs}: import existing Debian source packages into a git
@@ -57,3 +65,20 @@ 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,
+ rpm2cpio,
+ git-buildpackage-common (= ${binary:Version})
+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
+  * gbp-pq-rpm: manage separate development and packaging branches

diff --git a/debian/doc-base b/debian/doc-base
deleted file mode 100644 (file)
index a7d60d0..0000000
--- a/debian/doc-base
+++ /dev/null
@@ -1,11 +0,0 @@
-Document: git-buildpackage
-Title: Git-Buildpackage Manual
-Author: Guido Guenther
-Abstract: git-buildpackage is a suite to help with Debian packages in Git
- repositories. This manual describes the utilities in this package, their
- configuration and possible workflows.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/git-buildpackage/manual-html/index.html
-Files: /usr/share/doc/git-buildpackage/manual-html/*.html

diff --git a/debian/docs b/debian/docs
deleted file mode 100644 (file)
index ce06068..0000000
--- a/debian/docs
+++ /dev/null
@@ -1,3 +0,0 @@
-README
-docs/manual-html/
-build/apidocs/

diff --git a/debian/examples b/debian/examples
deleted file mode 100644 (file)
index e39721e..0000000
--- a/debian/examples
+++ /dev/null
@@ -1 +0,0 @@
-examples/*

diff --git a/debian/git-buildpackage-common.doc-base b/debian/git-buildpackage-common.doc-base
new file mode 100644 (file)
index 0000000..b377b27
--- /dev/null
+++ b/debian/git-buildpackage-common.doc-base
@@ -0,0 +1,11 @@
+Document: git-buildpackage
+Title: Git-Buildpackage Manual
+Author: Guido Guenther
+Abstract: git-buildpackage is a suite to help with Debian packages in Git
+ repositories. This manual describes the utilities in this package, their
+ configuration and possible workflows.
+Section: Programming
+
+Format: 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/git-buildpackage-common.docs b/debian/git-buildpackage-common.docs
new file mode 100644 (file)
index 0000000..ce06068
--- /dev/null
+++ b/debian/git-buildpackage-common.docs
@@ -0,0 +1,3 @@
+README
+docs/manual-html/
+build/apidocs/

diff --git a/debian/git-buildpackage-common.examples b/debian/git-buildpackage-common.examples
new file mode 100644 (file)
index 0000000..e39721e
--- /dev/null
+++ b/debian/git-buildpackage-common.examples
@@ -0,0 +1 @@
+examples/*

diff --git a/debian/git-buildpackage-common.install b/debian/git-buildpackage-common.install
new file mode 100644 (file)
index 0000000..a773abe
--- /dev/null
+++ b/debian/git-buildpackage-common.install
@@ -0,0 +1,12 @@
+usr/bin/gbp
+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/supercommand.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 (file)
index 0000000..e74ac0b
--- /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 (file)
index 0000000..d348a0e
--- /dev/null
+++ b/debian/git-buildpackage-common.manpages
@@ -0,0 +1,4 @@
+docs/gbp.1
+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 (file)
index 0000000..8c49491
--- /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 (file)
index 0000000..7a276d7
--- /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 (file)
index 0000000..fc93745
--- /dev/null
+++ b/debian/git-buildpackage.manpages
@@ -0,0 +1,8 @@
+docs/gbp-buildpackage.1
+docs/gbp-create-remote-repo.1
+docs/gbp-dch.1
+docs/gbp-import-dsc.1
+docs/gbp-import-dscs.1
+docs/gbp-import-orig.1
+docs/gbp-pq.1
+docs/git-pbuilder.1

diff --git a/debian/manpages b/debian/manpages
deleted file mode 100644 (file)
index 09c93b1..0000000
--- a/debian/manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-docs/*.1
-docs/*.5

diff --git a/debian/rules b/debian/rules
index a80bd520919bf70ebe1922ca7ac225293a7937a9..3584c7a43bd502bc2ca039de60b769f4f887e932 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -46,6 +46,11 @@ override_dh_auto_install:
 
 override_dh_auto_clean:
        dh_auto_clean
+       # Remove renamed files - renames are not correctly expressed in debian.diff
+       rm -f debian/doc-base
+       rm -f debian/docs
+       rm -f debian/examples
+       rm -f debian/manpages
        rm -rf build/
        make -C docs/ clean
        -rm gbp/version.py