[26558] in Source-Commits
/svn/athena r25623 - in trunk/debathena: config/gdm-config/debian meta meta/gdm
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Sat Jul 7 22:14:03 2012
Date: Sat, 7 Jul 2012 22:14:01 -0400
From: Geoffrey Thomas <geofft@MIT.EDU>
Message-Id: <201207080214.q682E1h2022999@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: geofft
Date: 2012-07-07 22:14:01 -0400 (Sat, 07 Jul 2012)
New Revision: 25623
Added:
trunk/debathena/meta/gdm/
trunk/debathena/meta/gdm/debathena-gdm.equivs
Modified:
trunk/debathena/config/gdm-config/debian/changelog
trunk/debathena/config/gdm-config/debian/control.in
trunk/debathena/config/gdm-config/debian/rules
Log:
Create debathena-gdm metapackage and build-dep on it in debathena-gdm-config
Modified: trunk/debathena/config/gdm-config/debian/changelog
===================================================================
--- trunk/debathena/config/gdm-config/debian/changelog 2012-07-06 20:36:11 UTC (rev 25622)
+++ trunk/debathena/config/gdm-config/debian/changelog 2012-07-08 02:14:01 UTC (rev 25623)
@@ -1,3 +1,10 @@
+debathena-gdm-config (1.39) unstable; urgency=low
+
+ * Make support for Debian's gdm3 (from version 1.32) actually work, by
+ splitting conditional build-dep into a separate package (Trac: #976).
+
+ -- Geoffrey Thomas <geofft@mit.edu> Sat, 07 Jul 2012 18:58:12 -0700
+
debathena-gdm-config (1.38) unstable; urgency=low
* In a multiple monitor setup, like all the cool kids have, position the
Modified: trunk/debathena/config/gdm-config/debian/control.in
===================================================================
--- trunk/debathena/config/gdm-config/debian/control.in 2012-07-06 20:36:11 UTC (rev 25622)
+++ trunk/debathena/config/gdm-config/debian/control.in 2012-07-08 02:14:01 UTC (rev 25623)
@@ -2,12 +2,12 @@
Section: debathena-config/gnome
Priority: extra
Maintainer: Debathena Project <debathena@mit.edu>
-Build-Depends: @cdbs@, lsb-release
+Build-Depends: @cdbs@, debathena-gdm, lsb-release
Standards-Version: 3.8.4
Package: debathena-gdm-config
Architecture: all
-Depends: ${debathena-gdm}, gnome-session, python, ${misc:Depends}, ${debathena-gdm-gconf-depends}
+Depends: debathena-gdm, gnome-session, python, ${misc:Depends}, ${debathena-gdm-gconf-depends}
Provides: debathena-login-graphical-branding, debathena-workstation-branding, debathena-cluster-branding, ${diverted-files}
Conflicts: ${diverted-files}
Breaks: debathena-reactivate (<< 1.22~)
Modified: trunk/debathena/config/gdm-config/debian/rules
===================================================================
--- trunk/debathena/config/gdm-config/debian/rules 2012-07-06 20:36:11 UTC (rev 25622)
+++ trunk/debathena/config/gdm-config/debian/rules 2012-07-08 02:14:01 UTC (rev 25623)
@@ -9,13 +9,7 @@
gdm = gdm
NEW_GDM = $(shell dpkg --compare-versions $(GDM_VERSION) ge '2.25.2~' && echo y)
endif
-CDBS_BUILD_DEPENDS += $(gdm)
-binary-predeb/debathena-gdm-config:: debathena-gdm-config-substvars
-debathena-gdm-config-substvars::
- echo "debathena-gdm=$(gdm)" \
- >> debian/debathena-gdm-config.substvars
-
ifneq ($(wildcard /etc/gdm/gdm.conf-custom),)
GDM_CONFFILE = /etc/gdm/gdm.conf-custom.debathena
DEB_DH_LINK_ARGS_debathena-gdm-config=/etc/gdm/gdm.conf-custom.debathena /etc/gdm/gdm.conf.debathena
@@ -67,6 +61,7 @@
dh_install debian/debathena-nologin-monitor usr/lib/debathena-nologin-monitor
dh_install debian/debathena-nologin-monitor.desktop usr/share/gdm/autostart/LoginWindow
+ binary-predeb/debathena-gdm-config:: debathena-gdm-config-substvars
debathena-gdm-config-substvars::
echo "debathena-gdm-gconf-depends=debathena-gconf2-config (>= 1.8~)" \
>> debian/debathena-gdm-config.substvars
Added: trunk/debathena/meta/gdm/debathena-gdm.equivs
===================================================================
--- trunk/debathena/meta/gdm/debathena-gdm.equivs (rev 0)
+++ trunk/debathena/meta/gdm/debathena-gdm.equivs 2012-07-08 02:14:01 UTC (rev 25623)
@@ -0,0 +1,13 @@
+Section: debathena/gnome
+Priority: extra
+Standards-Version: 3.9.1
+
+Package: debathena-gdm
+Version: 1.0
+Maintainer: Debathena Project <debathena@mit.edu>
+Depends: gdm3 | gdm
+Copyright: ../common/copyright
+Readme: ../common/README-meta.in
+Description: Current GDM version for Debathena
+ This package depends on gdm3, if it exists, else gdm, to handle
+ different naming schemes between Debian and Ubuntu.
