diff -Nru blends-0.6.8ubuntu1/debian/blends-common.docs blends-0.6.10ubuntu1/debian/blends-common.docs
--- blends-0.6.8ubuntu1/debian/blends-common.docs	2009-02-05 23:22:37.000000000 +0100
+++ blends-0.6.10ubuntu1/debian/blends-common.docs	2010-01-27 13:12:05.000000000 +0100
@@ -1,2 +1,2 @@
 README.BLENDS
-debian/NEWS.Debian
+debian/blends-common.NEWS.Debian
diff -Nru blends-0.6.8ubuntu1/debian/blends-common.NEWS.Debian blends-0.6.10ubuntu1/debian/blends-common.NEWS.Debian
--- blends-0.6.8ubuntu1/debian/blends-common.NEWS.Debian	1970-01-01 01:00:00.000000000 +0100
+++ blends-0.6.10ubuntu1/debian/blends-common.NEWS.Debian	2010-01-11 19:33:11.000000000 +0100
@@ -0,0 +1,65 @@
+blends (0.6.9) unstable; urgency=low
+
+  * Do not try to take over config files from /etc/cdd -
+    it just leads to trouble and is not worth the effort
+    because they are unchanged in most practical cases
+    --> Please check the files in /etc/cdd if existant and
+        take over the changes manually if needed to
+        /etc/blends
+
+ -- Andreas Tille <tille@debian.org>  Mon, 11 Jan 2010 19:23:04 +0100
+
+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@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 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.
+    To provide a reasonable migration path dummy packages cdd-dev and
+    cdd-common are provided as well which contain symlinks to the tools
+    in the respective blends package to make sure all projects are able
+    to migrate their meta packages smoothly.
+  * The projects affected are:
+    - Debian Edu
+    - Debian Junior
+    - Debian Med
+    - Debian Science
+                
+ -- Andreas Tille <tille@debian.org>  Sun, 19 Oct 2008 15:23:01 +0200
+
+cdd (0.3.1) unstable; urgency=low
+
+  * In cdd 0.3 user menus where implemented by placing a symlink cdd-menu
+    in the .menu directory of each user who belongs to any Custom
+    Debian Distrinution role.  Now a solution was found which does not
+    touch users .menu directory.
+
+    To avoid code for removal of these old cdd-menu links in the users
+    home directories in the future postinst scripts it seems to be the
+    best solution to ask the local administrator do remove these links
+    manually.  So please remove all symlinks named
+
+       <userhome>/.menu/cdd-menu
+
+ -- Andreas Tille <tille@debian.org>  Thu, 17 May 2004 17:42:38 +0200
diff -Nru blends-0.6.8ubuntu1/debian/blends-common.preinst blends-0.6.10ubuntu1/debian/blends-common.preinst
--- blends-0.6.8ubuntu1/debian/blends-common.preinst	2009-11-09 13:02:35.000000000 +0100
+++ blends-0.6.10ubuntu1/debian/blends-common.preinst	1970-01-01 01:00:00.000000000 +0100
@@ -1,48 +0,0 @@
-#!/bin/sh
-set -e
-
-# In the process of renaming former Custom Debian Distributions to
-# Debian Pure Blends we try to care for configuration files
-
-# if a CDD configuration exists try to take it over
-if [ -d /etc/cdd ] ; then
-    # make sure we did not yet the migration
-    if [ ! -d /etc/blends ] ; then
-        mkdir -p /etc/blends
-        cd /etc/cdd
-	tar -cf - --exclude menu --exclude sources.* . | \
-    	    (cd /etc/blends; tar --keep-old-files -xBpf - 2> /dev/null || true)
-        # cp -u -a /etc/cdd/* /etc/blends
-	for blend in `find /etc/blends -maxdepth 1 -mindepth 1 -type d` ; do
-	    cd "$blend"
-	    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' \
-	    	    $cfgfile > "$cfgfile"~
-		mv $cfgfile "$cfgfile".cdd
-		# It is very important that we have a real config file.  If not
-		# unpacking <blend>-config package results in a missing config
-		# file even if it is contained in the package (see #550140 and
-		# #553632)
-		cp -a "$cfgfile"~ "$cfgfile"
-	    done
-	done
-        if [ -e /etc/blends/cdd.conf ] ; then
-	    if [ /etc/blends/blends.conf ] ; then
-		mv /etc/blends/cdd.conf /etc/blends/cdd.conf~
-	    else
-		mv /etc/blends/cdd.conf /etc/blends/blends.conf
-        	sed -i~ -e 's/CDD/BLEND/g' \
-    		        -e 's/cdd/blends/g' \
-	    		-e 's/Custom Debian Distribution/Debian Pure Blend/g' \
-	    		/etc/blends/blends.conf
-	    fi
-	fi
-    fi
-fi
-
-#DEBHELPER#
diff -Nru blends-0.6.8ubuntu1/debian/blends-common.README.Debian blends-0.6.10ubuntu1/debian/blends-common.README.Debian
--- blends-0.6.8ubuntu1/debian/blends-common.README.Debian	2009-02-05 23:22:37.000000000 +0100
+++ blends-0.6.10ubuntu1/debian/blends-common.README.Debian	2010-01-11 19:30:43.000000000 +0100
@@ -1,5 +1,5 @@
 Debian Pure Blends common files
