[Cdd-commits] r1036 - in cdd/trunk/dis: examples examples/config examples/debian examples/install examples/install/task1 examples/menu examples/menu/task1 examples/tasks share/dis share/dis/unixgroups share/menu templates

CDD Subversion Commit noreply at alioth.debian.org
Mon Aug 18 01:40:23 UTC 2008 

Author: tille
Date: Mon Aug 18 01:40:23 2008
New Revision: 1036

Added:
   cdd/trunk/dis/share/dis/dis-actions   (props changed)
      - copied unchanged from r1035, cdd/trunk/dis/share/dis/cdd-actions
   cdd/trunk/dis/share/dis/dis-update-menus   (props changed)
      - copied unchanged from r1035, cdd/trunk/dis/share/dis/cdd-update-menus
   cdd/trunk/dis/share/dis/dis-utils   (props changed)
      - copied unchanged from r1035, cdd/trunk/dis/share/dis/cdd-utils
   cdd/trunk/dis/share/dis/unixgroups/dis-actions   (props changed)
      - copied unchanged from r1035, cdd/trunk/dis/share/dis/unixgroups/cdd-actions
   cdd/trunk/dis/share/menu/dis-menu   (props changed)
      - copied unchanged from r1034, cdd/trunk/dis/share/menu/cdd-menu
Removed:
   cdd/trunk/dis/share/dis/cdd-actions
   cdd/trunk/dis/share/dis/cdd-update-menus
   cdd/trunk/dis/share/dis/cdd-utils
   cdd/trunk/dis/share/dis/unixgroups/cdd-actions
   cdd/trunk/dis/share/menu/cdd-menu
Modified:
   cdd/trunk/dis/examples/Makefile
   cdd/trunk/dis/examples/README
   cdd/trunk/dis/examples/config/README
   cdd/trunk/dis/examples/config/common.1
   cdd/trunk/dis/examples/config/conf
   cdd/trunk/dis/examples/config/control
   cdd/trunk/dis/examples/debian/README
   cdd/trunk/dis/examples/debian/control.stub
   cdd/trunk/dis/examples/debian/rules
   cdd/trunk/dis/examples/install/README
   cdd/trunk/dis/examples/install/task1/extra-script-which-is-needed-in-task1.1
   cdd/trunk/dis/examples/menu/README
   cdd/trunk/dis/examples/menu/task1/README
   cdd/trunk/dis/examples/menu/task1/dep1.menu
   cdd/trunk/dis/examples/menu/task1/dep2.txt
   cdd/trunk/dis/examples/menu/task1/dep3.html
   cdd/trunk/dis/examples/tasks/task1
   cdd/trunk/dis/templates/README.Debian
Log:
Further renamings, and spelling fixes.


Modified: cdd/trunk/dis/examples/Makefile
==============================================================================
--- cdd/trunk/dis/examples/Makefile	(original)
+++ cdd/trunk/dis/examples/Makefile	Mon Aug 18 01:40:23 2008
@@ -1,12 +1,12 @@
 #!/usr/bin/make -f
 
-CDDMAKEFILE=/usr/share/cdd-dev/Makefile
+DISMAKEFILE=/usr/share/dis-dev/Makefile
 
-CheckCDDMakefile := $(shell if [ -e $(CDDMAKEFILE) ] ; then echo 1 ; else echo 0 ; fi)
-ifeq ($(CheckCDDMakefile),1)
-    include $(CDDMAKEFILE)
+CheckDISMakefile := $(shell if [ -e $(DISMAKEFILE) ] ; then echo 1 ; else echo 0 ; fi)
+ifeq ($(CheckDISMakefile),1)
+    include $(DISMAKEFILE)
 else
-    err := $(shell echo "$(CDDMAKEFILE) is missing.  Please install cdd-dev package!")
+    err := $(shell echo "$(DISMAKEFILE) is missing.  Please install dis-dev package!")
 endif
 
 dummy:

Modified: cdd/trunk/dis/examples/README
==============================================================================
--- cdd/trunk/dis/examples/README	(original)
+++ cdd/trunk/dis/examples/README	Mon Aug 18 01:40:23 2008
@@ -1,5 +1,5 @@
 This is an example directory layout for building meta packages for a
