[27822] in Source-Commits
grenew commit [debian]: Switch to dh7
daemon@ATHENA.MIT.EDU (Alexander Chernyakhovsky)
Sat Mar 8 01:09:25 2014
Date: Sat, 8 Mar 2014 01:09:18 -0500
From: Alexander Chernyakhovsky <achernya@MIT.EDU>
Message-Id: <201403080609.s2869I1B018178@drugstore.mit.edu>
To: source-commits@MIT.EDU
https://github.com/mit-athena/grenew/commit/445c5d8d6461ad413e73d2b737b5104c2b64d906
commit 445c5d8d6461ad413e73d2b737b5104c2b64d906
Author: Alexander Chernyakhovsky <achernya@mit.edu>
Date: Fri Mar 7 23:55:29 2014 -0500
Switch to dh7
debian/changelog | 10 +++++++++-
debian/control | 2 +-
debian/rules | 19 ++-----------------
3 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5d2a504..88afa68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,12 @@
-debathena-grenew (10.0.2-0debathena2) UNRELEASED; urgency=low
+debathena-grenew (10.0.3-0debathena1) UNRELEASED; urgency=low
+
+ * Modernize (i.e., kill krb4) grenew
+ * Switch to a reasonable build system
+ * Use dh7
+
+ -- Alexander Chernyakhovsky <achernya@mit.edu> Fri, 07 Mar 2014 23:55:39 -0500
+
+debathena-grenew (10.0.2-0debathena2) unstable; urgency=low
* Bump debian/compat to 6
* Switch from control.in to control (Trac: #561)
diff --git a/debian/control b/debian/control
index 41c7392..a3be6c2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: debathena-grenew
Section: debathena/gnome
Priority: extra
Maintainer: Debathena Project <debathena@mit.edu>
-Build-Depends: cdbs, debhelper, dh-buildinfo, autoconf, libkrb5-dev, libgtk2.0-dev
+Build-Depends: debhelper (>= 7), dh-autoreconf, debathena-aclocal, libkrb5-dev, libgtk2.0-dev, pkg-config
Standards-Version: 3.9.3
Package: debathena-grenew
diff --git a/debian/rules b/debian/rules
index cf7394f..bace6e8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,3 @@
#!/usr/bin/make -f
-
-DEB_AUTO_UPDATE_AUTOCONF = 2.50
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-
-KRB5_VERSION = $(shell dpkg-query --showformat='$${Version}' --show libkrb5-dev)
-
-ifeq ($(shell dpkg --compare-versions $(KRB5_VERSION) '<<' '1.7~' && echo y),y)
- DEB_CONFIGURE_EXTRA_FLAGS += --with-krb4=$(shell krb4-config --prefix krb4)
-else
- DEB_CONFIGURE_EXTRA_FLAGS += --without-krb4
-endif
-
-DEB_CONFIGURE_EXTRA_FLAGS += --with-krb5
-
-clean::
- rm -f configure
+%:
+ dh $@ --with autoreconf
