[28794] in Source-Commits
afs-config commit: Convert packaging from CDBS to dh7
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Sun Aug 20 16:27:18 2017
Date: Sun, 20 Aug 2017 16:27:12 -0400
From: Geoffrey Thomas <geofft@mit.edu>
Message-Id: <201708202027.v7KKRClk012051@drugstore.mit.edu>
To: source-commits@mit.edu
https://github.com/mit-athena/afs-config/commit/d954fb77e5c7f86710c5f11af8e24d07899aaacc
commit d954fb77e5c7f86710c5f11af8e24d07899aaacc
Author: Geoffrey Thomas <geofft@ldpreload.com>
Date: Sat Aug 19 23:39:08 2017 -0400
Convert packaging from CDBS to dh7
debian/changelog | 3 ++-
debian/control | 2 +-
debian/debathena-afs-config.displace | 6 ++++++
debian/debathena-afs-config.transform | 1 +
debian/rules | 25 ++++++++++---------------
5 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c767c7a..f8d5e2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
-debathena-afs-config (1.26) UNRELEASED; urgency=medium
+debathena-afs-config (1.26) unstable; urgency=medium
* Update CellServDB from /afs/athena/service/CellServDB.new.
* debian/rules: Remove special handling for Numenor.
+ * Convert packaging to dh7 from CDBS.
-- Geoffrey Thomas <geofft@mit.edu> Sat, 19 Aug 2017 23:12:48 -0400
diff --git a/debian/control b/debian/control
index 9e00371..b35bc7f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: debathena-afs-config
Section: debathena-config/net
Priority: extra
Maintainer: Debathena Project <debathena@mit.edu>
-Build-Depends: cdbs, debhelper, dh-buildinfo, config-package-dev (>= 5.0~), wget, ca-certificates, openafs-client
+Build-Depends: debhelper, dh-buildinfo, config-package-dev (>= 5.0~), wget, ca-certificates, openafs-client
Standards-Version: 3.9.3
Package: debathena-afs-config
diff --git a/debian/debathena-afs-config.displace b/debian/debathena-afs-config.displace
new file mode 100644
index 0000000..498777e
--- /dev/null
+++ b/debian/debathena-afs-config.displace
@@ -0,0 +1,6 @@
+/etc/openafs/afs.conf.client.debathena
+/etc/openafs/CellAlias.debathena
+/etc/openafs/CellServDB.debathena
+/etc/openafs/SuidCells.debathena
+/etc/openafs/ThisCell.debathena
+/etc/openafs/cacheinfo.debathena
diff --git a/debian/debathena-afs-config.transform b/debian/debathena-afs-config.transform
new file mode 100644
index 0000000..43d1102
--- /dev/null
+++ b/debian/debathena-afs-config.transform
@@ -0,0 +1 @@
+/etc/openafs/afs.conf.debathena debian/transform_afs.conf.debathena
diff --git a/debian/rules b/debian/rules
index 40ebf02..503879b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,27 +1,22 @@
#!/usr/bin/make -f
-DEB_DIVERT_EXTENSION = .debathena
-DEB_DIVERT_FILES_debathena-afs-config += \
- /etc/openafs/afs.conf.client.debathena \
- /etc/openafs/CellAlias.debathena \
- /etc/openafs/CellServDB.debathena \
- /etc/openafs/SuidCells.debathena \
- /etc/openafs/ThisCell.debathena \
- /etc/openafs/cacheinfo.debathena
-DEB_TRANSFORM_FILES_debathena-afs-config += \
- /etc/openafs/afs.conf.debathena
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/config-package.mk
+%:
+ dh $@ --with=config-package
ATHENA = debian/CellAlias.debathena debian/CellServDB.debathena
-common-build-indep:: $(ATHENA)
+override_dh_auto_build: $(ATHENA)
-$(ATHENA): FORCE
+# We only use perl from a maintainer script, and only use modules in
+# perl-base, so explicitly tell dh_perl that perl-base is fine
+override_dh_perl:
+ dh_perl -d
+
+$(ATHENA):
wget https://stuff.mit.edu/afs/athena.mit.edu/service/$(patsubst debian/%.debathena,%,$@) -O $@.new
diff -q $@ $@.new # Check that they are the same.
rm -f $@.new
-FORCE:
+.PHONY: $(ATHENA)
.PRECIOUS: $(ATHENA)