-Custom Debian Distribution with the name Debian-_CDD_.  So search for the
-string _CDD_ and replacing it with a real name would provide a basic
+Custom Debian Distribution with the name Debian-_DIS_.  So search for the
+string _DIS_ and replacing it with a real name would provide a basic
 skeleton to work with.
 

Modified: cdd/trunk/dis/examples/config/README
==============================================================================
--- cdd/trunk/dis/examples/config/README	(original)
+++ cdd/trunk/dis/examples/config/README	Mon Aug 18 01:40:23 2008
@@ -1,2 +1,2 @@
-If this directory exists a _CDD_-common package is created.
-See for instance Debian-Med packages.
+If this directory exists a _DIS_-common package is created.
+See for instance Debian Med packages.

Modified: cdd/trunk/dis/examples/config/common.1
==============================================================================
--- cdd/trunk/dis/examples/config/common.1	(original)
+++ cdd/trunk/dis/examples/config/common.1	Mon Aug 18 01:40:23 2008
@@ -1,17 +1,17 @@
-.TH _CDD_-common 1 "May 24, 2002" "Debian-_CDD_"
+.TH _DIS_-common 1 "May 24, 2002" "Debian-_DIS_"
 .SH NAME
-.B _CDD_-common
-.B _CDD_-<meta_package_name>
+.B _DIS_-common
+.B _DIS_-<metapackage_name>
 \- package information and auto-apt helper
 
 .SH SYNOPSIS
-.B _CDD_-common
-.B _CDD_-<meta_package_name>
+.B _DIS_-common
+.B _DIS_-<metapackage_name>
 
 .SH DESCRIPTION
-Print just a simple information page about every _CDD_-* package
-of the Debian-_CDD_ Custom Debian Distribution.  Each meta-package has a 
-.I /usr/bin/_CDD_-<meta_package_name>
+Print just a simple information page about every _DIS_-* package
+of the Debian _DIS_ Debian Integrated Solution.  Each metapackage has a 
+.I /usr/bin/_DIS_-<metapackage_name>
 file which should print some usefull informations and could be serve
 as auto-apt helper.
 

Modified: cdd/trunk/dis/examples/config/conf
==============================================================================
--- cdd/trunk/dis/examples/config/conf	(original)
+++ cdd/trunk/dis/examples/config/conf	Mon Aug 18 01:40:23 2008
@@ -1,6 +1,6 @@
-## This is a configuration file for Debian-med Custom Debian Distribution
-## It is read after /etc/cdd/cdd.conf and can override or add variables
+## This is a configuration file for Debian-med Debian Integrated Solution
+## It is read after /etc/dis/dis.conf and can override or add variables
 
-## Some CDDs do not build their name generic like Debian-#CDD# so
+## Some DISs do not build their name generic like Debian-#DIS# so
 ## we need the correct name here
-CDDNAME=Debian-_CDD_
+DISNAME=Debian-_DIS_

Modified: cdd/trunk/dis/examples/config/control
==============================================================================
--- cdd/trunk/dis/examples/config/control	(original)
+++ cdd/trunk/dis/examples/config/control	Mon Aug 18 01:40:23 2008
@@ -1,7 +1,7 @@
-Package: _CDD_-config
+Package: _DIS_-config
 Architecture: all
-Depends: adduser, debconf (>= 0.5), menu
-Description: Debian-_CDD_ Project config package
- This package builds the basic infra structure of all meta packages
- for the Debian-_CDD_ Custom Debian Distribution.
+Depends: adduser, ${misc:Depends}, menu, dis-common (>= 0.6)
+Description: Debian-_DIS_ Project config package
+ This package builds the basic infra structure of all metapackages
+ for the Debian-_DIS_ Debian Integrated Solution.
 

Modified: cdd/trunk/dis/examples/debian/README
==============================================================================
--- cdd/trunk/dis/examples/debian/README	(original)
+++ cdd/trunk/dis/examples/debian/README	Mon Aug 18 01:40:23 2008
@@ -1,3 +1,3 @@
-You always need this directory to build meta packages.
-Just change control.stub and replace the variables _CDD_ and
+You always need this directory to build metapackages.
+Just change control.stub and replace the variables _DIS_ and
 _MAINTAINER_ to the apropriate strings.

