[27763] in Source-Commits

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

athinfod commit: Update packaging for Python version

daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Tue Mar 4 12:07:18 2014

Date: Tue, 4 Mar 2014 12:07:10 -0500
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201403041707.s24H7Ag8023840@drugstore.mit.edu>
To: source-commits@MIT.EDU

https://github.com/mit-athena/athinfod/commit/c18760577b562739850f8366fa57941768bff80a
commit c18760577b562739850f8366fa57941768bff80a
Author: Jonathan Reed <jdreed@mit.edu>
Date:   Fri Feb 28 11:23:42 2014 -0500

    Update packaging for Python version
    
    - Switch to dh7 from CDBS
    - Install the Python script in /sbin
    - Add a .manpages, since distutils _still_ can't deal with manpages
    - Change build-deps to include python2 and debhelper with override
      target support
    - Remove leading article from Description because Lintian pedantry

 debian/changelog                   |    8 ++++++++
 debian/control                     |    8 ++++----
 debian/debathena-athinfod.manpages |    3 +++
 debian/rules                       |   16 +++++++---------
 4 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 196b0d2..5d78799 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debathena-athinfod (10.2-0debathena1) UNRELEASED; urgency=low
+
+  * Switch to Python implementation of athinfod from Kristen Sunter
+  * Switch to arch-indep package
+  * Switch to dh7
+
+ -- Jonathan Reed <jdreed@mit.edu>  Fri, 28 Feb 2014 12:59:45 -0500
+
 debathena-athinfod (10.1-0debathena3) UNRELEASED; urgency=low
 
   * Switch from control.in to control (Trac: #561)
diff --git a/debian/control b/debian/control
index 4f21da0..0a56f5c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,15 +2,15 @@ Source: debathena-athinfod
 Section: debathena/net
 Priority: extra
 Maintainer: Debathena Project <debathena@mit.edu>
-Build-Depends: cdbs, debhelper, dh-buildinfo, autoconf
+Build-Depends: debhelper (>= 7.0.50~), dh-buildinfo, python, python-support
 Standards-Version: 3.9.3
 
 Package: debathena-athinfod
-Architecture: any
+Architecture: all
 Provides: athinfod
 Conflicts: debathena-athena-files (<= 0.1.2)
-Depends: ${shlibs:Depends}, ${misc:Depends}, netbase, openbsd-inetd | inet-superserver, debathena-machtype
-Description: An Athena server to respond to athinfo requests
+Depends: ${python:Depends}, ${misc:Depends}, netbase, openbsd-inetd | inet-superserver, debathena-machtype
+Description: Athena server to respond to athinfo requests
  Respond to network queries for information about the workstation, such 
  as its hardware type and configuration, its current software 
  installation state, the number of users logged on, and various other 
diff --git a/debian/debathena-athinfod.manpages b/debian/debathena-athinfod.manpages
new file mode 100644
index 0000000..39eb3e8
--- /dev/null
+++ b/debian/debathena-athinfod.manpages
@@ -0,0 +1,3 @@
+athinfo.access.5
+athinfod.8
+athinfo.defs.5
diff --git a/debian/rules b/debian/rules
index 6009338..057306a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,11 @@
 #!/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-python2 $@
 
-DEB_CONFIGURE_EXTRA_FLAGS += lsbindir=/sbin
+override_dh_fixperms:
+	dh_fixperms
+	chmod 755 debian/debathena-athinfod/usr/lib/athinfod/is_cluster
 
-clean::
-	rm -f configure
-
-binary-fixup/debathena-athinfod::
-	chmod 755 debian/$(cdbs_curpkg)/usr/lib/athinfod/is_cluster
+override_dh_auto_install:
+        dh_auto_install -- --install-scripts=/sbin

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