[debian-edu-commits] debian-edu/debian-edu-doc.git (#8) - wheezy (branch) updated: 24d4b6b46771a4a884b558c5b3e2f7ce9608f72d

David Prévot taffit at alioth.debian.org
Sat Oct 5 12:11:15 UTC 2013 

The branch, wheezy has been updated
       via  24d4b6b46771a4a884b558c5b3e2f7ce9608f72d (commit)
      from  97c60e27c53c807cd1fd8ac3be52cb9a3492af0f (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 |   20 ++++++++++----------
 debian/control   |    3 ++-
 debian/copyright |   35 +++++++++++++++++++++--------------
 debian/rules     |   27 ++++++++++++++-------------
 4 files changed, 47 insertions(+), 38 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index e5b1bd3..afdb32a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,6 @@
-debian-edu-doc (0.3) terra; urgency=low
-
-  [ Holger Levsen ]
-  * Added myself to uploaders.
-
- -- Holger Levsen <holger at debian.org>  Fri, 27 Apr 2007 14:33:56 +0200
-
-debian-edu-doc (0.2) terra; urgency=low
+debian-edu-doc (0.2) unstable; urgency=low
 
   [ Steffen Joeris ]
-  * Initial upload to Debian (Closes Skolelinux Bug #834)
   * Update maintainer as the team maintains it
   * Drop useless build-depends against debconf
   * Put all the content into the package
@@ -25,7 +17,15 @@ debian-edu-doc (0.2) terra; urgency=low
   [ Luk Claes ]
   * Added myself to uploaders.
 
- -- Luk Claes <luk at debian.org>  Sun, 19 Nov 2006 16:55:31 +0100
+  [ Holger Levsen ]
+  * Added myself to uploaders.
+  * Initial upload to Debian (Closes Skolelinux Bug #834)
+  * Updated description in debian/control
+  * removed the old driftbook and it's images
+  * put the names of the copyright holders into debian/copyright
+    (not finished yet)
+
+ -- Holger Levsen <holger at debian.org>  Sun,  6 May 2007 20:29:34 +0200
 
 debian-edu-doc (0.1-4+svn46790) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 6db2d6d..1d3cd07 100644
--- a/debian/control
+++ b/debian/control
@@ -12,5 +12,6 @@ Section: doc
 Priority: optional
 Architecture: all
 Description: Documentation from the debian-edu project
- The important documentation from the debian-edu project is in this package
+ All documentation for the debian-edu / Skolelinux project is supposed to be 
+ in this package.
 
diff --git a/debian/copyright b/debian/copyright
index 048f4f8..6d12f04 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,18 +1,25 @@
-This is the debian-edu-doc package.
+This is the debian-edu-doc package. 
 
-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.
+It was packaged by Mari Wang <mariw at ifi.uio.no>, Steffen Jöris 
+(Steffen.Joeris at skolelinux.de), Frode Jemtland <frode.jemtland at skolelinux.no> 
+and Holger Levsen (holger at debian.org). The packaging is licenced under the GPL version2 or at your option, any later version. [licence text/pointer here]
+ 
 
-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.
+The files in documentation/architecture are copyright 2002 by 
+Petter Reinholdtsen and are licenced under...
 
-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 St, Fifth Floor, Boston, MA  02110-1301  USA
+[licence text/pointer here]
 
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The files in documentation/old/IKT/ are written by? and licenced?
+
+[licence text/pointer here]
+
+
+The files in documentation/norwegian/kurs are written and copyrighted 2003 
+by Knut Yrvin (knuty at skolelinux.no), Harald Thingelstad (harald at skolelinux.no)
+and Klaus Ade Johnstad (klaus.johnstad at holmlia.gs.oslo.no) and are licenced 
+under licensed under the GFDL - [hopefully with invariant sections, need to 
+be checked by someone who speaks norwegian]
+
+[licence text/pointer here]
diff --git a/debian/rules b/debian/rules
index 19da45c..6aeceaa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,19 +30,20 @@ install: build
 	install -m 644 $(SRCDIR)/architecture/* $(DESTDIR)$(DESTPATH)/no/architecture
 
 # drift
-	install -d $(DESTDIR)$(DESTPATH)/no/drift
-	install -m 644 $(SRCDIR)/drift/*html $(DESTDIR)$(DESTPATH)/no/drift
-	install -m 644 $(SRCDIR)/drift/driftbok.sgml \
-		$(DESTDIR)$(DESTPATH)/no/drift
-	install -m 644 $(SRCDIR)/drift/netgroups.sgml \
-		$(DESTDIR)$(DESTPATH)/no/drift
-	install -d $(DESTDIR)$(DESTPATH)/no/drift/images
-	install -m 644 $(SRCDIR)/drift/images/* \
-		$(DESTDIR)$(DESTPATH)/no/drift/images
-	-docbook2html $(DESTDIR)$(DESTPATH)/drift/driftbok.sgml \
-		-o $(DESTDIR)$(DESTPATH)/no/drift
-	-docbook2pdf  $(DESTDIR)$(DESTPATH)/drift/driftbok.sgml \
-		-o $(DESTDIR)$(DESTPATH)/no/drift
+
+#	install -d $(DESTDIR)$(DESTPATH)/no/drift
+#	install -m 644 $(SRCDIR)/drift/*html $(DESTDIR)$(DESTPATH)/no/drift
+#	install -m 644 $(SRCDIR)/drift/driftbok.sgml \
+#		$(DESTDIR)$(DESTPATH)/no/drift
+#	install -m 644 $(SRCDIR)/drift/netgroups.sgml \
+#		$(DESTDIR)$(DESTPATH)/no/drift
+#	install -d $(DESTDIR)$(DESTPATH)/no/drift/images
+#	install -m 644 $(SRCDIR)/drift/images/* \
+#		$(DESTDIR)$(DESTPATH)/no/drift/images
+#	-docbook2html $(DESTDIR)$(DESTPATH)/drift/driftbok.sgml \
+#		-o $(DESTDIR)$(DESTPATH)/no/drift
+#	-docbook2pdf  $(DESTDIR)$(DESTPATH)/drift/driftbok.sgml \
+#		-o $(DESTDIR)$(DESTPATH)/no/drift
 
 # kurs
 	install -d $(DESTDIR)$(DESTPATH)/no/kurs


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).

More information about the debian-edu-commits mailing list