From db2b4d788ded6736abdba112a9d5a168e6a74a46 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Thu, 24 May 2012 16:16:12 +0300 Subject: [PATCH] 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 After this change the Debian packaging resembles the RPM side packaging. Signed-off-by: Zhang Qiang Signed-off-by: Ed Bartosh Signed-off-by: Markus Lehtonen --- debian/control | 25 ++++++++++++++----- ...-base => git-buildpackage-common.doc-base} | 4 +-- debian/{docs => git-buildpackage-common.docs} | 0 ...mples => git-buildpackage-common.examples} | 0 debian/git-buildpackage-common.install | 22 ++++++++++++++++ debian/git-buildpackage-common.links | 1 + debian/git-buildpackage-common.manpages | 5 ++++ debian/git-buildpackage-rpm.install | 4 +-- debian/git-buildpackage.install | 23 +---------------- debian/git-buildpackage.manpages | 8 ++++++ debian/manpages | 2 -- debian/rules | 5 ++++ 12 files changed, 64 insertions(+), 35 deletions(-) rename debian/{doc-base => git-buildpackage-common.doc-base} (69%) rename debian/{docs => git-buildpackage-common.docs} (100%) rename debian/{examples => git-buildpackage-common.examples} (100%) create mode 100644 debian/git-buildpackage-common.install create mode 100644 debian/git-buildpackage-common.links create mode 100644 debian/git-buildpackage-common.manpages create mode 100644 debian/git-buildpackage.manpages delete mode 100644 debian/manpages diff --git a/debian/control b/debian/control index c787b71a..3eb6b57e 100644 --- a/debian/control +++ b/debian/control @@ -34,18 +34,29 @@ 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, python-six, -Recommends: pristine-tar (>= 0.5), cowbuilder, python-requests +Recommends: pristine-tar (>= 0.5), python-requests Suggests: python-notify, unzip, zipmerge +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 @@ -62,12 +73,14 @@ Package: git-buildpackage-rpm Architecture: all Depends: ${python:Depends}, ${misc:Depends}, - git-buildpackage (= ${binary:Version}), + git-buildpackage-common (= ${binary:Version}), python-rpm, rpm, -Recommends: pristine-tar (>= 0.5) -Suggests: python-notify, unzip Description: Suite to help with RPM packages in Git repositories This package contains the following tools: * gbp 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/git-buildpackage-common.doc-base similarity index 69% rename from debian/doc-base rename to 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 similarity index 100% rename from debian/docs rename to debian/git-buildpackage-common.docs diff --git a/debian/examples b/debian/git-buildpackage-common.examples similarity index 100% rename from debian/examples rename to 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..b2d6bf65 --- /dev/null +++ b/debian/git-buildpackage-common.install @@ -0,0 +1,22 @@ +usr/bin/gbp +usr/lib/python2.?/dist-packages/gbp-* +usr/lib/python2.?/dist-packages/gbp/command_wrappers.py +usr/lib/python2.?/dist-packages/gbp/config.py +usr/lib/python2.?/dist-packages/gbp/errors.py +usr/lib/python2.?/dist-packages/gbp/format.py +usr/lib/python2.?/dist-packages/gbp/git/ +usr/lib/python2.?/dist-packages/gbp/__init__.py +usr/lib/python2.?/dist-packages/gbp/log.py +usr/lib/python2.?/dist-packages/gbp/notifications.py +usr/lib/python2.?/dist-packages/gbp/patch_series.py +usr/lib/python2.?/dist-packages/gbp/pkg/ +usr/lib/python2.?/dist-packages/gbp/scripts/clone.py +usr/lib/python2.?/dist-packages/gbp/scripts/common/ +usr/lib/python2.?/dist-packages/gbp/scripts/config.py +usr/lib/python2.?/dist-packages/gbp/scripts/__init__.py +usr/lib/python2.?/dist-packages/gbp/scripts/pull.py +usr/lib/python2.?/dist-packages/gbp/scripts/supercommand.py +usr/lib/python2.?/dist-packages/gbp/tmpfile.py +usr/lib/python2.?/dist-packages/gbp/tristate.py +usr/lib/python2.?/dist-packages/gbp/version.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..3280f63c --- /dev/null +++ b/debian/git-buildpackage-common.manpages @@ -0,0 +1,5 @@ +docs/gbp.1 +docs/gbp-clone.1 +docs/gbp-config.1 +docs/gbp-pull.1 +docs/*.5 diff --git a/debian/git-buildpackage-rpm.install b/debian/git-buildpackage-rpm.install index 5178cb37..f243ebb9 100644 --- a/debian/git-buildpackage-rpm.install +++ b/debian/git-buildpackage-rpm.install @@ -1,4 +1,2 @@ usr/lib/python2.?/dist-packages/gbp/rpm/ -usr/lib/python2.7/dist-packages/gbp/scripts/import_srpm.py -usr/lib/python2.7/dist-packages/gbp/scripts/pq_rpm.py -usr/lib/python2.7/dist-packages/gbp/scripts/buildpackage_rpm.py +usr/lib/python2.?/dist-packages/gbp/scripts/*rpm*.py* diff --git a/debian/git-buildpackage.install b/debian/git-buildpackage.install index 1a25e1dc..73c25944 100644 --- a/debian/git-buildpackage.install +++ b/debian/git-buildpackage.install @@ -1,31 +1,10 @@ -usr/bin/ -usr/lib/python2.?/dist-packages/gbp-* -usr/lib/python2.?/dist-packages/gbp/command_wrappers.py -usr/lib/python2.?/dist-packages/gbp/config.py +usr/bin/git-pbuilder usr/lib/python2.?/dist-packages/gbp/dch.py usr/lib/python2.?/dist-packages/gbp/deb/ -usr/lib/python2.?/dist-packages/gbp/errors.py -usr/lib/python2.?/dist-packages/gbp/format.py -usr/lib/python2.?/dist-packages/gbp/git/ -usr/lib/python2.?/dist-packages/gbp/__init__.py -usr/lib/python2.?/dist-packages/gbp/log.py -usr/lib/python2.?/dist-packages/gbp/notifications.py -usr/lib/python2.?/dist-packages/gbp/patch_series.py -usr/lib/python2.?/dist-packages/gbp/pkg/ usr/lib/python2.?/dist-packages/gbp/scripts/buildpackage.py -usr/lib/python2.?/dist-packages/gbp/scripts/clone.py -usr/lib/python2.?/dist-packages/gbp/scripts/common/ -usr/lib/python2.?/dist-packages/gbp/scripts/config.py usr/lib/python2.?/dist-packages/gbp/scripts/create_remote_repo.py usr/lib/python2.?/dist-packages/gbp/scripts/dch.py usr/lib/python2.?/dist-packages/gbp/scripts/import_dsc.py usr/lib/python2.?/dist-packages/gbp/scripts/import_dscs.py usr/lib/python2.?/dist-packages/gbp/scripts/import_orig.py -usr/lib/python2.?/dist-packages/gbp/scripts/__init__.py usr/lib/python2.?/dist-packages/gbp/scripts/pq.py -usr/lib/python2.?/dist-packages/gbp/scripts/pull.py -usr/lib/python2.?/dist-packages/gbp/scripts/supercommand.py -usr/lib/python2.?/dist-packages/gbp/tmpfile.py -usr/lib/python2.?/dist-packages/gbp/tristate.py -usr/lib/python2.?/dist-packages/gbp/version.py -etc/git-buildpackage/gbp.conf diff --git a/debian/git-buildpackage.manpages b/debian/git-buildpackage.manpages new file mode 100644 index 00000000..fc937453 --- /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 index 09c93b1d..00000000 --- a/debian/manpages +++ /dev/null @@ -1,2 +0,0 @@ -docs/*.1 -docs/*.5 diff --git a/debian/rules b/debian/rules index a80bd520..3584c7a4 100755 --- 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 -- 2.34.1