[debian-edu-commits] debian-edu/ 02/04: Wrap and sort
David Prévot
taffit at moszumanska.debian.org
Sat Oct 4 18:13:54 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository debian-edu-doc.
commit 5e39c3d637781e209ee3610df151acd10ea7859b
Author: David Prévot <taffit at debian.org>
Date: Sat Oct 4 14:07:08 2014 -0400
Wrap and sort
Git-Dch: Ignore
---
debian/control | 40 ++++++++++++++++++++++++++--------------
debian/copyright | 6 +++---
2 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/debian/control b/debian/control
index 941beb0..0b5a2e7 100644
--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,30 @@
Source: debian-edu-doc
Section: doc
Priority: optional
-Build-Depends: debhelper (>= 5)
-Build-Depends-Indep: docbook-utils, poxml, ldp-docbook-xsl, dblatex, po4a,
- gsfonts, lmodern, texlive-xetex,
- fonts-arphic-gbsn00lp, fonts-arphic-bsmi00lp, fonts-wqy-zenhei | ttf-wqy-zenhei,
- texlive-lang-cyrillic, texlive-lang-danish, texlive-lang-spanish,
- texlive-lang-french, texlive-lang-german, texlive-lang-italian,
- texlive-lang-norwegian, texlive-lang-dutch, imagemagick,
- dbtoepub
+Build-Depends: debhelper (>= 5)
+Build-Depends-Indep: dblatex,
+ dbtoepub,
+ docbook-utils,
+ fonts-arphic-bsmi00lp,
+ fonts-arphic-gbsn00lp,
+ fonts-wqy-zenhei | ttf-wqy-zenhei,
+ gsfonts,
+ imagemagick,
+ ldp-docbook-xsl,
+ lmodern,
+ po4a,
+ poxml,
+ texlive-lang-cyrillic,
+ texlive-lang-danish,
+ texlive-lang-dutch,
+ texlive-lang-french,
+ texlive-lang-german,
+ texlive-lang-italian,
+ texlive-lang-norwegian,
+ texlive-lang-spanish,
+ texlive-xetex
Maintainer: Debian Edu Developers <debian-edu at lists.debian.org>
-Uploaders: Holger Levsen <holger at debian.org>,
- David Prévot <taffit at debian.org>
+Uploaders: Holger Levsen <holger at debian.org>, David Prévot <taffit at debian.org>
Standards-Version: 3.9.5
Homepage: http://wiki.debian.org/DebianEdu/Documentation/Squeeze
Vcs-Git: git://anonscm.debian.org/debian-edu/debian-edu-doc.git
@@ -22,7 +35,7 @@ Depends: ${misc:Depends}
Architecture: all
Description: English documentation from the Debian Edu project
The English version of the manual for the Wheezy and Jessie based release of
- the Debian Edu / Skolelinux project is included in this package, as well as
+ the Debian Edu / Skolelinux project is included in this package, as well as
the Rosegarden and Audacity manuals.
.
Debian Edu is a Debian project to make the best distribution for educational
@@ -50,7 +63,7 @@ Description: Dutch documentation from the Debian Edu project
Debian Edu is a Debian project to make the best distribution for educational
purposes. Skolelinux is the name of the Custom Debian Distribution which is
produced by the Debian Edu project.
-
+
Package: debian-edu-doc-de
Depends: debian-edu-doc-en, ${misc:Depends}
Architecture: all
@@ -61,7 +74,7 @@ Description: German documentation from the Debian Edu project
Debian Edu is a Debian project to make the best distribution for educational
purposes. Skolelinux is the name of the Custom Debian Distribution which is
produced by the Debian Edu project.
-
+
Package: debian-edu-doc-es
Depends: debian-edu-doc-en, ${misc:Depends}
Architecture: all
@@ -108,4 +121,3 @@ Description: French documentation from the Debian Edu project
Debian Edu is a Debian project to make the best distribution for educational
purposes. Skolelinux is the name of the Custom Debian Distribution which is
produced by the Debian Edu project.
-
diff --git a/debian/copyright b/debian/copyright
index 10613cf..4a94b1b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,11 +3,11 @@ Upstream-Name: debian-edu-doc
Upstream-Source: git://anonscm.debian.org/debian-edu/debian-edu-doc.git
Files: documentation/rosegarden/images/*
-Copyright: 2008 Alf Tonny Bätz <alfton at gmail.com>
+Copyright: 2008 Alf Tonny Bätz <alfton at gmail.com>
License: GPL-2+
Files: documentation/audacity/images/*
-Copyright: 2008, 2009 Alf Tonny Bätz <alfton at gmail.com>
+Copyright: 2008, 2009 Alf Tonny Bätz <alfton at gmail.com>
License: GPL-2+
Files: documentation/debian-edu-*/images/*
@@ -39,7 +39,7 @@ License: GPL-2+
Files: debian/*
Copyright: 2006-2009 Holger Levsen <holger at debian.org>
- 2004-2007 Mari Wang <mariwan at ifi.uio.no>
+ 2004-2007 Mari Wang <mariwan at ifi.uio.no>
2004-2007 Steffen Jöris <Steffen.Joeris at skolelinux.de>
2004-2007 Frode Jemtland <frode.jemtland at skolelinux.no>
License: GPL-2+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-doc.git
More information about the debian-edu-commits
mailing list