[27309] in Source-Commits

home help back first fref pref prev next nref lref last post

authwatch commit [debian]: Update Debian packaging

daemon@ATHENA.MIT.EDU (Victor Vasiliev)
Sat Sep 28 23:15:45 2013

Date: Sat, 28 Sep 2013 23:15:38 -0400
From: Victor Vasiliev <vasilvv@MIT.EDU>
Message-Id: <201309290315.r8T3FcOq022129@drugstore.mit.edu>
To: source-commits@MIT.EDU

https://github.com/mit-athena/authwatch/commit/a3fce3aaa17c2a6e674f0462deaa9ec90cad07e6
commit a3fce3aaa17c2a6e674f0462deaa9ec90cad07e6
Author: Victor Vasiliev <vasilvv@mit.edu>
Date:   Wed Sep 11 18:28:16 2013 -0400

    Update Debian packaging
    
    Add gbp.conf, source format and use debhelper7.

 debian/changelog     |   10 ++++++++--
 debian/control       |    2 +-
 debian/gbp.conf      |    4 ++++
 debian/rules         |   12 +++++-------
 debian/source/format |    1 +
 5 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6192d08..a354b53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,17 @@
-debathena-authwatch (10.0.0-0debathena5) UNRELEASED; urgency=low
+debathena-authwatch (10.0.1-0debathena1) unstable; urgency=low
 
+  [ Jonathan Reed ]
   * Bump debian/compat to 6
   * Switch from control.in to control (Trac: #561)
   * Bump Standards-Version to 3.9.3
   * Bump compat level to 7
 
- -- Jonathan Reed <jdreed@mit.edu>  Wed, 03 Apr 2013 13:59:32 -0400
+  [ Victor Vasiliev ]
+  * Add git-buildpackage configuration
+  * Use debhelper7
+  * Fix build system
+
+ -- Victor Vasiliev <vasilvv@mit.edu>  Wed, 11 Sep 2013 10:48:14 -0400
 
 debathena-authwatch (10.0.0-0debathena4) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index b45e81a..7636996 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: debathena-authwatch
 Section: debathena/gnome
 Priority: extra
 Maintainer: Debathena Project <debathena@mit.edu>
-Build-Depends: cdbs, debhelper, dh-buildinfo, autoconf, libkrb5-dev, libgtk2.0-dev, pkg-config
+Build-Depends: debhelper (>= 7.0.50~), dh-autoreconf, debathena-aclocal, libkrb5-dev, libgtk2.0-dev, pkg-config
 Standards-Version: 3.9.3
 
 Package: debathena-authwatch
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..44e7fb0
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,4 @@
+[DEFAULT]
+upstream-tree=branch
+upstream-branch=master
+debian-branch=debian
diff --git a/debian/rules b/debian/rules
index 04f4a78..43b6954 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,8 @@
 #!/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
+%:
+	dh $@ --with autoreconf
 
-DEB_CONFIGURE_EXTRA_FLAGS += --with-krb5
-
-clean::
-	rm -f configure
+override_dh_auto_configure:
+	automake --add-missing --foreign || true
+	dh_auto_configure -- --with-krb5
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

home help back first fref pref prev next nref lref last post