[26299] in Source-Commits
/svn/athena r25502 - in trunk/debathena: config/gdm-config/debathena config/gdm-config/debian meta/cluster/debian meta/login-graphical/debian meta/workstation/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Mon May 14 15:31:52 2012
Date: Mon, 14 May 2012 15:31:50 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201205141931.q4EJVoPh025383@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-05-14 15:31:50 -0400 (Mon, 14 May 2012)
New Revision: 25502
Added:
trunk/debathena/config/gdm-config/debathena/metapackage-generic.svg
Removed:
trunk/debathena/config/gdm-config/debian/debathena-cluster-branding.install
trunk/debathena/config/gdm-config/debian/debathena-cluster-branding.postinst
trunk/debathena/config/gdm-config/debian/debathena-cluster-branding.prerm
trunk/debathena/config/gdm-config/debian/debathena-login-graphical-branding.install
trunk/debathena/config/gdm-config/debian/debathena-login-graphical-branding.postinst
trunk/debathena/config/gdm-config/debian/debathena-login-graphical-branding.prerm
trunk/debathena/config/gdm-config/debian/debathena-workstation-branding.install
trunk/debathena/config/gdm-config/debian/debathena-workstation-branding.postinst
trunk/debathena/config/gdm-config/debian/debathena-workstation-branding.prerm
Modified:
trunk/debathena/config/gdm-config/debathena/debathena.xml
trunk/debathena/config/gdm-config/debian/changelog
trunk/debathena/config/gdm-config/debian/control.in
trunk/debathena/config/gdm-config/debian/debathena-gdm-config.postinst
trunk/debathena/config/gdm-config/debian/debathena-gdm-config.prerm
trunk/debathena/meta/cluster/debian/changelog
trunk/debathena/meta/cluster/debian/control.in
trunk/debathena/meta/login-graphical/debian/changelog
trunk/debathena/meta/login-graphical/debian/control.in
trunk/debathena/meta/workstation/debian/changelog
trunk/debathena/meta/workstation/debian/control.in
Log:
In gdm-config:
* Remove -branding packages. Ancient GDM users now get the word
"Debathena" instead of the metapackage name.
In cluster:
* Remove -branding packages
In login-graphical:
* Remove -branding packages
In workstation:
* Remove -branding packages
Modified: trunk/debathena/config/gdm-config/debathena/debathena.xml
===================================================================
--- trunk/debathena/config/gdm-config/debathena/debathena.xml 2012-05-14 18:17:01 UTC (rev 25501)
+++ trunk/debathena/config/gdm-config/debathena/debathena.xml 2012-05-14 19:31:50 UTC (rev 25502)
@@ -60,7 +60,7 @@
<text>%c</text>
</item>
<item type="pixmap">
- <normal file="metapackage.svg" />
+ <normal file="metapackage-generic.svg" />
<pos x="-10" y="50%" anchor="e" />
</item>
<item type="pixmap">
Added: trunk/debathena/config/gdm-config/debathena/metapackage-generic.svg
===================================================================
--- trunk/debathena/config/gdm-config/debathena/metapackage-generic.svg (rev 0)
+++ trunk/debathena/config/gdm-config/debathena/metapackage-generic.svg 2012-05-14 19:31:50 UTC (rev 25502)
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<svg width="300" height="10pt" xmlns="http://www.w3.org/2000/svg">
+<text style="font-family: Trebuchet MS; font-size: 10pt; font-weight: normal;" x="100%" y="10pt" text-anchor="end">
+Debathena
+</text>
+</svg>
Modified: trunk/debathena/config/gdm-config/debian/changelog
===================================================================
--- trunk/debathena/config/gdm-config/debian/changelog 2012-05-14 18:17:01 UTC (rev 25501)
+++ trunk/debathena/config/gdm-config/debian/changelog 2012-05-14 19:31:50 UTC (rev 25502)
@@ -1,9 +1,11 @@
-debathena-gdm-config (1.36) UNRELEASED; urgency=low
+ebathena-gdm-config (1.36) unstable; urgency=low
* Populate the GtkImage prior to window mapping so that positioning the
window is done correctly
+ * Remove -branding packages. Ancient GDM users now get the word
+ "Debathena" instead of the metapackage name.
- -- Jonathan Reed <jdreed@mit.edu> Thu, 10 May 2012 10:17:06 -0400
+ -- Jonathan Reed <jdreed@mit.edu> Mon, 14 May 2012 15:28:53 -0400
debathena-gdm-config (1.35) unstable; urgency=low
Modified: trunk/debathena/config/gdm-config/debian/control.in
===================================================================
--- trunk/debathena/config/gdm-config/debian/control.in 2012-05-14 18:17:01 UTC (rev 25501)
+++ trunk/debathena/config/gdm-config/debian/control.in 2012-05-14 19:31:50 UTC (rev 25502)
@@ -16,25 +16,4 @@
This packages configures gdm to use the Debathena logo, store
xauthority files in /tmp, and welcome the user to Debathena.
-Package: debathena-login-graphical-branding
-Architecture: all
-Depends: debathena-login-graphical, ${misc:Depends}
-Description: Displays which Debathena metapackage level is installed
- This package configures the Debathena login screen to note that
- debathena-login-graphical is installed, unless overriden by a
- higher -branding package.
-Package: debathena-workstation-branding
-Architecture: all
-Depends: debathena-workstation, ${misc:Depends}
-Description: Displays which Debathena metapackage level is installed
- This package configures the Debathena login screen to note that
- debathena-workstation is installed, unless overriden by a
- higher -branding package.
-
-Package: debathena-cluster-branding
-Architecture: all
-Depends: debathena-cluster, ${misc:Depends}
-Description: Displays which Debathena metapackage level is installed
- This package configures the Debathena login screen to note that
- debathena-cluster is installed.
Modified: trunk/debathena/config/gdm-config/debian/debathena-gdm-config.postinst
===================================================================
--- trunk/debathena/config/gdm-config/debian/debathena-gdm-config.postinst 2012-05-14 18:17:01 UTC (rev 25501)
+++ trunk/debathena/config/gdm-config/debian/debathena-gdm-config.postinst 2012-05-14 19:31:50 UTC (rev 25502)
@@ -97,14 +97,6 @@
/etc/init.d/gdm reload || true
fi
fi
- # We don't actually want the "unknown metapackage" file, but it
- # needs to be present in case you have debathena-gdm-config and
- # nothing else, so give it priority 0.
- update-alternatives --install \
- /usr/share/gdm/themes/debathena/metapackage.svg \
- debathena-metapackage.svg \
- /usr/share/gdm/themes/debathena/metapackage-unknown.svg \
- 0
;;
abort-upgrade|abort-remove|abort-deconfigure)
Modified: trunk/debathena/config/gdm-config/debian/debathena-gdm-config.prerm
===================================================================
--- trunk/debathena/config/gdm-config/debian/debathena-gdm-config.prerm 2012-05-14 18:17:01 UTC (rev 25501)
+++ trunk/debathena/config/gdm-config/debian/debathena-gdm-config.prerm 2012-05-14 19:31:50 UTC (rev 25502)
@@ -19,8 +19,6 @@
case "$1" in
remove|upgrade|deconfigure)
- update-alternatives --remove debathena-metapackage.svg \
- /usr/share/gdm/themes/debathena/metapackage-unknown.svg
if [ -f /usr/share/xsessions/athena.desktop ] && \
[ -x /usr/lib/gdm/gdm-set-default-session ]; then
# Sigh. This exits non-zero if there already is a default
Modified: trunk/debathena/meta/cluster/debian/changelog
===================================================================
--- trunk/debathena/meta/cluster/debian/changelog 2012-05-14 18:17:01 UTC (rev 25501)
+++ trunk/debathena/meta/cluster/debian/changelog 2012-05-14 19:31:50 UTC (rev 25502)
@@ -1,3 +1,9 @@
+debathena-cluster (1.11) unstable; urgency=low
+
+ * Remove -branding packages
+
+ -- Jonathan Reed <jdreed@mit.edu> Mon, 14 May 2012 15:29:40 -0400
+
debathena-cluster (1.10) unstable; urgency=low
* Remove dependency on debathena-cluster-cups-config, since that package
Modified: trunk/debathena/meta/cluster/debian/control.in
===================================================================
--- trunk/debathena/meta/cluster/debian/control.in 2012-05-14 18:17:01 UTC (rev 25501)
+++ trunk/debathena/meta/cluster/debian/control.in 2012-05-14 19:31:50 UTC (rev 25502)
@@ -7,8 +7,7 @@
Package: debathena-cluster
Architecture: all
-Depends: debathena-cluster-branding,
- debathena-workstation,
+Depends: debathena-workstation,
debathena-cluster-login-config,
debathena-larvnet,
debathena-reactivate,
Modified: trunk/debathena/meta/login-graphical/debian/changelog
===================================================================
--- trunk/debathena/meta/login-graphical/debian/changelog 2012-05-14 18:17:01 UTC (rev 25501)
+++ trunk/debathena/meta/login-graphical/debian/changelog 2012-05-14 19:31:50 UTC (rev 25502)
@@ -1,3 +1,9 @@
+debathena-login-graphical (1.1) unstable; urgency=low
+
+ * Remove -branding packages
+
+ -- Jonathan Reed <jdreed@mit.edu> Mon, 14 May 2012 15:30:46 -0400
+
debathena-login-graphical (1.0) unstable; urgency=low
* First release as non-equivs package
Modified: trunk/debathena/meta/login-graphical/debian/control.in
===================================================================
--- trunk/debathena/meta/login-graphical/debian/control.in 2012-05-14 18:17:01 UTC (rev 25501)
+++ trunk/debathena/meta/login-graphical/debian/control.in 2012-05-14 19:31:50 UTC (rev 25502)
@@ -7,8 +7,7 @@
Package: debathena-login-graphical
Architecture: all
-Depends: debathena-login-graphical-branding,
- debathena-login,
+Depends: debathena-login,
debathena-gdm-config,
debathena-xsession,
debathena-firefox-extension,
Modified: trunk/debathena/meta/workstation/debian/changelog
===================================================================
--- trunk/debathena/meta/workstation/debian/changelog 2012-05-14 18:17:01 UTC (rev 25501)
+++ trunk/debathena/meta/workstation/debian/changelog 2012-05-14 19:31:50 UTC (rev 25502)
@@ -1,3 +1,9 @@
+debathena-workstation (1.7) unstable; urgency=low
+
+ * Remove -branding packages
+
+ -- Jonathan Reed <jdreed@mit.edu> Mon, 14 May 2012 15:30:06 -0400
+
debathena-workstation (1.6) unstable; urgency=low
* Depend on debathena-tex-config only if texlive-binaries is earlier
Modified: trunk/debathena/meta/workstation/debian/control.in
===================================================================
--- trunk/debathena/meta/workstation/debian/control.in 2012-05-14 18:17:01 UTC (rev 25501)
+++ trunk/debathena/meta/workstation/debian/control.in 2012-05-14 19:31:50 UTC (rev 25502)
@@ -7,8 +7,7 @@
Package: debathena-workstation
Architecture: all
-Depends: debathena-workstation-branding,
- debathena-login-graphical,
+Depends: debathena-login-graphical,
debathena-extra-software,
debathena-build-depends,
debathena-language-support,
