[Cdd-commits] r568 - in cdd/trunk: cdd cdd/debian cdd/doc/en cdd/doc/flyer flyer

[CDD Subversion Commit]

Author: tille
Date: Thu Feb 28 16:46:24 2008
New Revision: 568

Added:
   cdd/trunk/flyer/
      - copied from r566, cdd/trunk/cdd/doc/flyer/
Removed:
   cdd/trunk/cdd/VERSION
   cdd/trunk/cdd/doc/flyer/
Modified:
   cdd/trunk/cdd/debian/changelog
   cdd/trunk/cdd/debian/control
   cdd/trunk/cdd/debian/rules
   cdd/trunk/cdd/doc/en/00_titletoc.sgml
   cdd/trunk/cdd/doc/en/08_websentinel.sgml
Log:
Prepared next cdd upload; moved flyer source out of cdd source tree


Modified: cdd/trunk/cdd/debian/changelog
==============================================================================
--- cdd/trunk/cdd/debian/changelog	(original)
+++ cdd/trunk/cdd/debian/changelog	Thu Feb 28 16:46:24 2008
@@ -1,3 +1,13 @@
+cdd (0.4.9) unstable; urgency=low
+
+  * Add Depends: apt-get to cdd-dev package
+    Closes: #467650
+  * Removed VERSION file (which is hard to maintain) and
+    teach debian/rules to obtain verison from debian/changelog
+    to build dist target
+
+ -- Andreas Tille <tille at debian.org>  Thu, 28 Feb 2008 14:19:57 +0100
+
 cdd (0.4.8) unstable; urgency=low
 
   * Small fix to allow more than one binary package in control.stub

Modified: cdd/trunk/cdd/debian/control
==============================================================================
--- cdd/trunk/cdd/debian/control	(original)
+++ cdd/trunk/cdd/debian/control	Thu Feb 28 16:46:24 2008
@@ -16,7 +16,7 @@
 Package: cdd-dev
 Architecture: all
 Section: devel
-Depends: debconf (>= 0.5) | debconf-2.0, make | build-essential
+Depends: debconf (>= 0.5) | debconf-2.0, make | build-essential, apt-get
 Suggests: cdd-doc
 Description: Custom Debian Distributions common files for developing meta packages
  This package makes life easier when packaging meta packages.  Perhaps

Modified: cdd/trunk/cdd/debian/rules
==============================================================================
--- cdd/trunk/cdd/debian/rules	(original)
+++ cdd/trunk/cdd/debian/rules	Thu Feb 28 16:46:24 2008
@@ -54,15 +54,24 @@
 # We have nothing to do by default.
 
 dist:
-	distdir=cdd-`cat VERSION` ; \
+	if [ ! -f debian/changelog ] ; then \
+	    echo "File debian/changelog is missing. Something is wrong!" ; \
+	    exit -1 ; \
+	fi
+	VERSION=`grep "^cdd (.\+)" debian/changelog | head -n 1 | sed 's/^cdd *(\([^)]\+\)).*/\1/'` ; \
+	if [ "$${VERSION}" = "" ] ; then \
+	    echo "Unable to obtain version number from debian/changelog. Something is wrong!" ; \
+	    exit -1 ; \
+	fi ; \
+	distdir=cdd-$${VERSION} ; \
 	rm -rf $${distdir} ; \
 	mkdir $${distdir} ; \
 	chmod 777 $${distdir} ; \
 	rsync -a --exclude $${distdir} --exclude CVS --exclude .svn --exclude svn-commit.tmp * $${distdir} ; \
-	ln -s sources.list.unstable $${distdir}/sources.list ; \
+	ln -sf sources.list.unstable $${distdir}/sources.list ; \
 	# ln -s control.stub $${distdir}/examples/debian/control ; \
 	rm -f `find . -name "*~"` ; \
-	GZIP=-9 tar -czf ../cdd_`cat VERSION`.tar.gz $${distdir} ; \
+	GZIP=-9 tar -czf ../cdd_$${VERSION}.tar.gz $${distdir} ; \
 	rm -rf $${distdir}
 
 binary: binary-indep binary-arch

Modified: cdd/trunk/cdd/doc/en/00_titletoc.sgml
==============================================================================
--- cdd/trunk/cdd/doc/en/00_titletoc.sgml	(original)
+++ cdd/trunk/cdd/doc/en/00_titletoc.sgml	Thu Feb 28 16:46:24 2008
@@ -24,7 +24,7 @@
 
   <copyright>
     <copyrightsummary>
-      Copyright &copy; 2004 - 2007 Andreas Tille
+      Copyright &copy; 2004 - 2008 Andreas Tille
     </copyrightsummary>
 
     <p>

Modified: cdd/trunk/cdd/doc/en/08_websentinel.sgml
==============================================================================
--- cdd/trunk/cdd/doc/en/08_websentinel.sgml	(original)
+++ cdd/trunk/cdd/doc/en/08_websentinel.sgml	Thu Feb 28 16:46:24 2008
@@ -5,6 +5,12 @@
   <heading>Existing and prospective packages</heading>
 
 <p>
+The result of the stuff described in this paragraph could for example
+be viewed at the <url id="http://debian-med.alioth.debian.org/tasks/"
+       name="tasks page of the Debian-Med project">.  If you want stuff
+like that just follow the instructions below.
+</p>
+<p>
 If a Custom Debian Distribution should be presented one of the first
 questions is, what packages are available.  The next question might be
 which packages are on the todo list for inclusion in Debian to make