[debian-edu-commits] debian-edu/debian-edu-doc.git (#94) - wheezy (branch) updated: 0.5.20070716-3-g53aad32

[David Prévot]

The branch, wheezy has been updated
       via  53aad3257a7e71e9371cd67781f40a8bf448e520 (commit)
      from  2ec13f0b8940aacc807fbdaf957aa71e40ec34a1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    6 +++++-
 debian/copyright |   23 -----------------------
 debian/rules     |   20 --------------------
 todo             |    5 +----
 4 files changed, 6 insertions(+), 48 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 39021ff..a26d9f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 debian-edu-doc (0.5.20070717) unstable; urgency=low
 
+  [ Petter Reinholdtsen ]
   * UNRELEASED.
   * Do not compress PDFs to make them easier to access.
 
- -- Petter Reinholdtsen <pere at debian.org>  Tue, 17 Jul 2007 09:18:59 +0200
+  [ Holger Levsen ]
+  * remove driftbook as it's the documentation for the woody based release
+
+ -- Holger Levsen <holger at debian.org>  Tue, 17 Jul 2007 22:20:26 +0200
 
 debian-edu-doc (0.5.20070716) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index aac2978..aaf0749 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -64,29 +64,6 @@ found in the file '/usr/share/common-licenses/GPL'.
 
 ----------------------------------------------------------------------------
 
-The files in /usr/share/doc/debian-edu-doc/$lang/driftbook/ are 
-Copyright 2002-2004 by Klaus Ade Johnstad (klaus at skolelinux.no) and are
-licenced under the GNU Public Licence.
-
-This program 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.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-On Debian systems, the complete text of the GNU General Public License can be
-found in the file '/usr/share/common-licenses/GPL'.
-
-----------------------------------------------------------------------------
-
 The files in http://wiki.skolelinux.no/Dokumentasjon/ITIL/AllInOne are
 Copyright 2005 by Knut Yrvin (knuty at skolelinux.no), Andreas Johnsen
 (andreasj at skolelinux.no), Klaus Ade Johnstad (klaus at skolelinux.no),
diff --git a/debian/rules b/debian/rules
index 45c2abc..cafc5aa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,6 @@ SVNBASE=svn://svn.skolelinux.org/skolelinux/trunk
 
 get-orig-source:
 	svn co -r $(REVISION) $(SVNBASE)/www/developer.skolelinux.no/arkitektur $(SRCDIR)/arkitektur 
-	svn co -r $(REVISION) $(SVNBASE)/www/developer.skolelinux.no/dokumentasjon/driftbok $(SRCDIR)/driftbook
 	# FIXME: checking everything out and then deleting 98% is kind of stupid, to 
 	# 	 say it nicely... 
 	# 	 a better strategy would be to only check out the needed IKT* files and 
@@ -21,7 +20,6 @@ get-orig-source:
 
 dist-clean: clean
 	rm $(SRCDIR)/arkitektur -Rf
-	rm $(SRCDIR)/driftbook -Rf
 	rm $(SRCDIR)/ikt-book -Rf
 
 clean:
@@ -56,24 +54,6 @@ install: build
 	done
 
 	# 
-	# drift
-	#
-	# disabled: 	this is the driftbook for the _woody_-version and IMO quite 
-	# 		useless to ship.
-	# 		we _might_ want to still ship the newdriftbook (which is for
-	# 		sarge) - but I'm not even really sure about this
-	# 		
-	#
-	#install -d $(DESTDIR)$(DESTPATH)/images/driftbook/ ; 
-	#install -m 644 $(SRCDIR)/driftbook/images/* $(DESTDIR)$(DESTPATH)/images/driftbook ; 
-	#for i in en nb de pt_BR ; do \
-	#	install -d $(DESTDIR)$(DESTPATH)/$$i/driftbook ; \
-	#	install -m 644 $(SRCDIR)/driftbook/driftbok.$$i.* $(DESTDIR)$(DESTPATH)/$$i/driftbook ; \
-	#	install -m 644 $(SRCDIR)/driftbook/netgroups.$$i.* $(DESTDIR)$(DESTPATH)/$$i/driftbook ; \
-	#	ln -s $(DESTPATH)/images/driftbook $(DESTDIR)$(DESTPATH)/$$i/driftbook/images ; \
-	#done
-	
-	# 
 	# IKT bok
 	#
 	for i in en de nl ; do \
diff --git a/todo b/todo
index b908b9e..20a3dde 100644
--- a/todo
+++ b/todo
@@ -29,10 +29,7 @@ so the plan for the docs on svn.d.n is:
 	- document in debian/copyright where it was downloaded from
 
 - newdriftbook
-	- currently its the driftbook, not the newdriftbook
-	- do we want to ship the newdriftbook anyway?
-	- is this still the case?: make after svn co doesnt work yet
-	- document in debian/copyright where it was downloaded from
+	- provide a README.outdated and explain there where to get it
 
 - ikt book
 	- make after svn co doesnt work yet: html versions incomplete (and therefore not copied at all)


hooks/post-receive
-- 
debian-edu-doc.git (Debian package debian-edu-doc)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "debian-edu-doc.git" (Debian package debian-edu-doc).