[Cdd-commits] r1139 - cdd/trunk/blends/debian

CDD Subversion Commit noreply at alioth.debian.org
Tue Oct 21 15:40:51 UTC 2008 

Author: tille
Date: Tue Oct 21 15:40:51 2008
New Revision: 1139

Added:
   cdd/trunk/blends/debian/blends-common.README.Debian
      - copied, changed from r1136, cdd/trunk/blends/debian/dis-common.README.Debian
   cdd/trunk/blends/debian/blends-common.dirs
      - copied unchanged from r1137, cdd/trunk/blends/debian/dis-common.dirs
   cdd/trunk/blends/debian/blends-common.docs
      - copied, changed from r1137, cdd/trunk/blends/debian/dis-common.docs
   cdd/trunk/blends/debian/blends-common.install
      - copied, changed from r1137, cdd/trunk/blends/debian/dis-common.install
   cdd/trunk/blends/debian/blends-common.lintian-overrides
      - copied, changed from r1137, cdd/trunk/blends/debian/dis-common.lintian-overrides
   cdd/trunk/blends/debian/blends-common.manpages
      - copied unchanged from r1137, cdd/trunk/blends/debian/dis-common.manpages
   cdd/trunk/blends/debian/blends-common.preinst   (contents, props changed)
      - copied, changed from r1137, cdd/trunk/blends/debian/dis-common.preinst
   cdd/trunk/blends/debian/blends-dev.docs
      - copied unchanged from r1137, cdd/trunk/blends/debian/dis-dev.docs
   cdd/trunk/blends/debian/blends-dev.examples
      - copied unchanged from r1137, cdd/trunk/blends/debian/dis-dev.examples
   cdd/trunk/blends/debian/blends-dev.install
      - copied, changed from r1137, cdd/trunk/blends/debian/dis-dev.install
   cdd/trunk/blends/debian/blends-dev.manpages
      - copied unchanged from r1137, cdd/trunk/blends/debian/dis-dev.manpages
   cdd/trunk/blends/debian/blends-dev.preinst   (contents, props changed)
      - copied, changed from r1137, cdd/trunk/blends/debian/dis-dev.preinst
   cdd/trunk/blends/debian/blends-doc.doc-base
      - copied, changed from r1137, cdd/trunk/blends/debian/dis-doc.doc-base
   cdd/trunk/blends/debian/blends-doc.docs
      - copied, changed from r1137, cdd/trunk/blends/debian/dis-doc.docs
   cdd/trunk/blends/debian/blends-doc.install
      - copied, changed from r1137, cdd/trunk/blends/debian/dis-doc.install
Removed:
   cdd/trunk/blends/debian/dis-common.README.Debian
   cdd/trunk/blends/debian/dis-common.dirs
   cdd/trunk/blends/debian/dis-common.docs
   cdd/trunk/blends/debian/dis-common.install
   cdd/trunk/blends/debian/dis-common.lintian-overrides
   cdd/trunk/blends/debian/dis-common.manpages
   cdd/trunk/blends/debian/dis-common.preinst
   cdd/trunk/blends/debian/dis-dev.docs
   cdd/trunk/blends/debian/dis-dev.examples
   cdd/trunk/blends/debian/dis-dev.install
   cdd/trunk/blends/debian/dis-dev.manpages
   cdd/trunk/blends/debian/dis-dev.preinst
   cdd/trunk/blends/debian/dis-doc.doc-base
   cdd/trunk/blends/debian/dis-doc.docs
   cdd/trunk/blends/debian/dis-doc.install
Modified:
   cdd/trunk/blends/debian/copyright
   cdd/trunk/blends/debian/rules
Log:
Renamed files in debian/ dir and renaming inside these files - package does not build because files in other dirs will have to be renamed as well


