[Blends-commit] r1810 - blends/trunk/blends/debian

[Debian Pure Blends Subversion Commit]

Author: tille
Date: Fri Aug 21 12:00:33 2009
New Revision: 1810
URL: http://svn.debian.org/viewsvn/blends?rev=1810&view=rev

Log:
Make sure we will not create config files in blends-common which are part of specific blends configuration while trying to migrate from CDD to Blends (this is addressing #542656 and #542658)


Removed:
   blends/trunk/blends/debian/changelog.med-common
Modified:
   blends/trunk/blends/debian/NEWS.Debian
   blends/trunk/blends/debian/blends-common.preinst
   blends/trunk/blends/debian/changelog

Modified: blends/trunk/blends/debian/NEWS.Debian
URL: http://svn.debian.org/viewsvn/blends/blends/trunk/blends/debian/NEWS.Debian?rev=1810&view=diff&r1=1810&r2=1809&p1=blends/trunk/blends/debian/NEWS.Debian&p2=blends/trunk/blends/debian/NEWS.Debian
==============================================================================
--- blends/trunk/blends/debian/NEWS.Debian	(original)
+++ blends/trunk/blends/debian/NEWS.Debian	Fri Aug 21 12:00:33 2009
@@ -1,8 +1,27 @@
+blends (0.6.6) unstable; urgency=low
+
+  * Previous versions of blends-common tried to convert config files from
+    CDDs in /etc/cdd/<CDDNAME> installed on the system to the new location
+    /etc/blends/<BLENDS> to enable a smooth migration.  Unfortunately this
+    is a violation of policy 10.7.3, see 
+    http://www.debian.org/doc/debian-policy/ch-files.html#s10.7.3,
+    because it conflicts with the default config files in the config
+    package of a Blend so this has to be dropped.  It concerns only
+    three Blends and the change is very minimal (if needed ever - you
+    are probably doing better with the new default configuration file).
+    
+    For the sake of completenes the new blend configuration directory has
+    a copy of the old configuration file with the extension *.cdd to make
+    sure that nothing is lost.  You should inspect this file and can
+    safely remove it afterwards.
+
+ -- Andreas Tille <tille at debian.org>  Fri, 21 Aug 2009 14:24:50 +0200
+
 blends (0.6.0) unstable; urgency=low
 
   * The great renaming:  The confusing name Custom Debian Distribution
     was dropped after DebConf 8 and replaced by Debian Pure Blends -
-    in short blends if the iDebian internal use is evident.  This
+    in short blends if the Debian internal use is evident.  This
     reflects in a rename of the package and all the tools.
   * This change results in a rename of the cdd-dev binary package to
     blends-dev and cdd-commons binary package to blends-common.

Modified: blends/trunk/blends/debian/blends-common.preinst
URL: http://svn.debian.org/viewsvn/blends/blends/trunk/blends/debian/blends-common.preinst?rev=1810&view=diff&r1=1810&r2=1809&p1=blends/trunk/blends/debian/blends-common.preinst&p2=blends/trunk/blends/debian/blends-common.preinst
==============================================================================
--- blends/trunk/blends/debian/blends-common.preinst	(original)
+++ blends/trunk/blends/debian/blends-common.preinst	Fri Aug 21 12:00:33 2009
@@ -2,7 +2,7 @@
 set -e
 
 # In the process of renaming former Custom Debian Distributions to
-# Debian Pure Blends ons we have to care for configuration files
+# Debian Pure Blends we try to care for configuration files
 
 if [ -d /etc/cdd ] ; then
     mkdir -p /etc/blends
@@ -12,10 +12,16 @@
     # cp -u -a /etc/cdd/* /etc/blends
     for blend in `find /etc/blends -maxdepth 1 -mindepth 1 -type d` ; do
 	cd "$blend"
-	sed -i~ -e 's/CDD/BLEND/g' \
+	for cfgfile in `find . -type f -name "*[a-z]"` ; do
+	    if echo $cfgfile | grep -q "\.cdd$" ; then
+		continue
+	    fi
+	    sed -e 's/CDD/BLEND/g' \
 		-e 's/cdd/blend/g' \
 	        -e 's/Custom Debian Distribution/Debian Pure Blend/g' \
-	        `find . -type f -name "*[a-z]"`
+	        $cfgfile > "$cfgfile"~
+	    mv $cfgfile "$cfgfile".cdd
+	done
     done
     if [ -e /etc/blends/cdd.conf ] ; then
 	if [ /etc/blends/blends.conf ] ; then

Modified: blends/trunk/blends/debian/changelog
URL: http://svn.debian.org/viewsvn/blends/blends/trunk/blends/debian/changelog?rev=1810&view=diff&r1=1810&r2=1809&p1=blends/trunk/blends/debian/changelog&p2=blends/trunk/blends/debian/changelog
==============================================================================
--- blends/trunk/blends/debian/changelog	(original)
+++ blends/trunk/blends/debian/changelog	Fri Aug 21 12:00:33 2009
@@ -1,11 +1,15 @@
-blends (0.6.6) UNRELEASED; urgency=low
+blends (0.6.6) unstable; urgency=low
 
-  * Fixing some links in the documentation which is
-    addressed by bug #542385 but this bug is not solved
-    by package upload but rather by updating the doc on
-    the website
+  * Fixing some links in the documentation which is addressed by bug
+    #542385 but this bug is not solved by package upload but rather by
+    updating the doc on the website
+  * blends-common.preinst: Do not create config files from Blends
+    guessing from old CDD configuration file.  The former behaviour to
+    pre-build those config files leaded to #542656 and #542658.
+  * Removed debian/changelog.med-common because there is no point in
+    providing this now 5 year old file for ever.
 
- -- Andreas Tille <tille at debian.org>  Wed, 19 Aug 2009 14:24:50 +0200
+ -- Andreas Tille <tille at debian.org>  Fri, 21 Aug 2009 14:24:50 +0200
 
 blends (0.6.5) unstable; urgency=low