[26151] in Source-Commits
/svn/athena r25421 - trunk/debathena/meta/workstation/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Mon Oct 24 11:39:23 2011
Date: Mon, 24 Oct 2011 11:39:21 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201110241539.p9OFdL4R026124@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-10-24 11:39:21 -0400 (Mon, 24 Oct 2011)
New Revision: 25421
Modified:
trunk/debathena/meta/workstation/debian/changelog
trunk/debathena/meta/workstation/debian/control.in
trunk/debathena/meta/workstation/debian/rules
Log:
In workstation:
* Depend on debathena-tex-config only if texlive-binaries is earlier
than 2009-10, which is when support for /etc/papersize was added
Modified: trunk/debathena/meta/workstation/debian/changelog
===================================================================
--- trunk/debathena/meta/workstation/debian/changelog 2011-10-23 05:37:31 UTC (rev 25420)
+++ trunk/debathena/meta/workstation/debian/changelog 2011-10-24 15:39:21 UTC (rev 25421)
@@ -1,3 +1,10 @@
+debathena-workstation (1.6) unstable; urgency=low
+
+ * Depend on debathena-tex-config only if texlive-binaries is earlier
+ than 2009-10, which is when support for /etc/papersize was added
+
+ -- Jonathan Reed <jdreed@mit.edu> Mon, 24 Oct 2011 11:37:01 -0400
+
debathena-workstation (1.5) unstable; urgency=low
* Explicitly depend on debathena-build-depends, as it was removed from
Modified: trunk/debathena/meta/workstation/debian/control.in
===================================================================
--- trunk/debathena/meta/workstation/debian/control.in 2011-10-23 05:37:31 UTC (rev 25420)
+++ trunk/debathena/meta/workstation/debian/control.in 2011-10-24 15:39:21 UTC (rev 25421)
@@ -18,8 +18,8 @@
debathena-ntp-config | debathena-chrony-config,
debathena-tmp-cleaner,
debathena-auto-update,
- debathena-tex-config,
debathena-moira-update-server,
+ ${debathena-maybe-tex-config},
${misc:Depends}
Description: Athena managed workstation configuration
This package configures a private, graphical Debathena workstation.
Modified: trunk/debathena/meta/workstation/debian/rules
===================================================================
--- trunk/debathena/meta/workstation/debian/rules 2011-10-23 05:37:31 UTC (rev 25420)
+++ trunk/debathena/meta/workstation/debian/rules 2011-10-24 15:39:21 UTC (rev 25421)
@@ -1,3 +1,13 @@
#!/usr/bin/make -f
+# texlive-bin 2009-10 finally respects local paper size
+
+TEXLIVE_BIN_VERSION = $(shell apt-cache policy thunderbird 2>/dev/null | awk '/^ Candidate/ { print $$2 }' | fgrep -vx '(none)')
+TEXLIVE_2009_11 = $(shell dpkg --compare-versions '$(TEXLIVE_BIN_VERSION)' ge '2009-10~' && echo y)
+
+ifneq ($(TEXLIVE_2009_11),y)
+binary-predeb/debathena-workstation::
+ echo "debathena-maybe-tex-config=debathena-tex-config" >> debian/debathena-workstation.substvars
+endif
+
include /usr/share/cdbs/1/rules/debhelper.mk
