[Cdd-commits] r915 - in cdd/trunk/cdd: debian examples/config templates

CDD Subversion Commit noreply at alioth.debian.org
Thu Jul 3 07:26:48 UTC 2008


Author: tille
Date: Thu Jul  3 07:26:48 2008
New Revision: 915

Added:
   cdd/trunk/cdd/debian/cdd-common.lintian-overrides
   cdd/trunk/cdd/debian/cdd-doc.doc-base
   cdd/trunk/cdd/debian/cdd-doc.docs
   cdd/trunk/cdd/debian/cdd-doc.install
Removed:
   cdd/trunk/cdd/debian/cdd-common.lintian.overrides
   cdd/trunk/cdd/debian/cdd-dev.dirs
   cdd/trunk/cdd/debian/cdd-dev.lintian.overrides
Modified:
   cdd/trunk/cdd/debian/changelog
   cdd/trunk/cdd/debian/control
   cdd/trunk/cdd/debian/rules
   cdd/trunk/cdd/examples/config/common.1
   cdd/trunk/cdd/templates/README.Debian
Log:
Fixed some lintian problems about spelling; Standards-Version: 3.8.0


Added: cdd/trunk/cdd/debian/cdd-common.lintian-overrides
==============================================================================
--- (empty file)
+++ cdd/trunk/cdd/debian/cdd-common.lintian-overrides	Thu Jul  3 07:26:48 2008
@@ -0,0 +1,12 @@
+# The script /usr/lib/menu/cdd-menu is not intended to be called by the
+# cdd-common package but should be called by meta packages according to
+# the Custom Debian Distribution philosphy which is explained in cdd-doc.
+# That's why neither postinst nor postrm will call update-menus and
+# if they would it would just be a useless call because it just exits 0
+# if called by root.
+cdd-common: postinst-does-not-call-updatemenus usr/share/menu/cdd-menu
+cdd-common: postrm-does-not-call-updatemenus usr/share/menu/cdd-menu
+
+# For obvious reasons the script has to be executable which is the
+# intended use for scripts which dynamically create menu entries.
+cdd-common: executable-menu-file usr/share/menu/cdd-menu 0755