Copied: cdd/trunk/blends/debian/blends-common.README.Debian (from r1136, cdd/trunk/blends/debian/dis-common.README.Debian)
==============================================================================
--- cdd/trunk/blends/debian/dis-common.README.Debian	(original)
+++ cdd/trunk/blends/debian/blends-common.README.Debian	Tue Oct 21 15:40:51 2008
@@ -3,8 +3,8 @@
 
 This package builds the basic infra structure of all metapackages.
 
-You can add or remove users to the group of users of a Debian Integrated
-Solution.  This is used for instance by Debian Med.  It provides
+You can add or remove users to the group of users of a Debian Pure
+Blends.  This is used for instance by Debian Med.  It provides
 a med-common package which calls the scripts from blends-common.  It
 can be used by
 

Copied: cdd/trunk/blends/debian/blends-common.docs (from r1137, cdd/trunk/blends/debian/dis-common.docs)
==============================================================================
--- cdd/trunk/blends/debian/dis-common.docs	(original)
+++ cdd/trunk/blends/debian/blends-common.docs	Tue Oct 21 15:40:51 2008
@@ -1,2 +1,2 @@
-README.DIS
+README.BLENDS
 debian/NEWS.Debian

Copied: cdd/trunk/blends/debian/blends-common.install (from r1137, cdd/trunk/blends/debian/dis-common.install)
==============================================================================
--- cdd/trunk/blends/debian/dis-common.install	(original)
+++ cdd/trunk/blends/debian/blends-common.install	Tue Oct 21 15:40:51 2008
@@ -1,7 +1,7 @@
-dis-user                usr/sbin
-dis-role                usr/sbin
-dis-update-menus        usr/sbin
-dis-update-usermenus    usr/sbin
+blends-user             usr/sbin
+blends-role             usr/sbin
+blends-update-menus     usr/sbin
+blends-update-usermenus usr/sbin
 share                   usr
 etc/*                   etc
-dis-task-lister         usr/share/dis
+blends-task-lister      usr/share/blends

Copied: cdd/trunk/blends/debian/blends-common.lintian-overrides (from r1137, cdd/trunk/blends/debian/dis-common.lintian-overrides)
==============================================================================
--- cdd/trunk/blends/debian/dis-common.lintian-overrides	(original)
+++ cdd/trunk/blends/debian/blends-common.lintian-overrides	Tue Oct 21 15:40:51 2008
@@ -1,12 +1,12 @@
-# The script /usr/lib/menu/dis-menu is not intended to be called by the
-# dis-common package but should be called by meta packages according to
-# the Debian Integrated Solution philosphy which is explained in dis-doc.
+# The script /usr/lib/menu/blends-menu is not intended to be called by the
+# blends-common package but should be called by meta packages according to
+# the Debian Pure Blends philosphy which is explained in blends-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.
-dis-common: postinst-does-not-call-updatemenus usr/share/menu/dis-menu
-dis-common: postrm-does-not-call-updatemenus usr/share/menu/dis-menu
+blends-common: postinst-does-not-call-updatemenus usr/share/menu/blends-menu
+blends-common: postrm-does-not-call-updatemenus usr/share/menu/blends-menu
 
 # For obvious reasons the script has to be executable which is the
 # intended use for scripts which dynamically create menu entries.
-dis-common: executable-menu-file usr/share/menu/dis-menu 0755
+blends-common: executable-menu-file usr/share/menu/blends-menu 0755

Copied: cdd/trunk/blends/debian/blends-common.preinst (from r1137, cdd/trunk/blends/debian/dis-common.preinst)
==============================================================================
--- cdd/trunk/blends/debian/dis-common.preinst	(original)
+++ cdd/trunk/blends/debian/blends-common.preinst	Tue Oct 21 15:40:51 2008
@@ -2,30 +2,30 @@
 set -e
 
 # In the process of renaming former Custom Debian Distributions to
-# Debian Integrated Solutions we have to care for configuration files
+# Debian Pure Blends ons we have to care for configuration files
 
 if [ -d /etc/cdd ] ; then
-    mkdir -p /etc/dis
+    mkdir -p /etc/blends
     cd /etc/cdd
     tar -cf - --exclude menu --exclude sources.* . | \
-            (cd /etc/dis; tar --keep-old-files -xBpf - 2> /dev/null || true)
-    # cp -u -a /etc/cdd/* /etc/dis
-    for dis in `find /etc/dis -maxdepth 1 -mindepth 1 -type d` ; do
-	cd $dis
-	sed -i~ -e 's/CDD/DIS/g' \
-		-e 's/cdd/dis/g' \
-	        -e 's/Custom Debian Distribution/Debian Internal Solution/g' \
+            (cd /etc/blends; tar --keep-old-files -xBpf - 2> /dev/null || true)
+    # cp -u -a /etc/cdd/* /etc/blends
+    for blend in `find /etc/blends -maxdepth 1 -mindepth 1 -type d` ; do
+	cd "$blend"
+	sed -i~ -e 's/CDD/BLEND/g' \
+		-e 's/cdd/blend/g' \
+	        -e 's/Custom Debian Distribution/Debian Pure Blend/g' \
 	        `find . -type f -name "*[a-z]"`
     done
-    if [ -e /etc/dis/cdd.conf ] ; then
-	if [ /etc/dis/dis.conf ] ; then
-	    mv /etc/dis/cdd.conf /etc/dis/cdd.conf~
+    if [ -e /etc/blends/cdd.conf ] ; then
+	if [ /etc/blends/blends.conf ] ; then
+	    mv /etc/blends/cdd.conf /etc/blends/cdd.conf~
 	else
-	    mv /etc/dis/cdd.conf /etc/dis/dis.conf
-            sed -i~ -e 's/CDD/DIS/g' \
-    		    -e 's/cdd/dis/g' \
-	    	    -e 's/Custom Debian Distribution/Debian Internal Solution/g' \
-	    	    /etc/dis/dis.conf
+	    mv /etc/blends/cdd.conf /etc/blends/blends.conf
+            sed -i~ -e 's/CDD/BLEND/g' \
+    		    -e 's/cdd/blends/g' \
+	    	    -e 's/Custom Debian Distribution/Debian Pure Blend/g' \
+	    	    /etc/blends/blends.conf
 	fi
     fi
 fi

Copied: cdd/trunk/blends/debian/blends-dev.install (from r1137, cdd/trunk/blends/debian/dis-dev.install)
==============================================================================
--- cdd/trunk/blends/debian/dis-dev.install	(original)
+++ cdd/trunk/blends/debian/blends-dev.install	Tue Oct 21 15:40:51 2008
@@ -1,3 +1,3 @@
-sources.list*       etc/dis
-templates           usr/share/dis
-devtools/*          usr/share/dis-dev
+sources.list*       etc/blends
+templates           usr/share/blends
+devtools/*          usr/share/blends-dev

Copied: cdd/trunk/blends/debian/blends-dev.preinst (from r1137, cdd/trunk/blends/debian/dis-dev.preinst)
==============================================================================
--- cdd/trunk/blends/debian/dis-dev.preinst	(original)
+++ cdd/trunk/blends/debian/blends-dev.preinst	Tue Oct 21 15:40:51 2008
@@ -2,11 +2,11 @@
 set -e
 
 # In the process of renaming former Custom Debian Distributions to
-# Debian Integrated Solutions we have to care for configuration files
+# Debian Pure Blends we have to care for configuration files
 
 if [ -d /etc/cdd ] ; then
-    mkdir -p /etc/dis
-    cp -u -a /etc/cdd/sources* /etc/dis
+    mkdir -p /etc/blends
+    cp -u -a /etc/cdd/sources* /etc/blends
 fi
 
 #DEBHELPER#

Copied: cdd/trunk/blends/debian/blends-doc.doc-base (from r1137, cdd/trunk/blends/debian/dis-doc.doc-base)
==============================================================================
--- cdd/trunk/blends/debian/dis-doc.doc-base	(original)
+++ cdd/trunk/blends/debian/blends-doc.doc-base	Tue Oct 21 15:40:51 2008
@@ -1,24 +1,23 @@
-Document: dis-doc
-Title: Debian Integrated Solutions
+Document: blends-doc
+Title: Debian Pure Blends
 Author: Andreas Tille
 Abstract: This paper is intended to people who are interested in the philosophy
- of Debian Integrated Solutions and the technique which is used to
- manage those projects.
+ of Debian Pure Blends 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 Debian Integrated Solutions are important to
- the vitality and quality of Debian.
+ document describes why Debian Pure Blends are important to the vitality
+ and quality of Debian.
 Section: Debian
 
 Format: HTML
-Index: /usr/share/doc/dis-doc/html/index.html
-Files: /usr/share/doc/dis-doc/html/*.html
+Index: /usr/share/doc/blends-doc/html/index.html
+Files: /usr/share/doc/blends-doc/html/*.html
 
 Format: text
-Files: /usr/share/doc/dis-doc/debian-dis.en.txt.gz
+Files: /usr/share/doc/blends-doc/debian-blends.en.txt.gz
 
 Format: pdf
-Files: /usr/share/doc/dis-doc/debian-dis.en.pdf
+Files: /usr/share/doc/blends-doc/debian-blends.en.pdf

Copied: cdd/trunk/blends/debian/blends-doc.docs (from r1137, cdd/trunk/blends/debian/dis-doc.docs)
==============================================================================
--- cdd/trunk/blends/debian/dis-doc.docs	(original)
+++ cdd/trunk/blends/debian/blends-doc.docs	Tue Oct 21 15:40:51 2008
@@ -1,2 +1,2 @@
-doc/debian-dis.en.pdf
-doc/debian-dis.en.txt
+doc/debian-blends.en.pdf
+doc/debian-blends.en.txt

Copied: cdd/trunk/blends/debian/blends-doc.install (from r1137, cdd/trunk/blends/debian/dis-doc.install)
==============================================================================
--- cdd/trunk/blends/debian/dis-doc.install	(original)
+++ cdd/trunk/blends/debian/blends-doc.install	Tue Oct 21 15:40:51 2008
@@ -1 +1 @@
-doc/debian-dis.html/*  usr/share/doc/dis-doc/html
+doc/debian-blends.html/*  usr/share/doc/blends-doc/html

Modified: cdd/trunk/blends/debian/copyright
==============================================================================
--- cdd/trunk/blends/debian/copyright	(original)
+++ cdd/trunk/blends/debian/copyright	Tue Oct 21 15:40:51 2008
@@ -14,7 +14,7 @@
 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
+Files: devtools/blends-gen-control
 Copyright: © 2003-2007 Petter Reinholdtsen <pere at debian.org>
            © 2007-2008 Andreas Tille <tille at debian.org>
 License: GPL-2+
@@ -25,7 +25,7 @@
 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/*
+Files: share/blends/*
 Copyright: © 2003      Cosimo Alfarano <kalfa at debian.org>
            © 2003-2008 Andreas Tille <tille at debian.org>
 License: GPL-2+

Modified: cdd/trunk/blends/debian/rules
==============================================================================
--- cdd/trunk/blends/debian/rules	(original)
+++ cdd/trunk/blends/debian/rules	Tue Oct 21 15:40:51 2008
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# debian/rules for dis-dev 
+# debian/rules for blends
 # This file is public domain software, originally written by Andreas Tille.
 
 # $Id$
@@ -7,8 +7,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-VERSION := $(shell grep '^dis *(.\+)' debian/changelog | head -n 1 | sed 's/^dis \+(\(.\+\)) .*/\1/' )
-DISTDIR := dis-$(VERSION)
+VERSION := $(shell grep '^blends *(.\+)' debian/changelog | head -n 1 | sed 's/^blends \+(\(.\+\)) .*/\1/' )
+DISTDIR := blends-$(VERSION)
 
 build: build-stamp
 build-stamp:

More information about the Cdd-commits mailing list