[27771] in Source-Commits

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

pharos-support commit [debian]: Fix dependencies; switch to dh7

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

Date: Tue, 4 Mar 2014 12:55:13 -0500
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201403041755.s24HtDBU016319@drugstore.mit.edu>
To: source-commits@MIT.EDU

https://github.com/mit-athena/pharos-support/commit/0a0ed580ce5d4c050baede4f052e0d0bc93eecca
commit 0a0ed580ce5d4c050baede4f052e0d0bc93eecca
Author: Jonathan Reed <jdreed@mit.edu>
Date:   Thu Feb 27 10:33:36 2014 -0500

    Fix dependencies; switch to dh7
    
    - Change dependency from hpijs to hpijs-ppds (Trac: #1427)
    - Kill CDBS and switch to dh7
    - Add a Lintian override file to acknowledge the warning about
      the backend being chmod 744, which is deliberate.

 debian/changelog         |   10 ++++++++++
 debian/control           |    4 ++--
 debian/lintian-overrides |    1 +
 debian/rules             |   14 +++++++-------
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 72d5aa3..cee7d98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+debathena-pharos-support (1.1.1-0debathena2) unstable; urgency=low
+
+  * Change dependency from hpijs to hpijs-ppds, since we really only care
+    about the PPDs.  This makes the package usable on saucy+ (Trac: #1416)
+  * Switch to dh7 and drop CDBS
+  * Add a Lintian override to acknowledge that we do want a non-stanard
+    permission on the backend
+
+ -- Jonathan Reed <jdreed@mit.edu>  Thu, 27 Feb 2014 10:57:23 -0500
+
 debathena-pharos-support (1.1.1-0debathena1) unstable; urgency=low
 
   * Release 1.1.1
diff --git a/debian/control b/debian/control
index 0975b34..516f35b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,12 @@ 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.50~), dh-buildinfo
 
 Package: debathena-pharos-support
 Architecture: all
 Depends: cups | cupsys,
- hpijs,
+ hpijs-ppds,
  ${misc:Depends}
 Description: Pharos Support for Debathena
  This package adds a new CUPS backend for Pharos queues to allow users
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
new file mode 100644
index 0000000..cb32570
--- /dev/null
+++ b/debian/lintian-overrides
@@ -0,0 +1 @@
+debathena-pharos-support: non-standard-executable-perm usr/lib/cups/backend/pharos 0744 != 0755
diff --git a/debian/rules b/debian/rules
index 084b9b6..5b6003d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,12 @@
 #!/usr/bin/make -f
 
-DEB_DH_FIXPERMS_ARGS = -X/usr/lib/cups/backend/pharos
-
-include /usr/share/cdbs/1/rules/debhelper.mk
+%:
+	dh $@
 
 # CUPS decides whether to execute a backend as root or lp based on whether
-# it's executable as lp or not.  We need to be executed as root in order
-# to exec the lpd backend.  "Yay".
-binary-install/debathena-pharos-support::
+# it's executable as lp or not.  The lpd backend (which we call from our
+# backend) is mode 744, owned by root.  Therefore, we also need to be the
+# same mode, so CUPS will execute our backend as root.
+override_dh_fixperms:
+	dh_fixperms
 	chmod 744 debian/debathena-pharos-support/usr/lib/cups/backend/pharos
-

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