[Cdd-commits] r275 - in cdd/branches/cdd/0.3.x: . debian templates

[Otavio Salvador]

Author: otavio
Date: Tue Jul 20 14:56:49 2004
New Revision: 275

Modified:
   cdd/branches/cdd/0.3.x/VERSION
   cdd/branches/cdd/0.3.x/debian/changelog
   cdd/branches/cdd/0.3.x/sources.list
   cdd/branches/cdd/0.3.x/sources.list.local
   cdd/branches/cdd/0.3.x/sources.list.stable
   cdd/branches/cdd/0.3.x/sources.list.testing
   cdd/branches/cdd/0.3.x/sources.list.unstable
   cdd/branches/cdd/0.3.x/templates/common.postinst
Log:
Merge changes did in 0.3.4.

Modified: cdd/branches/cdd/0.3.x/VERSION
==============================================================================
--- cdd/branches/cdd/0.3.x/VERSION	(original)
+++ cdd/branches/cdd/0.3.x/VERSION	Tue Jul 20 14:56:49 2004
@@ -1 +1 @@
-0.3.2
+0.3.4

Modified: cdd/branches/cdd/0.3.x/debian/changelog
==============================================================================
--- cdd/branches/cdd/0.3.x/debian/changelog	(original)
+++ cdd/branches/cdd/0.3.x/debian/changelog	Tue Jul 20 14:56:49 2004
@@ -1,3 +1,13 @@
+cdd (0.3.4) unstable; urgency=high
+
+  * Fixed common.postinst template which finally fixed bug #259412.
+  * Removed contrib non-free and non-US from the templates - we want
+    to build packages for main by default, others should be added
+    manually by local maintainers.
+  * Urgency set to high because it *really* fixes a grave bug.
+
+ -- Andreas Tille <tille@debian.org>  Thu, 15 Jul 2004 10:51:44 +0200
+
 cdd (0.3.3) unstable; urgency=high
 
   * Remove broken code from templates/postinst to clean up

Modified: cdd/branches/cdd/0.3.x/sources.list
==============================================================================
--- cdd/branches/cdd/0.3.x/sources.list	(original)
+++ cdd/branches/cdd/0.3.x/sources.list	Tue Jul 20 14:56:49 2004
@@ -1,2 +1 @@
-deb http://ftp.debian.org/ testing main non-free contrib
-deb http://non-us.debian.org/ testing/non-US main non-free
+deb http://ftp.debian.org/ testing main

Modified: cdd/branches/cdd/0.3.x/sources.list.local
==============================================================================
--- cdd/branches/cdd/0.3.x/sources.list.local	(original)
+++ cdd/branches/cdd/0.3.x/sources.list.local	Tue Jul 20 14:56:49 2004
@@ -1,2 +1 @@
-deb file:/home/ftp/pub/debian/ testing main contrib non-free
-deb file:/home/ftp/pub/debian/non-US testing/non-US main non-free
+deb file:/home/ftp/pub/debian/ testing main

Modified: cdd/branches/cdd/0.3.x/sources.list.stable
==============================================================================
--- cdd/branches/cdd/0.3.x/sources.list.stable	(original)
+++ cdd/branches/cdd/0.3.x/sources.list.stable	Tue Jul 20 14:56:49 2004
@@ -1,2 +1 @@
-deb http://ftp.debian.org/ stable main non-free contrib
-deb http://non-us.debian.org/ stable/non-US main non-free
+deb http://ftp.debian.org/ stable main

Modified: cdd/branches/cdd/0.3.x/sources.list.testing
==============================================================================
--- cdd/branches/cdd/0.3.x/sources.list.testing	(original)
+++ cdd/branches/cdd/0.3.x/sources.list.testing	Tue Jul 20 14:56:49 2004
@@ -1,2 +1 @@
-deb http://ftp.debian.org/ testing main non-free contrib
-deb http://non-us.debian.org/ testing/non-US main non-free
+deb http://ftp.debian.org/ testing main

Modified: cdd/branches/cdd/0.3.x/sources.list.unstable
==============================================================================
--- cdd/branches/cdd/0.3.x/sources.list.unstable	(original)
+++ cdd/branches/cdd/0.3.x/sources.list.unstable	Tue Jul 20 14:56:49 2004
@@ -1,2 +1 @@
-deb http://ftp.debian.org/ unstable main non-free contrib
-deb http://non-us.debian.org/ unstable/non-US main non-free
+deb http://ftp.debian.org/ unstable main

Modified: cdd/branches/cdd/0.3.x/templates/common.postinst
==============================================================================
--- cdd/branches/cdd/0.3.x/templates/common.postinst	(original)
+++ cdd/branches/cdd/0.3.x/templates/common.postinst	Tue Jul 20 14:56:49 2004
@@ -27,7 +27,7 @@
    fi
 done
 # Del those users which were obviousely removed from list of CDD users
-for user in `getAllUsers 0` ; do
+for user in `getAllUsers 1` ; do
    if [ `echo "$RET" | grep -c -w "$user"` -eq 0 ] && [ `getent group #CDD# | grep -c -w $user` -gt 0 ] ; then
       /usr/sbin/cdd-user del #CDD# $user
    fi