[Cdd-commits] r247 - in cdd/trunk/cdd: . templates

[Andreas Tille]

Author: tille
Date: Sun Jul 11 14:28:40 2004
New Revision: 247

Modified:
   cdd/trunk/cdd/cdd-clean-helper
   cdd/trunk/cdd/cdd-install-helper
   cdd/trunk/cdd/templates/common.config
   cdd/trunk/cdd/templates/postinst
   cdd/trunk/cdd/templates/postrm
Log:
Several bugfixes.


Modified: cdd/trunk/cdd/cdd-clean-helper
==============================================================================
--- cdd/trunk/cdd/cdd-clean-helper	(original)
+++ cdd/trunk/cdd/cdd-clean-helper	Sun Jul 11 14:28:40 2004
@@ -7,13 +7,13 @@
 [ -d menu ] && rm -f debian/"$cdd"-*.post{inst,rm}
 
 # Move back special postinst files provided by the meta package maintainer
-for postinst in `ls debian/*.postinst.stub 2>/dev/null` ; do
-    mv "$postinst" debian/`basename "$postinst" .stub`
-done
+#for postinst in `ls debian/*.postinst.stub 2>/dev/null` ; do
+#    mv "$postinst" debian/`basename "$postinst" .stub`
+#done
 rm -f debian/"$cdd"-common.{templates,config,install} debian/90"$cdd"-common
 rm -rf debian/po
 
 # Move back special po files provided by the meta package maintainer
-[ -d debian/po.stub ] && mv debian/po.stub debian.po
+# [ -d debian/po.stub ] && mv debian/po.stub debian.po
 
 exit 0

Modified: cdd/trunk/cdd/cdd-install-helper
==============================================================================
--- cdd/trunk/cdd/cdd-install-helper	(original)
+++ cdd/trunk/cdd/cdd-install-helper	Sun Jul 11 14:28:40 2004
@@ -55,7 +55,7 @@
     # post{inst/rm} template are appended if some extra scripts are provided or just created
     # an extra postinst has to be saved (*.stub) and restored by the clean target in
     # debian/rules
-    [ -s debian/"$cdd"-"$pkg".postinst ] && cp -a debian/"$cdd"-"$pkg".postinst debian/"$cdd"-"$pkg".postinst.stub
+    [ -s debian/"$cdd"-"$pkg".postinst.stub ] && cp debian/"$cdd"-"$pkg".postinst.stub debian/"$cdd"-"$pkg".postinst
     sed -e "s/#CDD#/${cdd}/g" \
         -e "s/#PKG#/${cdd}-${pkg}/g" \
        /usr/share/cdd/templates/postinst >> debian/"$cdd"-"$pkg".postinst
@@ -90,8 +90,8 @@
   done
   # rename apt.conf.d file 
   [ -s debian/${cdd}-apt.conf ] && mv debian/${cdd}-apt.conf debian/90${cdd}-common
-  if [ -d debian/po ] ; then
-      cp -a debian/po debian/po.stub
+  if [ -d debian/po.stub ] ; then
+      cp -a debian/po.stub debian/po
   else
       mkdir -p debian/po
   fi

Modified: cdd/trunk/cdd/templates/common.config
==============================================================================
--- cdd/trunk/cdd/templates/common.config	(original)
+++ cdd/trunk/cdd/templates/common.config	Sun Jul 11 14:28:40 2004
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 
 # Initialize debconf if not yet done
-if [ ! -z "$DEBCONF_REDIR" ]; then
+if [ _"$DEBCONF_REDIR" = _"" ]; then
     . /usr/share/debconf/confmodule
     db_version 2.0
     db_capb backup

Modified: cdd/trunk/cdd/templates/postinst
==============================================================================
--- cdd/trunk/cdd/templates/postinst	(original)
+++ cdd/trunk/cdd/templates/postinst	Sun Jul 11 14:28:40 2004
@@ -5,13 +5,13 @@
 # postinst files for some meta packages this template will be appended.  Thus
 # it will be checked whether debconf was just initialized.
 #
-# You should not insert the #DEBHELPER# template in the special postscript
+# You should not insert the _DEBHELPER_ template in the special postscript
 # file because it is in the end of this template anyway.
 
 test -x /usr/sbin/cdd-update-menus && /usr/sbin/cdd-update-menus -d #CDD#
 
 # Initialize debconf if not yet done
-if [ ! -z "$DEBCONF_REDIR" ]; then
+if [ _"$DEBCONF_REDIR" = _"" ]; then
     . /usr/share/debconf/confmodule
     db_version 2.0
 fi

Modified: cdd/trunk/cdd/templates/postrm
==============================================================================
--- cdd/trunk/cdd/templates/postrm	(original)
+++ cdd/trunk/cdd/templates/postrm	Sun Jul 11 14:28:40 2004
@@ -5,7 +5,7 @@
 # postrm files for some meta packages this template will be appended.  Thus
 # it will be checked whether debconf was just initialized.
 #
-# You should not insert the #DEBHELPER# template in the special postscript
+# You should not insert the _DEBHELPER_ template in the special postscript
 # file because it is in the end of this template anyway.
 
 test -x /usr/sbin/cdd-update-menus && /usr/sbin/cdd-update-menus -d #CDD#