debian packaging: introduce -common subpackage.

Split the git-buildpackage into git-buildpackage and git-buildpackage-common. Now there are three binary packages:
- 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

Change-Id: I451e8f82280cc0dd71a397ed1513dc2fce5cbb7b
Signed-off-by: wanchao-xu <wanchao.xu@samsung.com>

diff --git a/debian/control b/debian/control
index b4e8b4041c343da65e6443caf70a77b11664d56b..edba0c02745daa63dfdfed75ce46ff48ba85522f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -44,7 +44,7 @@ Homepage: https://honk.sigxcpu.org/piki/projects/git-buildpackage/
 Rules-Requires-Root: no
 X-Python3-Version: >= 3.7
 
-Package: git-buildpackage
+Package: git-buildpackage-common
 Architecture: all
 Depends: ${python3:Depends},
  ${shlibs:Depends},
@@ -57,10 +57,20 @@ Depends: ${python3:Depends},
  python3-yaml,
  sensible-utils,
 Recommends: pristine-tar (>= 1.41),
- cowbuilder | pbuilder | sbuild,
  python3-requests
 Breaks: dgit (<< 9.16~)
 Suggests: python3-notify2, unzip, sudo
+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: ${python3:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends},
+ devscripts,
+ git-buildpackage-common (= ${binary:Version})
+Recommends: cowbuilder | pbuilder | sbuild
 Description: Suite to help with Debian packages in Git repositories
  This package contains the following tools:
   * gbp buildpackage: build a package out of a Git repository, check for local
@@ -83,7 +93,7 @@ Architecture: all
 Depends: ${python3:Depends},
  ${misc:Depends},
  cpio,
- git-buildpackage (= ${binary:Version}),
+ git-buildpackage-common (= ${binary:Version}),
  python3-rpm (>= 4.16.1),
  rpm (>= 4.16.1),
 Recommends: pristine-tar (>= 0.5)

diff --git a/debian/git-buildpackage-common.install b/debian/git-buildpackage-common.install
new file mode 100644 (file)
index 0000000..8d02318
--- /dev/null
+++ b/debian/git-buildpackage-common.install
@@ -0,0 +1,20 @@
+usr/lib/python3.*/dist-packages/gbp/command_wrappers.py usr/lib/python3/dist-packages/gbp/
+usr/lib/python3.*/dist-packages/gbp/config.py usr/lib/python3/dist-packages/gbp/
+usr/lib/python3.*/dist-packages/gbp/deb/ usr/lib/python3/dist-packages/gbp/
+usr/lib/python3.*/dist-packages/gbp/errors.py usr/lib/python3/dist-packages/gbp/
+usr/lib/python3.*/dist-packages/gbp/format.py usr/lib/python3/dist-packages/gbp/
+usr/lib/python3.*/dist-packages/gbp/git/ usr/lib/python3/dist-packages/gbp/
+usr/lib/python3.*/dist-packages/gbp/__init__.py usr/lib/python3/dist-packages/gbp/
+usr/lib/python3.*/dist-packages/gbp/log.py usr/lib/python3/dist-packages/gbp/
+usr/lib/python3.*/dist-packages/gbp/notifications.py usr/lib/python3/dist-packages/gbp/
+usr/lib/python3.*/dist-packages/gbp/paths.py usr/lib/python3/dist-packages/gbp/
+usr/lib/python3.*/dist-packages/gbp/patch_series.py usr/lib/python3/dist-packages/gbp/
+usr/lib/python3.*/dist-packages/gbp/pkg/ usr/lib/python3/dist-packages/gbp/
+usr/lib/python3.*/dist-packages/gbp/scripts/clone.py usr/lib/python3/dist-packages/gbp/scripts/
+usr/lib/python3.*/dist-packages/gbp/scripts/common/ usr/lib/python3/dist-packages/gbp/scripts/
+usr/lib/python3.*/dist-packages/gbp/scripts/config.py usr/lib/python3/dist-packages/gbp/scripts/
+usr/lib/python3.*/dist-packages/gbp/scripts/__init__.py usr/lib/python3/dist-packages/gbp/scripts/
+usr/lib/python3.*/dist-packages/gbp/scripts/pull.py usr/lib/python3/dist-packages/gbp/scripts/
+usr/lib/python3.*/dist-packages/gbp/tmpfile.py usr/lib/python3/dist-packages/gbp/
+usr/lib/python3.*/dist-packages/gbp/tristate.py usr/lib/python3/dist-packages/gbp/
+usr/lib/python3.*/dist-packages/gbp/version.py usr/lib/python3/dist-packages/gbp/

