[23674] in Source-Commits
/svn/athena r23286 - trunk/debathena/config/gconf2-config/debian
daemon@ATHENA.MIT.EDU (broder@MIT.EDU)
Sat Jan 24 03:28:22 2009
Date: Sat, 24 Jan 2009 03:27:55 -0500 (EST)
From: broder@MIT.EDU
Message-Id: <200901240827.DAA05867@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: broder
Date: 2009-01-24 03:27:54 -0500 (Sat, 24 Jan 2009)
New Revision: 23286
Added:
trunk/debathena/config/gconf2-config/debian/10debathena-copy-gconf
Modified:
trunk/debathena/config/gconf2-config/debian/changelog
trunk/debathena/config/gconf2-config/debian/debathena-gconf2-config.install
trunk/debathena/config/gconf2-config/debian/rules
Log:
In gconf2-config:
* Do not use the same gconf configuration for different releases of
Debian/Ubuntu, since gconf defaults are not backwards-compatible.
Added: trunk/debathena/config/gconf2-config/debian/10debathena-copy-gconf
===================================================================
--- trunk/debathena/config/gconf2-config/debian/10debathena-copy-gconf 2009-01-24 07:20:57 UTC (rev 23285)
+++ trunk/debathena/config/gconf2-config/debian/10debathena-copy-gconf 2009-01-24 08:27:54 UTC (rev 23286)
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+consider() {
+ TARGET="$1"
+ if [ "-${CODENAME}" = "$TARGET" ]; then
+ FINISHED="yes"
+ fi
+ TRY="$HOME/.gconf-debathena${TARGET}"
+ if [ ! "$FINISHED" = "yes" ] && [ -e "$TRY" ]; then
+ SOURCE="$TRY"
+ fi
+}
+
+SOURCE=""
+FINISHED="no"
+CODENAME=`lsb_release --short --codename`
+DISTRO=`lsb_release --short --id`
+GCONF="$HOME/.gconf-debathena-$CODENAME"
+if [ ! -e "$GCONF" ]; then
+ if [ "$DISTRO" = "Ubuntu" ]; then
+ consider "-dapper"
+ consider "-edgy"
+ consider "-feisty"
+ consider "-gutsy"
+ consider "-ubuntu"
+ consider "-hardy"
+ consider "-intrepid"
+ fi
+ if [ "$DISTRO" = "Debian" ]; then
+ consider "-sarge"
+ consider ""
+ consider "-etch"
+ consider "-lenny"
+ fi
+ if [ -n "$SOURCE" ]; then
+ cp -a "$SOURCE" "$GCONF"
+ fi
+fi
Property changes on: trunk/debathena/config/gconf2-config/debian/10debathena-copy-gconf
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/debathena/config/gconf2-config/debian/changelog
===================================================================
--- trunk/debathena/config/gconf2-config/debian/changelog 2009-01-24 07:20:57 UTC (rev 23285)
+++ trunk/debathena/config/gconf2-config/debian/changelog 2009-01-24 08:27:54 UTC (rev 23286)
@@ -1,3 +1,10 @@
+debathena-gconf2-config (1.3) unstable; urgency=low
+
+ * Do not use the same gconf configuration for different releases of
+ Debian/Ubuntu, since gconf defaults are not backwards-compatible.
+
+ -- Tim Abbott <tabbott@mit.edu> Thu, 1 May 2008 22:01:57 -0400
+
debathena-gconf2-config (1.2) unstable; urgency=low
* Convert to use config-package.mk interface, new in config-package-
Modified: trunk/debathena/config/gconf2-config/debian/debathena-gconf2-config.install
===================================================================
--- trunk/debathena/config/gconf2-config/debian/debathena-gconf2-config.install 2009-01-24 07:20:57 UTC (rev 23285)
+++ trunk/debathena/config/gconf2-config/debian/debathena-gconf2-config.install 2009-01-24 08:27:54 UTC (rev 23286)
@@ -1 +1,2 @@
debian/gconf* usr/share/debathena-gconf2-config/
+debian/10debathena-copy-gconf etc/X11/Xsession.d/
Modified: trunk/debathena/config/gconf2-config/debian/rules
===================================================================
--- trunk/debathena/config/gconf2-config/debian/rules 2009-01-24 07:20:57 UTC (rev 23285)
+++ trunk/debathena/config/gconf2-config/debian/rules 2009-01-24 08:27:54 UTC (rev 23286)
@@ -21,13 +21,14 @@
SUFFIX = $(SUFFIX-$(DISTRO))
SUFFIX-Debian = -debathena
SUFFIX-Ubuntu = -debathena-ubuntu
+RELEASE = $(shell lsb_release --short --codename)
ifeq ($(SUFFIX),)
$(error Unknown distro $(DISTRO).)
endif
debian/gconf.afs:
- echo 'xml:readwrite:$$(HOME)/.gconf$(SUFFIX)' > $@
+ echo 'xml:readwrite:$$(HOME)/.gconf-debathena-$(RELEASE)' > $@
debian/gconf.local:
echo 'xml:readwrite:$$(HOME)/.gconf' > $@
