[26342] in Source-Commits
/svn/athena r25531 - trunk/debathena/meta/login-graphical/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed May 30 10:50:37 2012
Date: Wed, 30 May 2012 10:50:36 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201205301450.q4UEoaMr014906@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-05-30 10:50:35 -0400 (Wed, 30 May 2012)
New Revision: 25531
Modified:
trunk/debathena/meta/login-graphical/debian/changelog
trunk/debathena/meta/login-graphical/debian/control.in
trunk/debathena/meta/login-graphical/debian/rules
Log:
In login-graphical:
* Maybe depend on lightdm-config.
Modified: trunk/debathena/meta/login-graphical/debian/changelog
===================================================================
--- trunk/debathena/meta/login-graphical/debian/changelog 2012-05-30 14:44:28 UTC (rev 25530)
+++ trunk/debathena/meta/login-graphical/debian/changelog 2012-05-30 14:50:35 UTC (rev 25531)
@@ -1,3 +1,9 @@
+debathena-login-graphical (1.2) unstable; urgency=low
+
+ * Maybe depend on lightdm-config.
+
+ -- Jonathan Reed <jdreed@mit.edu> Wed, 30 May 2012 10:50:15 -0400
+
debathena-login-graphical (1.1) unstable; urgency=low
* Remove -branding packages
Modified: trunk/debathena/meta/login-graphical/debian/control.in
===================================================================
--- trunk/debathena/meta/login-graphical/debian/control.in 2012-05-30 14:44:28 UTC (rev 25530)
+++ trunk/debathena/meta/login-graphical/debian/control.in 2012-05-30 14:50:35 UTC (rev 25531)
@@ -20,6 +20,7 @@
debathena-xlock,
debathena-email-icon-config,
debathena-moira-gui,
+ ${debathena-maybe-lightdm-config},
${misc:Depends}
Recommends: ubuntu-desktop,
${debathena-thunderbird-config-recommends},
Modified: trunk/debathena/meta/login-graphical/debian/rules
===================================================================
--- trunk/debathena/meta/login-graphical/debian/rules 2012-05-30 14:44:28 UTC (rev 25530)
+++ trunk/debathena/meta/login-graphical/debian/rules 2012-05-30 14:50:35 UTC (rev 25531)
@@ -2,10 +2,11 @@
TBIRD_VERSION = $(shell apt-cache policy thunderbird 2>/dev/null | awk '/^ Candidate/ { print $$2 }' | fgrep -vx '(none)')
TBIRD_3_1 = $(shell dpkg --compare-versions '$(TBIRD_VERSION)' ge '3.1~' && echo y)
-ICED_VERSION = $(shell apt-cache policy icedove 2>/dev/null | awk '/^ Can\
-didate/ { print $$2 }' | fgrep -vx '(none)')
+ICED_VERSION = $(shell apt-cache policy icedove 2>/dev/null | awk '/^ Candidate/ { print $$2 }' | fgrep -vx '(none)')
ICED_3_1 = $(shell dpkg --compare-versions '$(ICED_VERSION)' ge '3.1~' && ech\
o y)
+LIGHTDM_VERSION = $(shell apt-cache policy lightdm 2>/dev/null | awk '/^ Candidate/ { print $$2 }' | fgrep -vx '(none)')
+HAVE_LIGHTDM_106 = $(shell dpkg --compare-versions '$(LIGHTDM_VERSION)' ge '1.0.6~' && echo y)
ifneq ($(TBIRD_3_1),y)
ifneq ($(ICED_3_1),y)
@@ -14,5 +15,10 @@
endif
endif
+ifeq ($(HAVE_LIGHTDM_106),y)
+binary-predeb/debathena-login-graphical::
+ echo "debathena-maybe-lightdm-config=debathena-lightdm-config" >> debian/debathena-login-graphical.substvars
+endif
+
include /usr/share/cdbs/1/rules/debhelper.mk