-----------------------------------------
+-------------------------------
 
 This package builds the basic infra structure of all metapackages.
 
@@ -17,7 +17,7 @@
 If you do not want to install the suggested blends-doc package you might read
 the online version at
 
-   http://cdd.alioth.debian.org/
+   http://blends.alioth.debian.org/blends/
 
 which is frequently updated.
 
diff -Nru blends-0.6.8ubuntu1/debian/blends-dev.preinst blends-0.6.10ubuntu1/debian/blends-dev.preinst
--- blends-0.6.8ubuntu1/debian/blends-dev.preinst	2009-08-09 21:50:01.000000000 +0200
+++ blends-0.6.10ubuntu1/debian/blends-dev.preinst	1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
-#!/bin/sh
-set -e
-
-# In the process of renaming former Custom Debian Distributions to
-# Debian Pure Blends we have to care for configuration files
-
-if [ -d /etc/cdd ] ; then
-    mkdir -p /etc/blends
-    if ls /etc/cdd/sources* 1>/dev/null 2>/dev/null ; then
-        cp -u -a /etc/cdd/sources* /etc/blends
-    fi
-fi
-
-#DEBHELPER#
diff -Nru blends-0.6.8ubuntu1/debian/cdd-dev.docs blends-0.6.10ubuntu1/debian/cdd-dev.docs
--- blends-0.6.8ubuntu1/debian/cdd-dev.docs	1970-01-01 01:00:00.000000000 +0100
+++ blends-0.6.10ubuntu1/debian/cdd-dev.docs	2010-01-27 13:12:39.000000000 +0100
@@ -0,0 +1,2 @@
+debian/cdd-dev.NEWS.Debian
+
diff -Nru blends-0.6.8ubuntu1/debian/cdd-dev.NEWS.Debian blends-0.6.10ubuntu1/debian/cdd-dev.NEWS.Debian
--- blends-0.6.8ubuntu1/debian/cdd-dev.NEWS.Debian	1970-01-01 01:00:00.000000000 +0100
+++ blends-0.6.10ubuntu1/debian/cdd-dev.NEWS.Debian	2010-01-27 13:08:31.000000000 +0100
@@ -0,0 +1,12 @@
+blends (0.6.9) unstable; urgency=low
+
+  * Do not try to take over config files of package cdd-dev
+    from /etc/cdd to /etc/blends it just leads to trouble and
+    is not worth the effort because they are unchanged in most
+    practical cases
+    --> Please check the files in /etc/cdd if existant and
+        take over the changes manually if needed to
+        /etc/blends
+
+ -- Andreas Tille <tille@debian.org>  Wed, 27 Jan 2010 13:05:07 +0100
+
diff -Nru blends-0.6.8ubuntu1/debian/changelog blends-0.6.10ubuntu1/debian/changelog
--- blends-0.6.8ubuntu1/debian/changelog	2009-12-22 06:32:50.000000000 +0100
+++ blends-0.6.10ubuntu1/debian/changelog	2010-02-13 20:11:51.000000000 +0100
@@ -1,3 +1,31 @@
+blends (0.6.10ubuntu1) lucid; urgency=low
+
+  * Merge with Debian.  Remaining changes:
+    - Add sources.list.karmic and sources.list.lucid so blends ban be built
+      for Ubuntu 9.10 and 10.04.
+    - Add ghostscript as build dependency. 
+
+ -- Leo Iannacone <l3on@ubuntu.com>  Sat, 13 Feb 2010 19:22:03 +0100
+
+blends (0.6.10) unstable; urgency=low
+
+  * rm debian/blends-dev.preinst = do not try to take over config
+    files from cdd-dev to blends-dev and warn in NEWS.Debian about this
+    Closes: #562854
+
+ -- Andreas Tille <tille@debian.org>  Wed, 27 Jan 2010 13:05:07 +0100
+
+blends (0.6.9) unstable; urgency=low
+
+  * Do not try to take over config files from /etc/cdd -
+    it just leads to trouble and is not worth the effort
+    because they are unchanged in most practical cases
+    -> Remove debian/blends-common.preinst
+  * Updated debian/blends-common.README.Debian
+  * debian/control: Added ${misc:Depends} to all package
+    dependencies
+
+ -- Andreas Tille <tille@debian.org>  Mon, 11 Jan 2010 19:23:04 +0100
 blends (0.6.8ubuntu1) lucid; urgency=low
 
   * Merge from Debian Testing.  Remaining changes:
