[Demudi-commits] r196 - in demudi-cfengine/trunk: chunks debian scripts

[Free Ekanayaka]

Author: free-guest
Date: 2004-11-15 03:12:22 -0700 (Mon, 15 Nov 2004)
New Revision: 196

Added:
   demudi-cfengine/trunk/scripts/aterm
Modified:
   demudi-cfengine/trunk/chunks/apt-etc_apt_sources.list
   demudi-cfengine/trunk/debian/changelog
   demudi-cfengine/trunk/debian/control
   demudi-cfengine/trunk/debian/rules
Log:
demudi-cfengine (0.5) unstable; urgency=low

  * Conflicts with older versions of demudi-base
  * Using sarge snapshot 2004/11/13
  * Added the upgrade class
  * Setting Aterm as default X terminal emulator

 -- Free Ekanayaka <free@agnula.org>  Tue,  9 Nov 2004 12:14:40 +0100

  * Automatic generation of the import section in cfagent.conf.in

Modified: demudi-cfengine/trunk/chunks/apt-etc_apt_sources.list
===================================================================
--- demudi-cfengine/trunk/chunks/apt-etc_apt_sources.list	2004-11-15 09:58:45 UTC (rev 195)
+++ demudi-cfengine/trunk/chunks/apt-etc_apt_sources.list	2004-11-15 10:12:22 UTC (rev 196)
@@ -1,4 +1,7 @@
 
-# A/DeMuDi APT repository
+# Debian Sarge snapshot                                                            
+deb http://snapshot.debian.net/archive/2004/11/13/debian/ testing main
+ 
+# A/DeMuDi packages
 deb http://apt.agnula.org/demudi testing local
-#deb-src http://apt.agnula.org/demudi testing local
\ No newline at end of file
+#deb-src http://apt.agnula.org/demudi testing local

Modified: demudi-cfengine/trunk/debian/changelog
===================================================================
--- demudi-cfengine/trunk/debian/changelog	2004-11-15 09:58:45 UTC (rev 195)
+++ demudi-cfengine/trunk/debian/changelog	2004-11-15 10:12:22 UTC (rev 196)
@@ -1,6 +1,15 @@
+demudi-cfengine (0.5) unstable; urgency=low
+
+  * Conflicts with older versions of demudi-base
+  * Using sarge snapshot 2004/11/13
+  * Added the upgrade class
+  * Setting Aterm as default X terminal emulator
+
+ -- Free Ekanayaka <free@agnula.org>  Tue,  9 Nov 2004 12:14:40 +0100
+
 demudi-cfengine (0.4) unstable; urgency=low
 
-  * Automatic generation the import section in cfagent.conf.in
+  * Automatic generation of the import section in cfagent.conf.in
 
  -- Free Ekanayaka <free@agnula.org>  Tue,  9 Nov 2004 11:37:49 +0100
 

Modified: demudi-cfengine/trunk/debian/control
===================================================================
--- demudi-cfengine/trunk/debian/control	2004-11-15 09:58:45 UTC (rev 195)
+++ demudi-cfengine/trunk/debian/control	2004-11-15 10:12:22 UTC (rev 196)
@@ -9,7 +9,7 @@
 Architecture: all
 Depends: debconf (>= 0.5), cfengine2
 Recommends: apt, bash, procps, vim
-Conflicts: demudi-base
+Conflicts: demudi-base (<< 0.44)
 Description: DeMuDi cfengine scripts
  This package contains cfengine scripts  that are used to
  customise a plain Debian installation.

Modified: demudi-cfengine/trunk/debian/rules
===================================================================
--- demudi-cfengine/trunk/debian/rules	2004-11-15 09:58:45 UTC (rev 195)
+++ demudi-cfengine/trunk/debian/rules	2004-11-15 10:12:22 UTC (rev 196)
@@ -6,7 +6,7 @@
 
 build:
 	for i in $(scripts); do echo -e "\t$$i::\n\t\t$$i"; done > cfagent.conf.import
-	echo -e "\tall::" >> cfagent.conf.import
+	echo -e "\tall|upgrade::" >> cfagent.conf.import
 	for i in $(scripts); do echo -e "\t\t$$i"; done >> cfagent.conf.import
 	sed -e '/^#IMPORT#/r cfagent.conf.import' cfagent.conf.in | sed -e  '/^#IMPORT#/d' > cfagent.conf
 

Added: demudi-cfengine/trunk/scripts/aterm
===================================================================
--- demudi-cfengine/trunk/scripts/aterm	2004-11-15 09:58:45 UTC (rev 195)
+++ demudi-cfengine/trunk/scripts/aterm	2004-11-15 10:12:22 UTC (rev 196)
@@ -0,0 +1,3 @@
+shellcommands:
+
+	"/usr/sbin/update-alternatives --set editor /usr/bin/aterm-xterm"