Author: tille Date: Mon Jan 18 22:16:03 2010 New Revision: 2052 URL: http://svn.debian.org/viewsvn/blends?rev=2052&view=rev
Log: Give up to try taking over old cdd config files because there is no much use in doing so compared to the continuos problems which several trials caused. Removed: blends/trunk/blends/debian/blends-common.preinst Modified: blends/trunk/blends/debian/NEWS.Debian blends/trunk/blends/debian/blends-common.README.Debian blends/trunk/blends/debian/changelog blends/trunk/blends/debian/control blends/trunk/blends/templates/config.postinst Modified: blends/trunk/blends/debian/NEWS.Debian URL: http://svn.debian.org/viewsvn/blends/blends/trunk/blends/debian/NEWS.Debian?rev=2052&view=diff&r1=2052&r2=2051&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 Mon Jan 18 22:16:03 2010 @@ -1,3 +1,14 @@ +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 <[email protected]> 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 Modified: blends/trunk/blends/debian/blends-common.README.Debian URL: http://svn.debian.org/viewsvn/blends/blends/trunk/blends/debian/blends-common.README.Debian?rev=2052&view=diff&r1=2052&r2=2051&p1=blends/trunk/blends/debian/blends-common.README.Debian&p2=blends/trunk/blends/debian/blends-common.README.Debian ============================================================================== --- blends/trunk/blends/debian/blends-common.README.Debian (original) +++ blends/trunk/blends/debian/blends-common.README.Debian Mon Jan 18 22:16:03 2010 @@ -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. Modified: blends/trunk/blends/debian/changelog URL: http://svn.debian.org/viewsvn/blends/blends/trunk/blends/debian/changelog?rev=2052&view=diff&r1=2052&r2=2051&p1=blends/trunk/blends/debian/changelog&p2=blends/trunk/blends/debian/changelog ============================================================================== --- blends/trunk/blends/debian/changelog (original) +++ blends/trunk/blends/debian/changelog Mon Jan 18 22:16:03 2010 @@ -1,3 +1,15 @@ +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 <[email protected]> Mon, 11 Jan 2010 19:23:04 +0100 + blends (0.6.8) unstable; urgency=low * templates/config.postinst: Really fix the problem of missing Modified: blends/trunk/blends/debian/control URL: http://svn.debian.org/viewsvn/blends/blends/trunk/blends/debian/control?rev=2052&view=diff&r1=2052&r2=2051&p1=blends/trunk/blends/debian/control&p2=blends/trunk/blends/debian/control ============================================================================== --- blends/trunk/blends/debian/control (original) +++ blends/trunk/blends/debian/control Mon Jan 18 22:16:03 2010 @@ -18,7 +18,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 @@ -29,7 +29,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 @@ -38,7 +38,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. @@ -51,7 +51,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 @@ -60,6 +60,7 @@ Package: blends-doc Architecture: all Section: doc +Depends: ${misc:Depends} Suggests: www-browser, postscript-viewer Provides: cdd-doc Replaces: cdd-doc Modified: blends/trunk/blends/templates/config.postinst URL: http://svn.debian.org/viewsvn/blends/blends/trunk/blends/templates/config.postinst?rev=2052&view=diff&r1=2052&r2=2051&p1=blends/trunk/blends/templates/config.postinst&p2=blends/trunk/blends/templates/config.postinst ============================================================================== --- blends/trunk/blends/templates/config.postinst (original) +++ blends/trunk/blends/templates/config.postinst Mon Jan 18 22:16:03 2010 @@ -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 _______________________________________________ Blends-commit mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/blends-commit
