[Cdd-commits] r461 - in cdd/trunk: cdd cdd/debian cdd/devtools cdd/doc cdd/doc/debian cdd/doc/en cdd/share/menu doc
CDD Subversion Commit
noreply at alioth.debian.org
Sat Sep 1 06:51:48 UTC 2007
Author: tille
Date: Sat Sep 1 06:51:48 2007
New Revision: 461
Added:
cdd/trunk/cdd/doc/
- copied from r442, cdd/trunk/doc/
Removed:
cdd/trunk/cdd/doc/debian/
cdd/trunk/doc/
Modified:
cdd/trunk/cdd/VERSION
cdd/trunk/cdd/debian/changelog
cdd/trunk/cdd/debian/control
cdd/trunk/cdd/debian/copyright
cdd/trunk/cdd/debian/rules
cdd/trunk/cdd/devtools/cdd-gen-control
cdd/trunk/cdd/doc/en/00_titletoc.sgml
cdd/trunk/cdd/doc/en/06_technology.sgml
cdd/trunk/cdd/doc/en/07_starting.sgml
cdd/trunk/cdd/doc/en/C_bts.sgml
cdd/trunk/cdd/share/menu/cdd-menu
Log:
Moved cdd-doc to cdd code to release both with same version 0.4.1. Doc should reflect code and thus release it in one source.
Modified: cdd/trunk/cdd/VERSION
==============================================================================
--- cdd/trunk/cdd/VERSION (original)
+++ cdd/trunk/cdd/VERSION Sat Sep 1 06:51:48 2007
@@ -1 +1 @@
-0.4
+0.4.1
Modified: cdd/trunk/cdd/debian/changelog
==============================================================================
--- cdd/trunk/cdd/debian/changelog (original)
+++ cdd/trunk/cdd/debian/changelog Sat Sep 1 06:51:48 2007
@@ -1,3 +1,10 @@
+cdd (0.4.1) unstable; urgency=low
+
+ * Moved documentation package cdd-doc into same source package
+ * Reworked debian/copyright
+
+ -- Andreas Tille <tille at debian.org> Fri, 31 Aug 2007 19:01:52 +0200
+
cdd (0.4) unstable; urgency=low
* New upstream version that cdd-gen-control in favour of a newly
Modified: cdd/trunk/cdd/debian/control
==============================================================================
--- cdd/trunk/cdd/debian/control (original)
+++ cdd/trunk/cdd/debian/control Sat Sep 1 06:51:48 2007
@@ -3,7 +3,7 @@
Section: devel
Maintainer: Andreas Tille <tille at debian.org>
Uploaders: Petter Reinholdtsen <pere at debian.org>, Andreas Tille <tille at debian.org>, Cosimo Alfarano <kalfa at debian.org>
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 5), debiandoc-sgml, texlive-base
Standards-Version: 3.7.2
Package: cdd-dev
@@ -30,3 +30,18 @@
system users in a group named according to the name of the
Custom Debian Distribution.
+Package: cdd-doc
+Architecture: all
+Suggests: www-browser, postscript-viewer
+Description: Custom Debian Distribution documentation
+ This paper is intended to people who are interested in the philosophy
+ of Custom Debian Distributions and the technique which is used to
+ manage those projects.
+ .
+ It is explained in detail why these are no forks from Debian but reside
+ completely inside the Debian GNU/Linux distribution and which
+ advantages can be gathered by this approach. The concept of
+ meta-packages and user role based menus is explained. In short: This
+ document describes why Custom Debian Distributions are important to
+ the vitality and quality of Debian.
+
Modified: cdd/trunk/cdd/debian/copyright
==============================================================================
--- cdd/trunk/cdd/debian/copyright (original)
+++ cdd/trunk/cdd/debian/copyright Sat Sep 1 06:51:48 2007
@@ -1,5 +1,24 @@
-This package is Copyright 2004 by Andreas Tille <tille at debian.org>
+This package was debianized by Andreas Tille Andreas Tille <tille at debian.org>
+Tue, 23 Mar 2004 18:41:20 +0100
-This software is licensed under the GPL.
+It is Debian native software and can be found at Alioth SVN or under
+ http://svn.debian.org/wsvn/cdd
+
+Upstream authors:
+
+ Andreas Tille <tille at debian.org>
+ Petter Reinholdtsen <pere at debian.org>
+ Cosimo Alfarano <kalfa at debian.org>
+
+The copyright for the code is
+
+ Copyright (C) 2002-2007 by Andreas Tille, Petter Reinholdtsen, Cosimo Alfarano
+
+The copyright for the Custom Debian Distributions documentation:
+
+ Copyright (C) 2002-2004 by Ben Armstrong.
+ Copyright (C) 2004-2007 by Andreas Tille.
+
+The software and the documentation is licensed under the GPL.
On Debian systems, the GPL can be found at /usr/share/common-licenses/GPL.
Modified: cdd/trunk/cdd/debian/rules
==============================================================================
--- cdd/trunk/cdd/debian/rules (original)
+++ cdd/trunk/cdd/debian/rules Sat Sep 1 06:51:48 2007
@@ -11,6 +11,8 @@
build-stamp:
dh_testdir
+ cd doc; $(MAKE) html; $(MAKE) txt; $(MAKE) pdf
+
touch build-stamp
clean:
@@ -18,6 +20,8 @@
dh_testroot
rm -f build-stamp
+ cd doc; $(MAKE) clean
+
dh_clean
install: build
@@ -38,7 +42,7 @@
cp -a debian/cdd-common.lintian.overrides debian/cdd-common/usr/share/lintian/overrides/cdd-common
cp -a debian/cdd-dev.lintian.overrides debian/cdd-dev/usr/share/lintian/overrides/cdd-dev
dh_link
- dh_compress
+ dh_compress -X.pdf
dh_fixperms
dh_installdeb
dh_gencontrol
@@ -55,11 +59,8 @@
mkdir $${distdir} ; \
chmod 777 $${distdir} ; \
rsync -a --exclude $${distdir} --exclude CVS --exclude .svn --exclude svn-commit.tmp * $${distdir} ; \
- sed "s/#VERSION#/`cat VERSION`/" $${distdir}/cdd-gen-control > cdd-gen-control.tmp ; \
- mv cdd-gen-control.tmp $${distdir}/cdd-gen-control ; \
- chmod 755 $${distdir}/cdd-gen-control ; \
- ln -s sources.list.testing $${distdir}/sources.list ; \
- ln -s control.stub $${distdir}/examples/debian/control ; \
+ ln -s 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} ; \
rm -rf $${distdir}
Modified: cdd/trunk/cdd/devtools/cdd-gen-control
==============================================================================
--- cdd/trunk/cdd/devtools/cdd-gen-control (original)
+++ cdd/trunk/cdd/devtools/cdd-gen-control Sat Sep 1 06:51:48 2007
@@ -34,8 +34,6 @@
$commondepends{"adduser"} = "0" ;
$commondepends{"debconf"} = "1.2" ;
$commondepends{"menu"} = "2.1.14" ;
-# the VERSION variable is replaced in the dist target of debian/rules
-$commondepends{"cdd-common"} = "0.3.10" ;
my $CommonPackage = "" ;
my $prefix = "test-" ;
Modified: cdd/trunk/cdd/doc/en/00_titletoc.sgml
==============================================================================
--- cdd/trunk/doc/en/00_titletoc.sgml (original)
+++ cdd/trunk/cdd/doc/en/00_titletoc.sgml Sat Sep 1 06:51:48 2007
@@ -24,7 +24,7 @@
<copyright>
<copyrightsummary>
- Copyright © 2004, 2005 Andreas Tille
+ Copyright © 2004 - 2007 Andreas Tille
</copyrightsummary>
<p>
@@ -51,7 +51,7 @@
<p>
You can find the source of this article
- <url id="http://svn.debian.org/wsvn/cdd/cdd/trunk/doc/"
+ <url id="http://svn.debian.org/wsvn/cdd/cdd/trunk/cdd/doc/"
name="in the Subversion repository at svn.debian.org">.
It is also available as Debian package <package>cdd-doc</package>.
</p>
Modified: cdd/trunk/cdd/doc/en/06_technology.sgml
==============================================================================
--- cdd/trunk/doc/en/06_technology.sgml (original)
+++ cdd/trunk/cdd/doc/en/06_technology.sgml Sat Sep 1 06:51:48 2007
@@ -11,9 +11,33 @@
A meta package, as used by CDDs, is a Debian package that contains:
<list>
<item>Dependencies on other Debian packages (essential)
- <list>
- <item>Use "Depends" for packages addressing an area of interest</item>
- <item>Use "Recommends" for further interesting packages</item>
+ <taglist>
+ <tag>Depends</tag>
+ <item><p>Use "Depends" for packages that are definitely needed
+ for all basic stuff of the CDD in question.</p>
+ <p>Remark: For
+ <package>cdd-dev</package> versions < 0.4 the list of
+ packages that should be installed for a certain task was
+ declared as "Depends". This is now changed te enable
+ installing the meta-package even if a package belongig
+ to this task is missing for whatever reason. It also
+ allows finally to remove the meta package. The change
+ makes even more sense since <prgn>apt-get</prgn>
+ considers "Recommends" as default installation targets.
+ </p>
+ <p>
+ The above behaviour is enforced by
+ <package>cdd-dev</package> which changes "Depends" that
+ are given in the tasks files into "Recommends".
+ </p>
+ </item>
+ <tag>Recommends</tag>
+ <item>The packages that are listed as "Recommends" in the
+ tasks file should be installed on the machine where the
+ meta package is installed and which are needed to work
+ on a specific task.
+ </item>
+ <tag>Suggests</tag>
<!-- [BA] Why would we suggest non-free? Doesn't policy allow a non-free
package to specify "Enhances" to avoid this problem?
[AT] I have to admit that "Enhances" is new to me. When
@@ -23,8 +47,14 @@
this is a good solution - but I would follow the suggestions
of others in this issue.
-->
- <item>Use "Suggests" for others of lesser importance, or non-free packages</item>
- </list>
+ <item>Use "Suggests" for others of lesser importance that
+ might be possibly useful, or non-free packages. When a
+ package is not available for the target distribution at
+ meta package build time the "Recommends" is turned into
+ a "Suggests" to enable a flawless installation of the
+ meta package.
+ </item>
+ </taglist>
</item>
<item>Menu entries (recommended)
<list>
Modified: cdd/trunk/cdd/doc/en/07_starting.sgml
==============================================================================
--- cdd/trunk/doc/en/07_starting.sgml (original)
+++ cdd/trunk/cdd/doc/en/07_starting.sgml Sat Sep 1 06:51:48 2007
@@ -130,7 +130,7 @@
</p>
<p>
Creating a new mailing list starts with a wishlist bug against
- <url id="lists.debian.org">. The format of this bug has to follow
+ <package><var>lists.debian.org</var></package>. The format of this bug has to follow
<url id="http://www.debian.org/MailingLists/HOWTO_start_list"
name="certain rules">.
</p>
Modified: cdd/trunk/cdd/doc/en/C_bts.sgml
==============================================================================
--- cdd/trunk/doc/en/C_bts.sgml (original)
+++ cdd/trunk/cdd/doc/en/C_bts.sgml Sat Sep 1 06:51:48 2007
@@ -25,8 +25,8 @@
name="a mail of Anthony Towns"> and
<url
id="http://wiki.debian.org/DebianScienceSponsoring#head-dd4c76d756afae474c2c9892c9221fd3277b3e80"
-name="the Debian wiki">. In short works like this:
- id="http://lists.debian.org/debian-custom/2005/04/msg00017.html"
+name="the Debian wiki">. It was also described in
+<url id="http://lists.debian.org/debian-custom/2005/04/msg00017.html"
name="a mail of Ben Armstrong"> and in short works like this:
<list>
Modified: cdd/trunk/cdd/share/menu/cdd-menu
==============================================================================
--- cdd/trunk/cdd/share/menu/cdd-menu (original)
+++ cdd/trunk/cdd/share/menu/cdd-menu Sat Sep 1 06:51:48 2007
@@ -94,7 +94,7 @@
grep -v ^[A-CE-QT-Z] | \
grep -v ^S[eot] | \
sed -e "s/([^)]*)//" \
- -e "s/,* *${CDD}-common//" \
+ -e "s/,* *${CDD}-config//" \
-e "s/^[^:]*: *//" \
-e "s/, */\\n/g" | \
sort | uniq`
More information about the Cdd-commits
mailing list