Modified: cdd/trunk/dis/examples/debian/control.stub
==============================================================================
--- cdd/trunk/dis/examples/debian/control.stub	(original)
+++ cdd/trunk/dis/examples/debian/control.stub	Mon Aug 18 01:40:23 2008
@@ -1,10 +1,10 @@
-Source: debian-_CDD_
+Source: debian-_DIS_
 Section: misc
 Priority: extra
 Maintainer: _MAINTAINER_ <_maintainer_ at debian.org>
 Uploaders: _OPTIONAL-FURTHER-MAINTAINER_ <_optional-further-maintainer_ at debian.org>
-Build-Depends-Indep: debhelper (>= 5), cdd-dev
-Standards-Version: 3.7.2
+Build-Depends-Indep: debhelper (>= 6.0.7), dis-dev
+Standards-Version: 3.8.0
 
-Package: _CDD_
+Package: _DIS_
 Architecture: all

Modified: cdd/trunk/dis/examples/debian/rules
==============================================================================
--- cdd/trunk/dis/examples/debian/rules	(original)
+++ cdd/trunk/dis/examples/debian/rules	Mon Aug 18 01:40:23 2008
@@ -1,3 +1,3 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdd-dev/rules
+include /usr/share/dis-dev/rules

Modified: cdd/trunk/dis/examples/install/README
==============================================================================
--- cdd/trunk/dis/examples/install/README	(original)
+++ cdd/trunk/dis/examples/install/README	Mon Aug 18 01:40:23 2008
@@ -1,9 +1,9 @@
 If some extra files like scripts of manpages are needed in the meta packages
 the should be placed into apropriate subdirectories of this directory.
-While there is no certain procedure in the cdd-dev tools to handle files
+While there is no certain procedure in the dis-dev tools to handle files
 in this directory it might be a good idea to settle down with some
 default place for those extra files.  To move them right into place
 the files debian/<pkg>.install, debian/<pkg>.manpages etc. should
 be used.
 
-See for instance Debian-Med packages.
+See for instance Debian Med packages.

Modified: cdd/trunk/dis/examples/install/task1/extra-script-which-is-needed-in-task1.1
==============================================================================
--- cdd/trunk/dis/examples/install/task1/extra-script-which-is-needed-in-task1.1	(original)
+++ cdd/trunk/dis/examples/install/task1/extra-script-which-is-needed-in-task1.1	Mon Aug 18 01:40:23 2008
@@ -1,4 +1,4 @@
-.TH extra-script-which-is-needed-in-task1 1 "<date>" "#CDD#"
+.TH extra-script-which-is-needed-in-task1 1 "<date>" "#DIS#"
 .SH NAME
 .B extra-script-which-is-needed-in-task1 
 \- some useful script for task1
@@ -12,4 +12,4 @@
 dependencies.
 
 .SH AUTHOR
-Meta Package Autor <mpa at debian.org>.
+Metapackage Autor <mpa at debian.org>.

Modified: cdd/trunk/dis/examples/menu/README
==============================================================================
--- cdd/trunk/dis/examples/menu/README	(original)
+++ cdd/trunk/dis/examples/menu/README	Mon Aug 18 01:40:23 2008
@@ -2,16 +2,16 @@
 be provided here.  The files should have the same name as the files in the
 tasks directory and ideally each single task should have its own menu.
 
-See for instance Debian-Med packages.
+See for instance Debian Med packages.
 
 In general a meta package should provide a menu for every dependent package.
 This menu entry should either point to a package executable (perhaps with
 some special hints assigned) or to a pager call which proveides some extra
 information how the special package can be used.  For instance this can be
-done via text files /usr/share/doc/_CDD_task1/deppkg1.txt (see Debian-Med).
+done via text files /usr/share/doc/_DIS_task1/deppkg1.txt (see Debian-Med).
 
-The idea is to provide a special _CDD_ menu with the relevant parts for
-the users of the _CDD_.
+The idea is to provide a special _DIS_ menu with the relevant parts for
+the users of the _DIS_.
 
 At install time the existing dependencies are checked for their
 menu entries.  These are tekan over into the user menu.  If the