Added: cdd/trunk/cdd/debian/cdd-doc.doc-base
==============================================================================
--- (empty file)
+++ cdd/trunk/cdd/debian/cdd-doc.doc-base	Thu Jul  3 07:26:48 2008
@@ -0,0 +1,24 @@
+Document: cdd-doc
+Title: Custom Debian Distributions
+Author: Andreas Tille
+Abstract: 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.
+Section: Debian
+
+Format: HTML
+Index: /usr/share/doc/cdd-doc/html/index.html
+Files: /usr/share/doc/cdd-doc/html/*.html
+
+Format: text
+Files: /usr/share/doc/cdd-doc/debian-cdd.en.txt.gz
+
+Format: pdf
+Files: /usr/share/doc/cdd-doc/debian-cdd.en.pdf

Added: cdd/trunk/cdd/debian/cdd-doc.docs
==============================================================================
--- (empty file)
+++ cdd/trunk/cdd/debian/cdd-doc.docs	Thu Jul  3 07:26:48 2008
@@ -0,0 +1,2 @@
+doc/debian-cdd.en.pdf
+doc/debian-cdd.en.txt

Added: cdd/trunk/cdd/debian/cdd-doc.install
==============================================================================
--- (empty file)
+++ cdd/trunk/cdd/debian/cdd-doc.install	Thu Jul  3 07:26:48 2008
@@ -0,0 +1 @@
+doc/debian-cdd.html/*  usr/share/doc/cdd-doc/html

Modified: cdd/trunk/cdd/debian/changelog
==============================================================================
--- cdd/trunk/cdd/debian/changelog	(original)
+++ cdd/trunk/cdd/debian/changelog	Thu Jul  3 07:26:48 2008
@@ -2,6 +2,13 @@
 
   * Avoid rsync to build dist target
     Closes: #488262
+  * Standards-Version: 3.8.0 (no changes necessary)
+  * Make use of dh_lintian to install overrides
+  * Lintian prefers spelling "metapackage" over meta package
+    on the other hand my dictionary claims metapackage wrong
+    and votes for meta-package.  I used the lintian clean
+    spelling suggestion but we need some agreement about a
+    consistent spelling ...
 
  -- Andreas Tille <tille at debian.org>  Mon, 30 Jun 2008 13:29:11 +0200
 

Modified: cdd/trunk/cdd/debian/control
==============================================================================
--- cdd/trunk/cdd/debian/control	(original)
+++ cdd/trunk/cdd/debian/control	Thu Jul  3 07:26:48 2008
@@ -10,7 +10,7 @@
 Build-Depends: debhelper (>= 6.0.7)
 Build-Depends-Indep: debiandoc-sgml, texlive-latex-base, texlive-latex-extra, 
  texlive-latex-recommended, texlive-fonts-recommended
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Vcs-Browser: http://svn.debian.org/wsvn/cdd/cdd/trunk/cdd/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/cdd/cdd/trunk/cdd/
 
@@ -20,10 +20,10 @@
 Depends: debconf (>= 0.5) | debconf-2.0, make | build-essential, apt,
  debhelper (>= 6.0.7)
 Suggests: cdd-doc
-Description: Custom Debian Distributions common files for developing meta packages
- This package makes life easier when packaging meta packages.  Perhaps
- this will also encourage other people to build meta packages if there are
- easy to use templates where only the packages, the meta package is depending
+Description: Custom Debian Distributions common files for developing metapackages
+ This package makes life easier when packaging metapackages.  Perhaps
+ this will also encourage other people to build metapackages if there are
+ easy to use templates where only the packages, the metapackage is depending
  from, to insert into the right place.
 
 Package: cdd-common
@@ -32,9 +32,9 @@
 Depends: adduser, menu (>= 2.1.25), debconf (>= 0.5) | debconf-2.0
 Suggests: cdd-doc
 Description: Custom Debian Distributions common package
- This package builds the basic infra structure for meta packages.
+ This package builds the basic infra structure for metapackages.
  .
- This package provides some files which are common to meta packages
+ This package provides some files which are common to metapackages
  of Common Debian Distributions. It introduces a method to handle
  system users in a group named according to the name of the
  Custom Debian Distribution.
@@ -51,7 +51,7 @@
  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
+ metapackages 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/rules
==============================================================================
--- cdd/trunk/cdd/debian/rules	(original)
+++ cdd/trunk/cdd/debian/rules	Thu Jul  3 07:26:48 2008
@@ -42,8 +42,7 @@
 	dh_installdocs
 	dh_installexamples
 	dh_installman
-	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_lintian
 	dh_link
 	dh_compress -X.pdf
 	dh_fixperms

Modified: cdd/trunk/cdd/examples/config/common.1
==============================================================================
--- cdd/trunk/cdd/examples/config/common.1	(original)
+++ cdd/trunk/cdd/examples/config/common.1	Thu Jul  3 07:26:48 2008
@@ -10,7 +10,7 @@
 
 .SH DESCRIPTION
 Print just a simple information page about every _CDD_-* package
-of the Debian-_CDD_ Custom Debian Distribution.  Each metapackage has a 
+of the Debian-_CDD_ Custom Debian Distribution.  Each meta-package has a 
 .I /usr/bin/_CDD_-<meta_package_name>
 file which should print some usefull informations and could be serve
 as auto-apt helper.

Modified: cdd/trunk/cdd/templates/README.Debian
==============================================================================
--- cdd/trunk/cdd/templates/README.Debian	(original)
+++ cdd/trunk/cdd/templates/README.Debian	Thu Jul  3 07:26:48 2008
@@ -1,7 +1,7 @@
 This is a meta package which is used by Custom Debian Distributions
 -------------------------------------------------------------------
 
-This package is a metapackage; it depends on several other packages to make
+This package is a meta-package; it depends on several other packages to make
 them be installed when it is installed. If you want to remove one of those
 packages, you have to remove this package as well. The other packages won't be
 touched.



More information about the Cdd-commits mailing list