diff --git a/debian/git-buildpackage-common.manpages b/debian/git-buildpackage-common.manpages
new file mode 100644 (file)
index 0000000..91ebab6
--- /dev/null
+++ b/debian/git-buildpackage-common.manpages
@@ -0,0 +1,5 @@
+docs/gbp.1
+docs/gbp-clone.1
+docs/gbp.conf.5
+docs/gbp-config.1
+docs/gbp-pull.1

diff --git a/debian/git-buildpackage-rpm.install b/debian/git-buildpackage-rpm.install
index 371639028335aedb16496b11b711a4463a8d4f31..27ec2d952d31abfb59ab8888eaa257387cae2744 100644 (file)
--- a/debian/git-buildpackage-rpm.install
+++ b/debian/git-buildpackage-rpm.install
@@ -1,7 +1,7 @@
 usr/bin/gbp-builder-mock /usr/share/git-buildpackage/
 usr/lib/python3.*/dist-packages/gbp/rpm usr/lib/python3/dist-packages/gbp/
-usr/lib/python3.*//dist-packages/gbp/scripts/import_orig_rpm.py usr/lib/python3/dist-packages/gbp/scripts/
-usr/lib/python3.*//dist-packages/gbp/scripts/import_srpm.py usr/lib/python3/dist-packages/gbp/scripts/
+usr/lib/python3.*/dist-packages/gbp/scripts/import_orig_rpm.py usr/lib/python3/dist-packages/gbp/scripts/
+usr/lib/python3.*/dist-packages/gbp/scripts/import_srpm.py usr/lib/python3/dist-packages/gbp/scripts/
 usr/lib/python3.*/dist-packages/gbp/scripts/pq_rpm.py usr/lib/python3/dist-packages/gbp/scripts/
 usr/lib/python3.*/dist-packages/gbp/scripts/buildpackage_rpm.py usr/lib/python3/dist-packages/gbp/scripts/
 usr/lib/python3.*/dist-packages/gbp/scripts/rpm_ch.py usr/lib/python3/dist-packages/gbp/scripts/

diff --git a/debian/git-buildpackage.install b/debian/git-buildpackage.install
index 956ac8c3c5fcbfcea2e62b237b858933771f6263..e741b694acd26b9313916b5b34b32b3b72f8b937 100644 (file)
--- a/debian/git-buildpackage.install
+++ b/debian/git-buildpackage.install
@@ -3,23 +3,8 @@ debian/pk4/gbp                        usr/share/pk4/hooks-available/unpack
 usr/bin/gbp
 usr/bin/git-pbuilder
 usr/lib/python3.*/dist-packages/gbp-* usr/lib/python3/dist-packages/
-usr/lib/python3.*/dist-packages/gbp/command_wrappers.py usr/lib/python3/dist-packages/gbp/
-usr/lib/python3.*/dist-packages/gbp/config.py usr/lib/python3/dist-packages/gbp/
 usr/lib/python3.*/dist-packages/gbp/dch.py usr/lib/python3/dist-packages/gbp/
-usr/lib/python3.*/dist-packages/gbp/deb/ usr/lib/python3/dist-packages/gbp/
-usr/lib/python3.*/dist-packages/gbp/errors.py usr/lib/python3/dist-packages/gbp/
-usr/lib/python3.*/dist-packages/gbp/format.py usr/lib/python3/dist-packages/gbp/
-usr/lib/python3.*/dist-packages/gbp/git/ usr/lib/python3/dist-packages/gbp/
-usr/lib/python3.*/dist-packages/gbp/__init__.py usr/lib/python3/dist-packages/gbp/
-usr/lib/python3.*/dist-packages/gbp/log.py usr/lib/python3/dist-packages/gbp/
-usr/lib/python3.*/dist-packages/gbp/notifications.py usr/lib/python3/dist-packages/gbp/
-usr/lib/python3.*/dist-packages/gbp/paths.py usr/lib/python3/dist-packages/gbp/
-usr/lib/python3.*/dist-packages/gbp/patch_series.py usr/lib/python3/dist-packages/gbp/
-usr/lib/python3.*/dist-packages/gbp/pkg/ usr/lib/python3/dist-packages/gbp/
 usr/lib/python3.*/dist-packages/gbp/scripts/buildpackage.py usr/lib/python3/dist-packages/gbp/scripts/