Modified: cdd/trunk/dis/examples/menu/task1/README
==============================================================================
--- cdd/trunk/dis/examples/menu/task1/README	(original)
+++ cdd/trunk/dis/examples/menu/task1/README	Mon Aug 18 01:40:23 2008
@@ -3,7 +3,7 @@
 
 Sometimes it is not possible to provide a useful menu entry for a
 package and thus we would fail to create a menu entry for a dependency
-inside a meta package.  This sucks in term of user support and thus
+inside a metapackage.  This sucks in term of user support and thus
 it is strongly suggested to provide some information about each
 dependant package which has no reasonable menu entry.
 

Modified: cdd/trunk/dis/examples/menu/task1/dep1.menu
==============================================================================
--- cdd/trunk/dis/examples/menu/task1/dep1.menu	(original)
+++ cdd/trunk/dis/examples/menu/task1/dep1.menu	Mon Aug 18 01:40:23 2008
@@ -1,5 +1,5 @@
 ?package(dep1): needs   = "X11" \
-                section = "_CDD_/Task1" \
+                section = "_DIS_/Task1" \
                 title   = "DepPkg1" \
 		command = "/usr/bin/deppkg1" \
 		hints   = "Use of DepPkg1"

Modified: cdd/trunk/dis/examples/menu/task1/dep2.txt
==============================================================================
--- cdd/trunk/dis/examples/menu/task1/dep2.txt	(original)
+++ cdd/trunk/dis/examples/menu/task1/dep2.txt	Mon Aug 18 01:40:23 2008
@@ -1,6 +1,6 @@
 dep2: Short description of package dep2
 
-Some information about dep2 from the Debian-_CDD_ project.
+Some information about dep2 from the Debian-_DIS_ project.
 
  long description of dep2
  

Modified: cdd/trunk/dis/examples/menu/task1/dep3.html
==============================================================================
--- cdd/trunk/dis/examples/menu/task1/dep3.html	(original)
+++ cdd/trunk/dis/examples/menu/task1/dep3.html	Mon Aug 18 01:40:23 2008
@@ -1,7 +1,7 @@
 <html>
 <head>
 <title>Description of dep3</title>
-<meta name="author" content="<meta package author>" />
+<meta name="author" content="<metapackage author>" />
 </head>
 <body>
 <h2>dep3: Short description of package dep3</h2>

Modified: cdd/trunk/dis/examples/tasks/task1
==============================================================================
--- cdd/trunk/dis/examples/tasks/task1	(original)
+++ cdd/trunk/dis/examples/tasks/task1	Mon Aug 18 01:40:23 2008
@@ -1,7 +1,7 @@
 Task: task1
-Description: Debian-_CDD_ task1 packages
+Description: Debian-_DIS_ task1 packages
  This meta package will install Debian packages for use in 
- task1 of Debian-_CDD_.
+ task1 of Debian-_DIS_.
 
 Depends: dep-pkg1, dep-pkg2, ...
 Suggests: sug-pkg1, ...
@@ -11,7 +11,7 @@
 Responsible: Somebody who cares
 NeedConfig:  no / yes via debconf
 
-Depends:     _CDD_-common
-Why:         Reason for dependency of the _CDD_common package
-Responsible: _CDD_Maintainer
+Depends:     _DIS_-common
+Why:         Reason for dependency of the _DIS_common package
+Responsible: _DIS_Maintainer
 NeedConfig:  yes via debconf

Modified: cdd/trunk/dis/templates/README.Debian
==============================================================================
--- cdd/trunk/dis/templates/README.Debian	(original)
+++ cdd/trunk/dis/templates/README.Debian	Mon Aug 18 01:40:23 2008
@@ -7,7 +7,7 @@
 touched.
 
 There exists an comprehensive documentation about Debian Integrated Solutions
-which can be found at http://alioth.debian.org/projects/cdd/.
+which can be found at http://cdd.alioth.debian.org/dis/.
 
 The meta packages should always be installable on a Debian system.
 Thus no dependency on a non-available package (ie. a package available

More information about the Cdd-commits mailing list