diff -Nru blends-0.6.8ubuntu1/debian/control blends-0.6.10ubuntu1/debian/control
--- blends-0.6.8ubuntu1/debian/control	2009-12-22 06:33:25.000000000 +0100
+++ blends-0.6.10ubuntu1/debian/control	2010-02-13 19:58:56.000000000 +0100
@@ -9,7 +9,7 @@
  José L. Redrejo Rodríguez <jredrejo@debian.org>,
  Jonas Smedegaard <dr@jones.dk>
 Build-Depends: debhelper (>= 7)
-Build-Depends-Indep: debiandoc-sgml, texlive-latex-base, texlive-latex-extra, 
+Build-Depends-Indep: debiandoc-sgml, ghostscript, texlive-latex-base, texlive-latex-extra, 
  texlive-latex-recommended, texlive-fonts-recommended
 Standards-Version: 3.8.3
 Vcs-Browser: http://svn.debian.org/wsvn/blends/blends/trunk/blends/?rev=0&sc=0
@@ -19,7 +19,7 @@
 Architecture: all
 Section: devel
 Depends: debconf (>= 0.5) | debconf-2.0, make | build-essential, apt,
- debhelper (>= 7)
+ debhelper (>= 7), ${misc:Depends}
 Suggests: blends-doc
 Description: Debian Pure Blends common files for developing metapackages
  This package makes life easier when packaging metapackages.  Perhaps
@@ -30,7 +30,7 @@
 Package: cdd-dev
 Architecture: all
 Section: devel
-Depends: blends-dev
+Depends: blends-dev, ${misc:Depends}
 Description: Debian Pure Blends dummy package for upgrades from cdd-dev
  After renaming Custom Debian Distributions to Debian Pure Blends we
  have to make sure that upgrades work smoothly.  This package provides
@@ -39,7 +39,7 @@
 Package: blends-common
 Architecture: all
 Section: misc
-Depends: adduser, menu (>= 2.1.25), debconf (>= 0.5) | debconf-2.0
+Depends: adduser, menu (>= 2.1.25), debconf (>= 0.5) | debconf-2.0, ${misc:Depends}
 Suggests: blends-doc
 Description: Debian Pure Blends common package
  This package builds the basic infra structure for metapackages.
@@ -52,7 +52,7 @@
 Package: cdd-common
 Architecture: all
 Section: misc
-Depends: blends-common
+Depends: blends-common, ${misc:Depends}
 Description: Debian Pure Blends dummy package for upgrades from cdd-common
  After renaming Custom Debian Distributions to Debian Pure Blends we
  have to make sure that upgrades work smoothly.  This package provides
@@ -61,6 +61,7 @@
 Package: blends-doc
 Architecture: all
 Section: doc
+Depends: ${misc:Depends}
 Suggests: www-browser, postscript-viewer
 Provides: cdd-doc
 Replaces: cdd-doc
