[28247] in Source-Commits
debathena-workstation commit: Drop tex-config and dns-config; switch to dh7
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Thu Jun 12 16:51:53 2014
Date: Thu, 12 Jun 2014 16:51:46 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201406122051.s5CKpk2P000577@drugstore.mit.edu>
To: source-commits@MIT.EDU
https://github.com/mit-athena/debathena-workstation/commit/0e3de9f96749360d4d4bbdb4268e369834003d0b
commit 0e3de9f96749360d4d4bbdb4268e369834003d0b
Author: Jonathan Reed <jdreed@mit.edu>
Date: Tue Jun 10 10:29:00 2014 -0400
Drop tex-config and dns-config; switch to dh7
- Switch to dh7 for building
- Drop conditional dependency on tex-config since all distros we
support now have texlive 2009-10 (which honors /etc/papersize)
- Drop dependency on dns-config, which is becoming cluster-only
debian/changelog | 9 +++++++++
debian/control | 4 +---
debian/rules | 13 ++-----------
3 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a2b4b21..f33c53f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+debathena-workstation (1.13) unstable; urgency=low
+
+ * Switch to dh7
+ * Drop conditional inclusion of tex-config, because everything has
+ texlive 2009-10 or later (which respects /etc/papersize)
+ * Drop debathena-dns-config, as it is becoming cluster-only
+
+ -- Jonathan Reed <jdreed@mit.edu> Tue, 10 Jun 2014 10:28:38 -0400
+
debathena-workstation (1.12) unstable; urgency=low
* Remove dependency on debathena-build-depends (Trac: #1462)
diff --git a/debian/control b/debian/control
index 630bb9f..efcda73 100644
--- a/debian/control
+++ b/debian/control
@@ -3,21 +3,19 @@ Section: debathena/base
Priority: extra
Standards-Version: 3.9.3
Maintainer: Debathena Project <debathena@mit.edu>
-Build-Depends: cdbs, debhelper, dh-buildinfo
+Build-Depends: debhelper (>= 7.0~)
Package: debathena-workstation
Architecture: all
Depends: debathena-login-graphical,
debathena-extra-software,
debathena-clusterinfo,
- debathena-dns-config,
debathena-emacs-config,
debathena-ntp-config | debathena-chrony-config,
debathena-tmp-cleaner,
debathena-auto-update,
debathena-moira-update-server,
debathena-plymouth-config,
- ${debathena-maybe-tex-config},
${misc:Depends}
Recommends: debathena-nautilus-afs, debathena-ldso1-stub
Description: Athena managed workstation configuration
diff --git a/debian/rules b/debian/rules
index 01dcd11..2d33f6a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,4 @@
#!/usr/bin/make -f
-# texlive-bin 2009-10 finally respects local paper size
-
-TEXLIVE_BIN_VERSION = $(shell apt-cache policy texlive-binaries 2>/dev/null | awk '/^ Candidate/ { print $$2 }' | fgrep -vx '(none)')
-TEXLIVE_2009_10 = $(shell dpkg --compare-versions '$(TEXLIVE_BIN_VERSION)' ge '2009-10~' && echo y)
-
-ifneq ($(TEXLIVE_2009_10),y)
-binary-predeb/debathena-workstation::
- echo "debathena-maybe-tex-config=debathena-tex-config" >> debian/debathena-workstation.substvars
-endif
-
-include /usr/share/cdbs/1/rules/debhelper.mk
+%:
+ dh $@
