[26314] in Source-Commits
Re: /svn/athena r25396 - trunk/debathena/config/gdm-config/debian
daemon@ATHENA.MIT.EDU (Jonathan Reed)
Thu May 17 11:46:53 2012
Mime-Version: 1.0 (Apple Message framework v1084)
Content-Type: text/plain; charset=us-ascii
From: Jonathan Reed <jdreed@MIT.EDU>
In-Reply-To: <alpine.DEB.2.02.1201172054350.5124@tyger.mit.edu>
Date: Thu, 17 May 2012 11:46:49 -0400
Cc: source-commits@MIT.EDU
Message-Id: <299161AF-5787-4469-84CE-5A7043C6B9C5@mit.edu>
To: Geoffrey Thomas <geofft@MIT.EDU>
Content-Transfer-Encoding: 8bit
Did you fail to revert this code when you NACK'd it? Because,uh, we've been building gdm-config with this in there.
-Jon
On Jan 17, 2012, at 8:58 PM, Geoffrey Thomas wrote:
> NACK, why did you ever think this was going to work. (debian/control is built only once, in dasource, on the host, so the overly-clever CDBS_BUILD_DEPENDS hack doesn't work.) The right answer is to make a debathena-gdm package a la debathena-cups, etc. that depends on gdm3 | gdm, and build-depend on that. *sigh*
>
> ... or we could consider using the brand new aptitude-based build dependency resolver in squeeze-backports' sbuild, so that we can get rid of all those workarounds and do awesome things in our build-depends lines.
>
> --
> Geoffrey Thomas
> geofft@mit.edu
>
> On Sat, 10 Sep 2011, Geoffrey Thomas wrote:
>
>> Author: geofft
>> Date: 2011-09-10 03:08:51 -0400 (Sat, 10 Sep 2011)
>> New Revision: 25396
>>
>> Modified:
>> trunk/debathena/config/gdm-config/debian/changelog
>> trunk/debathena/config/gdm-config/debian/control.in
>> trunk/debathena/config/gdm-config/debian/debathena-gdm-config.dirs
>> trunk/debathena/config/gdm-config/debian/debathena-gdm-config.install
>> trunk/debathena/config/gdm-config/debian/rules
>> Log:
>> In gdm-config:
>> * Support Debian's gdm3 package (Trac: #976).
>> * Fix typos caught by Lintian and do some other cleanup.
>>
>>
>> Modified: trunk/debathena/config/gdm-config/debian/changelog
>> ===================================================================
>> --- trunk/debathena/config/gdm-config/debian/changelog 2011-09-07 05:28:43 UTC (rev 25395)
>> +++ trunk/debathena/config/gdm-config/debian/changelog 2011-09-10 07:08:51 UTC (rev 25396)
>> @@ -1,3 +1,10 @@
>> +debathena-gdm-config (1.32) unstable; urgency=low
>> +
>> + * Support Debian's gdm3 package (Trac: #976).
>> + * Fix typos caught by Lintian and do some other cleanup.
>> +
>> + -- Geoffrey Thomas <geofft@mit.edu> Sat, 10 Sep 2011 01:40:19 -0400
>> +
>> debathena-gdm-config (1.31) unstable; urgency=low
>>
>> * Only display the nologin-monitor window on startup if the file exists
>>
>> Modified: trunk/debathena/config/gdm-config/debian/control.in
>> ===================================================================
>> --- trunk/debathena/config/gdm-config/debian/control.in 2011-09-07 05:28:43 UTC (rev 25395)
>> +++ trunk/debathena/config/gdm-config/debian/control.in 2011-09-10 07:08:51 UTC (rev 25396)
>> @@ -2,12 +2,12 @@
>> Section: debathena-config/gnome
>> Priority: extra
>> Maintainer: Debathena Project <debathena@mit.edu>
>> -Build-Depends: @cdbs@, gdm, lsb-release
>> +Build-Depends: @cdbs@, lsb-release
>> Standards-Version: 3.8.4
>>
>> Package: debathena-gdm-config
>> Architecture: all
>> -Depends: gdm, gnome-session, python, ${misc:Depends}, ${debathena-gdm-gconf-depends}
>> +Depends: ${debathena-gdm}, gnome-session, python, ${misc:Depends}, ${debathena-gdm-gconf-depends}
>> Provides: ${diverted-files}
>> Conflicts: ${diverted-files}
>> Breaks: debathena-reactivate (<< 1.22~)
>>
>> Modified: trunk/debathena/config/gdm-config/debian/debathena-gdm-config.dirs
>> ===================================================================
>> --- trunk/debathena/config/gdm-config/debian/debathena-gdm-config.dirs 2011-09-07 05:28:43 UTC (rev 25395)
>> +++ trunk/debathena/config/gdm-config/debian/debathena-gdm-config.dirs 2011-09-10 07:08:51 UTC (rev 25396)
>> @@ -1,4 +1,2 @@
>> -etc/gdm
>> -usr/share/pixmaps
>> usr/share/debathena-gdm-config/PreSession.d
>> usr/share/debathena-gdm-config/PostSession.d
>>
>> Modified: trunk/debathena/config/gdm-config/debian/debathena-gdm-config.install
>> ===================================================================
>> --- trunk/debathena/config/gdm-config/debian/debathena-gdm-config.install 2011-09-07 05:28:43 UTC (rev 25395)
>> +++ trunk/debathena/config/gdm-config/debian/debathena-gdm-config.install 2011-09-10 07:08:51 UTC (rev 25396)
>> @@ -1,4 +1,2 @@
>> debian/debathena.png usr/share/pixmaps
>> -debian/PreSession/Default.debathena etc/gdm/PreSession
>> -debian/PostSession/Default.debathena etc/gdm/PostSession
>> -debathena /usr/share/gdm/themes/
>> +debathena usr/share/gdm/themes
>>
>> Modified: trunk/debathena/config/gdm-config/debian/rules
>> ===================================================================
>> --- trunk/debathena/config/gdm-config/debian/rules 2011-09-07 05:28:43 UTC (rev 25395)
>> +++ trunk/debathena/config/gdm-config/debian/rules 2011-09-10 07:08:51 UTC (rev 25396)
>> @@ -1,8 +1,21 @@
>> #!/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)
>> +GDM3_VERSION = $(shell dpkg-query --showformat='$${Version}' --show gdm3)
>> +ifneq ($(GDM3_VERSION),)
>> + gdm = gdm3
>> + NEW_GDM = y
>> +else
>> + 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
>> @@ -13,8 +26,8 @@
>> DEB_DIVERT_EXTENSION = .debathena
>> DEB_TRANSFORM_SCRIPT_${GDM_CONFFILE} = debian/transform_gdm.conf.debathena
>> DEB_DIVERT_FILES_debathena-gdm-config += \
>> - /etc/gdm/PreSession/Default.debathena \
>> - /etc/gdm/PostSession/Default.debathena
>> + /etc/$(gdm)/PreSession/Default.debathena \
>> + /etc/$(gdm)/PostSession/Default.debathena
>> DEB_REMOVE_FILES_debathena-gdm-config += \
>> /usr/share/xsessions/ssh.desktop
>>
>> @@ -33,24 +46,27 @@
>> debathena/distro.svg: debian/distro.svg.sh
>> sh $< > $@
>>
>> +install/debathena-gdm-config::
>> + dh_install debian/PreSession/Default.debathena etc/$(gdm)/PreSession
>> + dh_install debian/PostSession/Default.debathena etc/$(gdm)/PostSession
>> +
>> ifneq ($(NEW_GDM),y)
>> install/debathena-gdm-config::
>> dh_install debian/default.desktop.debathena usr/share/gdm/BuiltInSessions
>> else
>> install/debathena-gdm-config::
>> dh_install debian/background.jpg usr/share/debathena-gdm-config
>> - dh_install debian/%gconf-tree.xml var/lib/gdm/.gconf.debathena-gdm-config
>> + dh_install debian/%gconf-tree.xml var/lib/$(gdm)/.gconf.debathena-gdm-config
>> dh_install debian/athena.desktop usr/share/xsessions
>> dh_install debian/athena-session usr/bin
>>
>> - install -m 660 debian/gconf.path.debathena debian/$(cdbs_curpkg)/var/lib/gdm/.gconf.path.debathena
>> + install -m 660 debian/gconf.path.debathena debian/$(cdbs_curpkg)/var/lib/$(gdm)/.gconf.path.debathena
>> dh_install debian/debathena-branding usr/lib/debathena-branding
>> dh_install debian/debathena-branding.glade usr/share/debathena-branding
>> dh_install debian/debathena-branding.desktop usr/share/gdm/autostart/LoginWindow
>> 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
>>
>>
