[debian-edu-commits] [SCM] Debian package debian-edu-doc branch, squeeze, updated. 1.5_20130215_7.0-28-gad34d86

[David Prévot]

The following commit has been merged in the squeeze branch:
commit e0e3c1cab397ee2949838072eef0a3d089555784
Author: David Prévot <taffit at debian.org>
Date:   Sat Feb 16 13:35:11 2013 -0400

    Revert "Adapt build system to Wheezy manual"
    
    This reverts commit 0c27d0eedfdd324363903175ef7b1ef8cc6c8733.

diff --git a/Makefile b/Makefile
index 07360dd..06bfea2 100644
--- a/Makefile
+++ b/Makefile
@@ -5,13 +5,11 @@ all: build
 
 get-orig-source:
 	$(MAKE) -C $(SRCDIR)/debian-edu-squeeze update
-	$(MAKE) -C $(SRCDIR)/debian-edu-wheezy update
 	$(MAKE) -C $(SRCDIR)/rosegarden update
 	$(MAKE) -C $(SRCDIR)/audacity update
 
 update-copyright:
 	$(MAKE) -C $(SRCDIR)/debian-edu-squeeze update-copyright
-	$(MAKE) -C $(SRCDIR)/debian-edu-wheezy update-copyright
 	$(MAKE) -C $(SRCDIR)/rosegarden update-copyright
 	$(MAKE) -C $(SRCDIR)/audacity update-copyright
 	cat debian/copyright.packaging \
@@ -22,7 +20,6 @@ update-copyright:
 
 readme status build install dist-clean clean pdf::
 	$(MAKE) -C $(SRCDIR)/debian-edu-squeeze $@
-	$(MAKE) -C $(SRCDIR)/debian-edu-wheezy $@
 	$(MAKE) -C $(SRCDIR)/rosegarden $@
 	$(MAKE) -C $(SRCDIR)/audacity $@
 
diff --git a/debian/README b/debian/README
index 230b1bd..67c5a17 100644
--- a/debian/README
+++ b/debian/README
@@ -4,17 +4,16 @@ About the Debian Edu Documentation
 Current documentation
 ---------------------
 
-The Debian Edu Squeeze and Wheezy manuals are developed in a wiki at 
-http://wiki.debian.org/DebianEdu/Documentation/Squeeze/ and
-http://wiki.debian.org/DebianEdu/Documentation/Wheezy/ - they are based on the version 
+The Debian Edu Squeeze manual is developed in a wiki at 
+http://wiki.debian.org/DebianEdu/Documentation/Squeeze/ - it is based on the version 
 for etch - which was the first release with this kind of documentation.
 Currently two versions are provided, a PDF version and a HTML version. 
 Please contribute!
 
-Besides the Debian Edu Squeeze and Wheezy manuals, this package also builds the
+Besides the Debian Edu Squeeze manual this package also builds the
 Rosegarden and Audacity manuals.
 
-So far, translations for the Debian Edu Squeeze and Wheezy manuals have been completed for Danish,
+So far translations for the Debian Edu Squeeze manual have been completed for Danish,
 Italian, German and French. Uncompleted translations exist for Spanish and Bokmål.
 Please contribute! All manuals are translated with PO files. You can find more information
 how to contribute in /usr/share/doc/debian-edu-doc-en/README.$name-manual-translations.
diff --git a/debian/control b/debian/control
index 1eda58e..c63194f 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Package: debian-edu-doc-en
 Depends: ${misc:Depends}
 Architecture: all
 Description: English documentation from the Debian Edu project
- The English version of the manual for the Squeeze and Wheezy based release of 
+ The English version of the manual for the Squeeze based release of 
  the Debian Edu / Skolelinux project is included in this package, as well as 
  the Rosegarden and Audacity manuals.
  .
@@ -33,7 +33,7 @@ Package: debian-edu-doc-da
 Depends: debian-edu-doc-en, ${misc:Depends}
 Architecture: all
 Description: Danish documentation from the Debian Edu project
- The Danish version of the manual for the Squeeze and Wheezy based release of
+ The Danish version of the manual for the Squeeze based release of
  the Debian Edu / Skolelinux project is included in this package.
  .
  Debian Edu is a Debian project to make the best distribution for educational
@@ -44,7 +44,7 @@ Package: debian-edu-doc-de
 Depends: debian-edu-doc-en, ${misc:Depends}
 Architecture: all
 Description: German documentation from the Debian Edu project
- The German version of the manual for the Squeeze and Wheezy based release of 
+ The German version of the manual for the Squeeze based release of 
  the Debian Edu / Skolelinux project is included in this package.
  .
  Debian Edu is a Debian project to make the best distribution for educational
@@ -55,7 +55,7 @@ Package: debian-edu-doc-es
 Depends: debian-edu-doc-en, ${misc:Depends}
 Architecture: all
 Description: Spanish documentation from the Debian Edu project
- The Spanish version of the manual for the Squeeze and Wheezy based release of 
+ The Spanish version of the manual for the Squeeze based release of 
  the Debian Edu / Skolelinux project is included in this package, as well as
  the Rosegarden manual.
  .
@@ -67,7 +67,7 @@ Package: debian-edu-doc-nb
 Depends: debian-edu-doc-en, ${misc:Depends}
 Architecture: all
 Description: Bokmål documentation from the Debian Edu project
- The Bokmål version of the manual for the Squeeze and Wheezy based release of
+ The Bokmål version of the manual for the Squeeze based release of
  the Debian Edu / Skolelinux project is included in this package, as well as
  the Rosegarden manual.
  .
@@ -79,7 +79,7 @@ Package: debian-edu-doc-it
 Depends: debian-edu-doc-en, ${misc:Depends}
 Architecture: all
 Description: Italian documentation from the Debian Edu project
- The Italian version of the manual for the Squeeze and Wheezy based release of
+ The Italian version of the manual for the Squeeze based release of
  the Debian Edu / Skolelinux project is included in this package.
  .
  Debian Edu is a Debian project to make the best distribution for educational
@@ -90,7 +90,7 @@ Package: debian-edu-doc-fr
 Depends: debian-edu-doc-en, ${misc:Depends}
 Architecture: all
 Description: French documentation from the Debian Edu project
- The French version of the manual for the Squeeze and Wheezy based release of
+ The French version of the manual for the Squeeze based release of
  the Debian Edu / Skolelinux project is included in this package, as well as
  the Rosegarden and Audacity manuals.
  .
diff --git a/debian/rules b/debian/rules
index db2505d..97e399e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,7 +42,9 @@ binary-indep: install
 	dh_installdocs 
 	dh_installdocs -A debian/README
 	dh_installdocs -p debian-edu-doc-en \
-		documentation/*/README.*-translations
+		documentation/debian-edu-squeeze/README.debian-edu-squeeze-manual-translations \
+		documentation/rosegarden/README.rosegarden-manual-translations \
+		documentation/audacity/README.audacity-manual-translations 
 	dh_installchangelogs
 	dh_link
 	dh_compress -X.pdf -X.html

-- 
Debian package debian-edu-doc