[26753] in Source-Commits
/svn/athena r25731 - trunk/debathena/debathena/kiosk/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Thu Aug 16 17:07:15 2012
Date: Thu, 16 Aug 2012 17:07:11 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201208162107.q7GL7BY4029687@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-08-16 17:07:10 -0400 (Thu, 16 Aug 2012)
New Revision: 25731
Modified:
trunk/debathena/debathena/kiosk/debian/changelog
trunk/debathena/debathena/kiosk/debian/rules
Log:
In kiosk:
* And remove GDM version conditionals in debian/rules, we no longer need
to support old-gdm
Modified: trunk/debathena/debathena/kiosk/debian/changelog
===================================================================
--- trunk/debathena/debathena/kiosk/debian/changelog 2012-08-16 20:35:11 UTC (rev 25730)
+++ trunk/debathena/debathena/kiosk/debian/changelog 2012-08-16 21:07:10 UTC (rev 25731)
@@ -1,8 +1,10 @@
debathena-kiosk (1.4.8) unstable; urgency=low
* Build-dep on debathena-gdm
+ * And remove GDM version conditionals in debian/rules, we no longer need
+ to support old-gdm
- -- Jonathan Reed <jdreed@mit.edu> Thu, 16 Aug 2012 15:25:47 -0400
+ -- Jonathan Reed <jdreed@mit.edu> Thu, 16 Aug 2012 17:06:47 -0400
debathena-kiosk (1.4.7) unstable; urgency=low
Modified: trunk/debathena/debathena/kiosk/debian/rules
===================================================================
--- trunk/debathena/debathena/kiosk/debian/rules 2012-08-16 20:35:11 UTC (rev 25730)
+++ trunk/debathena/debathena/kiosk/debian/rules 2012-08-16 21:07:10 UTC (rev 25731)
@@ -1,11 +1,7 @@
#!/usr/bin/make -f
-GDM_VERSION = $(shell dpkg-query --showformat='$${Version}' --show gdm)
-NEW_GDM = $(shell dpkg --compare-versions $(GDM_VERSION) ge '2.25.2~' && echo y)
-
include /usr/share/cdbs/1/rules/debhelper.mk
-ifeq ($(NEW_GDM),y)
- install/debathena-kiosk::
+install/debathena-kiosk::
dh_install debian/debathena-kiosk.desktop usr/share/gdm/autostart/LoginWindow
-endif
+