-usr/lib/python3.*/dist-packages/gbp/scripts/clone.py usr/lib/python3/dist-packages/gbp/scripts/
-usr/lib/python3.*/dist-packages/gbp/scripts/common/ usr/lib/python3/dist-packages/gbp/scripts/
-usr/lib/python3.*/dist-packages/gbp/scripts/config.py usr/lib/python3/dist-packages/gbp/scripts/
 usr/lib/python3.*/dist-packages/gbp/scripts/create_remote_repo.py usr/lib/python3/dist-packages/gbp/scripts/
 usr/lib/python3.*/dist-packages/gbp/scripts/dch.py usr/lib/python3/dist-packages/gbp/scripts/
 usr/lib/python3.*/dist-packages/gbp/scripts/import_dsc.py usr/lib/python3/dist-packages/gbp/scripts/
@@ -27,15 +12,10 @@ usr/lib/python3.*/dist-packages/gbp/scripts/import_dscs.py usr/lib/python3/dist-
 usr/lib/python3.*/dist-packages/gbp/scripts/import_orig.py usr/lib/python3/dist-packages/gbp/scripts/
 usr/lib/python3.*/dist-packages/gbp/scripts/import_ref.py usr/lib/python3/dist-packages/gbp/scripts/
 usr/lib/python3.*/dist-packages/gbp/scripts/export_orig.py usr/lib/python3/dist-packages/gbp/scripts/
-usr/lib/python3.*/dist-packages/gbp/scripts/__init__.py usr/lib/python3/dist-packages/gbp/scripts/
 usr/lib/python3.*/dist-packages/gbp/scripts/pq.py usr/lib/python3/dist-packages/gbp/scripts/
 usr/lib/python3.*/dist-packages/gbp/scripts/pristine_tar.py usr/lib/python3/dist-packages/gbp/scripts/
-usr/lib/python3.*/dist-packages/gbp/scripts/pull.py usr/lib/python3/dist-packages/gbp/scripts/
 usr/lib/python3.*/dist-packages/gbp/scripts/push.py usr/lib/python3/dist-packages/gbp/scripts/
 usr/lib/python3.*/dist-packages/gbp/scripts/setup_gitattributes.py usr/lib/python3/dist-packages/gbp/scripts/
 usr/lib/python3.*/dist-packages/gbp/scripts/supercommand.py usr/lib/python3/dist-packages/gbp/scripts/
 usr/lib/python3.*/dist-packages/gbp/scripts/tag.py usr/lib/python3/dist-packages/gbp/scripts/
-usr/lib/python3.*/dist-packages/gbp/tmpfile.py usr/lib/python3/dist-packages/gbp/
-usr/lib/python3.*/dist-packages/gbp/tristate.py usr/lib/python3/dist-packages/gbp/
-usr/lib/python3.*/dist-packages/gbp/version.py usr/lib/python3/dist-packages/gbp/
 usr/share/git-buildpackage/gbp.conf etc/git-buildpackage/

diff --git a/packaging/git-buildpackage.spec b/packaging/git-buildpackage.spec
index 81ac8d1871892c5e5c14b1efcfb5d6f5dad2f84c..f593a3eab48fe719233023cc210ea018cbb33783 100644 (file)
--- a/packaging/git-buildpackage.spec
+++ b/packaging/git-buildpackage.spec
@@ -203,7 +203,6 @@ chmod -x %{buildroot}%{_docdir}/%{name}/manual-html/images/*.png
 
 cat > files.list << EOF
 %{_bindir}/git-pbuilder
-%{python3_sitelib}/gbp/deb
 %{python3_sitelib}/gbp/scripts/pq.py*
 %{python3_sitelib}/gbp/scripts/buildpackage.py*
 %{python3_sitelib}/gbp/scripts/dch.py*
@@ -246,6 +245,7 @@ done
 %defattr(-,root,root,-)
 %{_bindir}/gbp
 %dir %{python3_sitelib}/gbp
+%dir %{python3_sitelib}/gbp/deb
 %dir %{python3_sitelib}/gbp/git
 %dir %{python3_sitelib}/gbp/pkg
 %dir %{python3_sitelib}/gbp/scripts
@@ -263,6 +263,7 @@ done
 %{python3_sitelib}/gbp/scripts/supercommand.py*
 %{python3_sitelib}/gbp/scripts/tag.py*
 %{python3_sitelib}/gbp/scripts/common/*.py*
+%{python3_sitelib}/gbp/deb/*.py*
 %{python3_sitelib}/gbp/git/*.py*
 %{python3_sitelib}/gbp/pkg/*.py*
 %exclude %{python3_sitelib}/gbp/__pycache__/*.pyc