diff -Nru blends-0.6.8ubuntu1/debian/NEWS.Debian blends-0.6.10ubuntu1/debian/NEWS.Debian
--- blends-0.6.8ubuntu1/debian/NEWS.Debian	2009-08-21 13:52:23.000000000 +0200
+++ blends-0.6.10ubuntu1/debian/NEWS.Debian	1970-01-01 01:00:00.000000000 +0100
@@ -1,54 +0,0 @@
-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@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 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.
-    To provide a reasonable migration path dummy packages cdd-dev and
-    cdd-common are provided as well which contain symlinks to the tools
-    in the respective blends package to make sure all projects are able
-    to migrate their meta packages smoothly.
-  * The projects affected are:
-    - Debian Edu
-    - Debian Junior
-    - Debian Med
-    - Debian Science
-                
- -- Andreas Tille <tille@debian.org>  Sun, 19 Oct 2008 15:23:01 +0200
-
-cdd (0.3.1) unstable; urgency=low
-
-  * In cdd 0.3 user menus where implemented by placing a symlink cdd-menu
-    in the .menu directory of each user who belongs to any Custom
-    Debian Distrinution role.  Now a solution was found which does not
-    touch users .menu directory.
-
-    To avoid code for removal of these old cdd-menu links in the users
-    home directories in the future postinst scripts it seems to be the
-    best solution to ask the local administrator do remove these links
-    manually.  So please remove all symlinks named
-
-       <userhome>/.menu/cdd-menu
-
- -- Andreas Tille <tille@debian.org>  Thu, 17 May 2004 17:42:38 +0200
diff -Nru blends-0.6.8ubuntu1/debian/rules blends-0.6.10ubuntu1/debian/rules
--- blends-0.6.8ubuntu1/debian/rules	2009-08-08 21:21:19.000000000 +0200
+++ blends-0.6.10ubuntu1/debian/rules	2009-12-09 00:14:27.000000000 +0100
@@ -2,7 +2,7 @@
 # debian/rules for blends
 # This file is public domain software, originally written by Andreas Tille.
 
-# $Id: rules 1751 2009-08-08 19:21:19Z tille $
+# $Id: rules 2028 2009-12-08 23:14:27Z tille $
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
diff -Nru blends-0.6.8ubuntu1/templates/apt.conf blends-0.6.10ubuntu1/templates/apt.conf
--- blends-0.6.8ubuntu1/templates/apt.conf	2009-02-05 23:22:37.000000000 +0100
+++ blends-0.6.10ubuntu1/templates/apt.conf	2009-12-09 00:14:27.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * $Id: apt.conf 1144 2008-10-26 07:52:40Z tille $ 
+ * $Id: apt.conf 2028 2009-12-08 23:14:27Z tille $ 
  */
 /*
  * APT configuration file for #BLEND#-config package
diff -Nru blends-0.6.8ubuntu1/templates/config.postinst blends-0.6.10ubuntu1/templates/config.postinst
--- blends-0.6.8ubuntu1/templates/config.postinst	2009-12-04 17:25:35.000000000 +0100
+++ blends-0.6.10ubuntu1/templates/config.postinst	2010-01-18 22:46:03.000000000 +0100
@@ -7,24 +7,9 @@
 fi
 . /etc/blends/blends.conf
 
-if [ -d /etc/blends/#BLEND#/ ] ; then
-    if [ ! -f /etc/blends/#BLEND#/#BLEND#.conf ] ; then
-	# strangely enough the config file from the package is NOT installed to
-        # /etc/blends/#BLEND#/#BLEND#.conf if the directory exists but no file with
-        # this name inside this directory.  This has caused #550140 and #553632.
-        # The try to rename the config files in blends-common left only a file
-        # /etc/blends/#BLEND#/#BLEND#.conf~ behind.  So we try if we can continue
-        # with this file.
-	if [ -f /etc/blends/#BLEND#/#BLEND#.conf.dpkg-new ] ; then
-	    cp -a /etc/blends/#BLEND#/#BLEND#.conf.dpkg-new /etc/blends/#BLEND#/#BLEND#.conf
-        else
-	    # if this might fail as well see http://www.dpkg.org/dpkg/ConffileHandling
-	    # We simply invent a default config file to make sure the install process
-	    # will not fail
-	    echo "BLENDNAME=Debian #BLEND#" > /etc/blends/#BLEND#/#BLEND#.conf
-	    exit 0
-	fi
-    fi
+if [ ! -f /etc/blends/#BLEND#/#BLEND#.conf ] ; then
+   echo "#BLENDNAME# configuration file /etc/blends/#BLEND#/#BLEND#.conf is missing."
+   exit -1
 fi
 . /etc/blends/#BLEND#/#BLEND#.conf