[28732] in Source-Commits
printing-config commit: Convert from cdbs to dh
daemon@ATHENA.MIT.EDU (Anders Kaseorg)
Sun Nov 13 22:30:36 2016
Date: Sun, 13 Nov 2016 22:30:31 -0500
From: Anders Kaseorg <andersk@mit.edu>
Message-Id: <201611140330.uAE3UV28032589@drugstore.mit.edu>
To: source-commits@mit.edu
https://github.com/mit-athena/printing-config/commit/0ae649387d27f25a9d866c315ede3618df84b5e2
commit 0ae649387d27f25a9d866c315ede3618df84b5e2
Author: Anders Kaseorg <andersk@mit.edu>
Date: Sun Nov 13 22:14:13 2016 -0500
Convert from cdbs to dh
debian/changelog | 6 +++
debian/control | 2 +-
debian/debathena-printing-config.displace | 9 +++++
debian/debathena-printing-config.undisplace | 4 ++
debian/rules | 52 ++++++++------------------
5 files changed, 36 insertions(+), 37 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9bcf696..ffcdd93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debathena-printing-config (1.35) unstable; urgency=medium
+
+ * Convert from cdbs to dh.
+
+ -- Anders Kaseorg <andersk@mit.edu> Sun, 13 Nov 2016 22:14:05 -0500
+
debathena-printing-config (1.34.6) unstable; urgency=medium
* Properly declare debathena as a namespace package. (Trac: #1417)
diff --git a/debian/control b/debian/control
index 96a8a68..d3a97da 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: debathena-printing-config
Section: debathena-config/net
Priority: extra
Maintainer: Debathena Project <debathena@mit.edu>
-Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), config-package-dev (>= 4.12~), python-all (>= 2.6.6-3~), python2.7, gettext, python-setuptools, python-nose, python-coverage, python-mox, python-hesiod, python-cups, python-debian, python-apt, cups, libgtk-3-0, lsb-release
+Build-Depends: debhelper (>= 7.0.50~), config-package-dev (>= 5.0~), python-all (>= 2.6.6-3~), python2.7, gettext, python-setuptools, python-nose, python-coverage, python-mox, python-hesiod, python-cups, python-debian, python-apt, cups, libgtk-3-0, lsb-release
X-Python-Version: 2.7
Standards-Version: 3.9.3
diff --git a/debian/debathena-printing-config.displace b/debian/debathena-printing-config.displace
new file mode 100644
index 0000000..40f0d7a
--- /dev/null
+++ b/debian/debathena-printing-config.displace
@@ -0,0 +1,9 @@
+/usr/bin/lp.debathena
+/usr/bin/lpq.debathena
+/usr/bin/lpr.debathena
+/usr/bin/lprm.debathena
+
+/usr/share/man/man1/lp.debathena.1.gz
+/usr/share/man/man1/lpq.debathena.1.gz
+/usr/share/man/man1/lpr.debathena.1.gz
+/usr/share/man/man1/lprm.debathena.1.gz
diff --git a/debian/debathena-printing-config.undisplace b/debian/debathena-printing-config.undisplace
new file mode 100644
index 0000000..a995b2f
--- /dev/null
+++ b/debian/debathena-printing-config.undisplace
@@ -0,0 +1,4 @@
+/usr/bin/cancel.debathena
+/usr/sbin/lpc.debathena
+/usr/share/man/man1/cancel.debathena.1.gz
+/usr/share/man/man8/lpc.debathena.8.gz
diff --git a/debian/rules b/debian/rules
index f33501b..cc11bc8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,51 +1,31 @@
#!/usr/bin/make -f
+%:
+ dh $@ --with python2 --with config-package
+
DEB_PYTHON2_MODULE_PACKAGES = debathena-printing-config
DEB_DIVERT_EXTENSION = .debathena
# NOTE: This is the opposite of the test below
ifeq (Ubuntu,$(shell lsb_release -si))
-DEB_TRANSFORM_FILES_debathena-printing-config += \
- /etc/gtk-3.0/settings.ini.debathena
+override_dh_configpackage:
+ dh_configpackage --package=debathena-printing-config \
+ --transform "/etc/gtk-3.0/settings.ini.debathena debian/transform_settings.ini.debathena"
+ dh_configpackage
endif
-DEB_DIVERT_FILES_debathena-printing-config += \
- /usr/bin/lp.debathena \
- /usr/bin/lpq.debathena \
- /usr/bin/lpr.debathena \
- /usr/bin/lprm.debathena \
- \
- /usr/share/man/man1/lp.debathena.1.gz \
- /usr/share/man/man1/lpq.debathena.1.gz \
- /usr/share/man/man1/lpr.debathena.1.gz \
- /usr/share/man/man1/lprm.debathena.1.gz \
-
-DEB_UNDIVERT_FILES_debathena-printing-config += \
- /usr/bin/cancel.debathena \
- /usr/sbin/lpc.debathena \
- /usr/share/man/man1/cancel.debathena.1.gz \
- /usr/share/man/man8/lpc.debathena.8.gz
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/config-package.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-
# NOTE: This the opposite of the above test.
ifneq (Ubuntu,$(shell lsb_release -si))
-install/debathena-printing-config::
- dh_install debian/settings.ini etc/gtk-3.0
+override_dh_install:
+ dh_install --package=debathena-printing-config debian/settings.ini etc/gtk-3.0
+ dh_install
endif
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-common-build-arch common-build-indep:: $(addprefix python-check-stamp-, $(cdbs_python_build_versions))
-python-check-stamp-%: debian/python-module-stampdir/debathena-printing-config
- $(call cdbs_python_binary,python$*) setup.py nosetests
- touch $@
-
-clean::
- rm -rf python-check-stamp-* mox-*.egg .coverage
-endif
+override_dh_auto_test:
+ python setup.py nosetests
+ dh_auto_test
-clean::
- rm -rf debathena.printing.egg-info
+override_dh_auto_clean:
+ dh_auto_clean
+ rm -rf .eggs/ *.egg-info/ .coverage
