[Cdd-commits] r1038 - in cdd/trunk/dis: debian doc/en
CDD Subversion Commit
noreply at alioth.debian.org
Mon Aug 18 02:29:57 UTC 2008
Author: tille
Date: Mon Aug 18 02:29:56 2008
New Revision: 1038
Modified:
cdd/trunk/dis/debian/changelog
cdd/trunk/dis/debian/control
cdd/trunk/dis/debian/copyright
cdd/trunk/dis/doc/en/00_titletoc.sgml
cdd/trunk/dis/doc/en/01_introduction.sgml
Log:
Fixed debian/copyright, work on documentation
Modified: cdd/trunk/dis/debian/changelog
==============================================================================
--- cdd/trunk/dis/debian/changelog (original)
+++ cdd/trunk/dis/debian/changelog Mon Aug 18 02:29:56 2008
@@ -4,6 +4,7 @@
was dropped at DebConf 8 and replaced by Debian Integrated
Solutions. This reflects in a rename of the package and all
the tools.
+ * debian/copyright: new format
-- Andreas Tille <tille at debian.org> Sun, 17 Aug 2008 18:46:32 -0300
Modified: cdd/trunk/dis/debian/control
==============================================================================
--- cdd/trunk/dis/debian/control (original)
+++ cdd/trunk/dis/debian/control Mon Aug 18 02:29:56 2008
@@ -11,8 +11,8 @@
Build-Depends-Indep: debiandoc-sgml, texlive-latex-base, texlive-latex-extra,
texlive-latex-recommended, texlive-fonts-recommended
Standards-Version: 3.8.0
-Vcs-Browser: http://svn.debian.org/wsvn/dis/dis/trunk/dis/?rev=0&sc=0
-Vcs-Svn: svn://svn.debian.org/dis/dis/trunk/dis/
+Vcs-Browser: http://svn.debian.org/wsvn/cdd/cdd/trunk/dis/?rev=0&sc=0
+Vcs-Svn: svn://svn.debian.org/cdd/cdd/trunk/dis/
Package: dis-dev
Architecture: all
Modified: cdd/trunk/dis/debian/copyright
==============================================================================
--- cdd/trunk/dis/debian/copyright (original)
+++ cdd/trunk/dis/debian/copyright Mon Aug 18 02:29:56 2008
@@ -1,24 +1,37 @@
-This package was debianized by Andreas Tille Andreas Tille <tille at debian.org>
-Tue, 23 Mar 2004 18:41:20 +0100
-
-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 Debian Integrated Solutions 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.
+X-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+X-Debianized-By: Andreas Tille <tille at debian.org>
+X-Debinized-Date: Tue, 23 Mar 2004 18:41:20 +0100
+X-Source-Downloaded-From: http://bio.math.berkeley.edu/amap/download
+X-Upstream-Author: 2003-2008 Andreas Tille <tille at debian.org>
+
+Files: *
+Copyright: © 2003-2008 Andreas Tille <tille at debian.org>
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+,(at your option) any later version.
+X-Comment: On Debian systems, the complete text of the GNU GPL version 2
+ can be found in: `/usr/share/common-licenses/GPL-2'
+
+Files: devtools/dis-gen-control
+Copyright: © 2003-2007 Petter Reinholdtsen <pere at debian.org>
+ © 2007-2008 Andreas Tille <tille at debian.org>
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+,(at your option) any later version.
+X-Comment: On Debian systems, the complete text of the GNU GPL version 2
+ can be found in: `/usr/share/common-licenses/GPL-2'
+
+Files: share/dis/*
+Copyright: © 2003 Cosimo Alfarano <kalfa at debian.org>
+ © 2003-2008 Andreas Tille <tille at debian.org>
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+,(at your option) any later version.
+X-Comment: On Debian systems, the complete text of the GNU GPL version 2
+ can be found in: `/usr/share/common-licenses/GPL-2'
Modified: cdd/trunk/dis/doc/en/00_titletoc.sgml
==============================================================================
--- cdd/trunk/dis/doc/en/00_titletoc.sgml (original)
+++ cdd/trunk/dis/doc/en/00_titletoc.sgml Mon Aug 18 02:29:56 2008
@@ -1,6 +1,6 @@
<titlepag>
- <title>Custom Debian Distributions</title>
+ <title>Debian Integrated Solutions</title>
<!-- subtitle> Preparing Debian for special user groups </subtitle -->
<author>
@@ -12,13 +12,16 @@
<abstract>
This paper is intended for people who are interested in the philosophy
-of Custom Debian Distributions, and the technique that is used to
-manage those projects.
-It is explained in detail why these are not forks from Debian, but reside
+of Debian Integrated Solutions (pronounce DISh = a dish were we
+provide a flavour of Debian), and the technique that is used to
+manage those projects. For those who are familiar with the concept of
+Custom Debian Distributions: We just found a new name for this
+concept because the old name just not expressed what actually is done.
+It is explained in detail why DIShes are not forks from Debian, but reside
completely inside the Debian GNU/Linux distribution, and which
advantages can be enjoyed by taking this approach. The concept of
metapackages and user role based menus is explained. In short: This
-document describes why Custom Debian Distributions are important to
+document describes why Debian Integrated Solutions are important to
the vitality and quality of Debian.
</abstract>
@@ -51,13 +54,13 @@
<p>
You can find the source of this article
- <url id="http://svn.debian.org/wsvn/cdd/cdd/trunk/cdd/doc/"
+ <url id="http://svn.debian.org/wsvn/cdd/cdd/trunk/dis/doc/"
name="in the Subversion repository at svn.debian.org">.
- It is also available as Debian package <package>cdd-doc</package>.
+ It is also available as Debian package <package>dis-doc</package>.
</p>
<p>
- A <url id="../debian-cdd.en.pdf"
+ A <url id="../debian-dis.en.pdf"
name="printable version in PDF format"> will be built
from time to time.
</p>
@@ -79,7 +82,7 @@
sgml-always-quote-attributes:t
sgml-indent-step:2
sgml-indent-data:t
-sgml-parent-document:("../debian-cdd.en.sgml" "book" "chapt")
+sgml-parent-document:("../debian-dis.en.sgml" "book" "chapt")
sgml-exposed-tags:nil
sgml-local-catalogs:nil
sgml-local-ecat-files:nil
Modified: cdd/trunk/dis/doc/en/01_introduction.sgml
==============================================================================
--- cdd/trunk/dis/doc/en/01_introduction.sgml (original)
+++ cdd/trunk/dis/doc/en/01_introduction.sgml Mon Aug 18 02:29:56 2008
@@ -9,23 +9,23 @@
packages tailored in a different way.
</p>
<p>
-Custom Debian Distributions (formerly merged together with Debian Internal
+Debian Integrated Solutions (formerly merged together with Debian Internal
Projects) provide support for special user interests. They implement a new
approach to cover interests of specialised users, who might be
children, lawyers, medical staff, visually impaired people, etc. Of late,
-several Custom Debian Distributions have evolved. The common goal of those is
+several Debian Integrated Solutions have evolved. The common goal of those is
to make installation and administration of computers for their target users as
easy as possible, and to serve in the role as the missing link between software
developers and users well.
</p>
<p>
Using the object oriented approach as an analogy, if Debian as a whole is an
-object, a Custom Debian Distribution is an instance of this object that
+object, a Debian Integrated Solution is an instance of this object that
inherits all features while providing certain properties.
</p>
<p>
So the Debian project releases the Debian Distribution and other
-Custom Debian Distributions. In contrast to this, there might be some
+Debian Integrated Solutions. In contrast to this, there might be some
other Debian related Projects, either external or non-official, which may
create "derivative distributions". But these are not the
responsibility of the Debian project.
More information about the Cdd-commits
mailing list