[Cdd-commits] cdd/common/cdd/templates apt.conf,1.1,1.2 common.install,1.1,1.2 common.templates,1.2,1.3 postinst,1.12,1.13

[Andreas Tille]

Update of /cvsroot/cdd/cdd/common/cdd/templates
In directory haydn:/tmp/cvs-serv5552/cdd/templates

Modified Files:
	apt.conf common.install common.templates postinst 
Log Message:
Preparation for next release.


Index: common.templates
===================================================================
RCS file: /cvsroot/cdd/cdd/common/cdd/templates/common.templates,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- common.templates	26 Jun 2004 07:07:54 -0000	1.2
+++ common.templates	26 Jun 2004 22:03:21 -0000	1.3
@@ -7,8 +7,8 @@
 
 Template: shared/#CDD#-common/usermenus
 Type: select
-Choices: now, end, never
-Default: end
+_Choices: now, end, never
+Default: never
 _Description: When do you like to build user menus?
  The meta packages of the #CDDNAME# Custom Debian Distribution do
  contain extra role based menus for users. These will be built if

Index: common.install
===================================================================
RCS file: /cvsroot/cdd/cdd/common/cdd/templates/common.install,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- common.install	12 Jun 2004 19:19:25 -0000	1.1
+++ common.install	26 Jun 2004 22:03:21 -0000	1.2
@@ -1,2 +1,2 @@
-debian/med-apt.conf  etc/apt/apt.conf.d/90#CDD#-common
+debian/90#CDD#-common  etc/apt/apt.conf.d
 

Index: postinst
===================================================================
RCS file: /cvsroot/cdd/cdd/common/cdd/templates/postinst,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- postinst	26 Jun 2004 07:07:54 -0000	1.12
+++ postinst	26 Jun 2004 22:03:21 -0000	1.13
@@ -17,7 +17,7 @@
 	db_get "shared/#CDD#-common/usermenus" || true
 	case "$RET" in
     	    now)
-        	/usr/sbin/cdd-update-usermenus
+        	/usr/sbin/cdd-update-usermenus #CDD#
                 ;;
             end)
                 touch /var/run/#CDD#-common.usermenu

Index: apt.conf
===================================================================
RCS file: /cvsroot/cdd/cdd/common/cdd/templates/apt.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- apt.conf	12 Jun 2004 19:19:25 -0000	1.1
+++ apt.conf	26 Jun 2004 22:03:21 -0000	1.2
@@ -6,5 +6,5 @@
  */
 
 DPkg {
-	Post-Invoke {"test -f /var/run/#CDD#-common.usermenu && /usr/sbin/cdd-update-usermenus ; rm -f /var/run/#CDD#-common.usermenu";};
+	Post-Invoke {"test -f /var/run/#CDD#-common.usermenu && /usr/sbin/cdd-update-usermenus #CDD# ; rm -f /var/run/#CDD#-common.usermenu";};
 }