[26776] in Source-Commits

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

/svn/athena r25746 - in trunk/debathena/config/printing-config: . debian

daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Fri Aug 31 08:46:30 2012

Date: Fri, 31 Aug 2012 08:46:23 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201208311246.q7VCkNM9030302@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: jdreed
Date: 2012-08-31 08:46:23 -0400 (Fri, 31 Aug 2012)
New Revision: 25746

Removed:
   trunk/debathena/config/printing-config/system-config-printer.po
Modified:
   trunk/debathena/config/printing-config/debian/changelog
   trunk/debathena/config/printing-config/debian/control
   trunk/debathena/config/printing-config/debian/debathena-printing-config.install
   trunk/debathena/config/printing-config/debian/rules
Log:
In printing-config:
  * Remove DEB_UNDIVERT_VERSION, unneeded as of c-p-d 4.12 (and build-dep
    on 4.12)
  * Drop our english-to-english translation added in version 1.10 because
    upstream (https://fedorahosted.org/system-config-printer/ticket/181)
    fixed this years ago.


Modified: trunk/debathena/config/printing-config/debian/changelog
===================================================================
--- trunk/debathena/config/printing-config/debian/changelog	2012-08-29 21:31:05 UTC (rev 25745)
+++ trunk/debathena/config/printing-config/debian/changelog	2012-08-31 12:46:23 UTC (rev 25746)
@@ -1,3 +1,13 @@
+debathena-printing-config (1.30) UNRELEASED; urgency=low
+
+  * Remove DEB_UNDIVERT_VERSION, unneeded as of c-p-d 4.12 (and build-dep
+    on 4.12)
+  * Drop our english-to-english translation added in version 1.10 because
+    upstream (https://fedorahosted.org/system-config-printer/ticket/181)
+    fixed this years ago.
+
+ -- Jonathan Reed <jdreed@mit.edu>  Fri, 31 Aug 2012 08:45:20 -0400
+
 debathena-printing-config (1.29) unstable; urgency=low
 
   * Bump debian/compat to 6

Modified: trunk/debathena/config/printing-config/debian/control
===================================================================
--- trunk/debathena/config/printing-config/debian/control	2012-08-29 21:31:05 UTC (rev 25745)
+++ trunk/debathena/config/printing-config/debian/control	2012-08-31 12:46:23 UTC (rev 25746)
@@ -2,7 +2,7 @@
 Section: debathena-config/net
 Priority: extra
 Maintainer: Debathena Project <debathena@mit.edu>
-Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), config-package-dev (>= 4.5~), python-all (>= 2.3.5-11), python-support (>= 0.3.2), gettext, python-setuptools, python-nose, python-hesiod, python-cups, python-debian, python-apt, debathena-cups
+Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), config-package-dev (>= 4.12~), python-all (>= 2.3.5-11), python-support (>= 0.3.2), gettext, python-setuptools, python-nose, python-hesiod, python-cups, python-debian, python-apt, debathena-cups
 Standards-Version: 3.9.0
 
 Package: debathena-printing-config

Modified: trunk/debathena/config/printing-config/debian/debathena-printing-config.install
===================================================================
--- trunk/debathena/config/printing-config/debian/debathena-printing-config.install	2012-08-29 21:31:05 UTC (rev 25745)
+++ trunk/debathena/config/printing-config/debian/debathena-printing-config.install	2012-08-31 12:46:23 UTC (rev 25746)
@@ -1,2 +1 @@
 files/* .
-system-config-printer.mo usr/share/locale/en/LC_MESSAGES

Modified: trunk/debathena/config/printing-config/debian/rules
===================================================================
--- trunk/debathena/config/printing-config/debian/rules	2012-08-29 21:31:05 UTC (rev 25745)
+++ trunk/debathena/config/printing-config/debian/rules	2012-08-31 12:46:23 UTC (rev 25746)
@@ -21,19 +21,10 @@
 	/usr/share/man/man1/cancel.debathena.1.gz \
 	/usr/share/man/man8/lpc.debathena.8.gz
 
-DEB_UNDIVERT_VERSION_/usr/bin/cancel.debathena = 1.17~
-DEB_UNDIVERT_VERSION_/usr/sbin/lpc.debathena = 1.17~
-DEB_UNDIVERT_VERSION_/usr/share/man/man1/cancel.debathena.1.gz = 1.17~
-DEB_UNDIVERT_VERSION_/usr/share/man/man8/lpc.debathena.8.gz = 1.17~
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/config-package.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 
-build/debathena-printing-config:: system-config-printer.mo
-system-config-printer.mo: system-config-printer.po
-	msgfmt -o $@ $<
-
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 common-build-arch common-build-indep:: $(addprefix python-check-stamp-, $(cdbs_python_build_versions))
 python-check-stamp-%: python-build-stamp-%
@@ -45,4 +36,4 @@
 endif
 
 clean::
-	rm -rf debathena.printing.egg-info system-config-printer.mo
+	rm -rf debathena.printing.egg-info 


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