[debian-edu-commits] [Git][debian-edu/debian-edu-doc][master] 6 commits: Add stripped XML file to the related copyright information.
Wolfgang Schweer
gitlab at salsa.debian.org
Thu Aug 20 21:44:02 BST 2020
Wolfgang Schweer pushed to branch master at Debian Edu / debian-edu-doc
Commits:
6d3e392f by Wolfgang Schweer at 2020-08-20T21:59:21+02:00
Add stripped XML file to the related copyright information.
Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>
- - - - -
afd47878 by Wolfgang Schweer at 2020-08-20T22:00:38+02:00
Adjust/add copyright information for various files.
Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>
- - - - -
63d780c2 by Wolfgang Schweer at 2020-08-20T22:02:15+02:00
Cleanup debian/source/lintian-overrides file from unused entries.
Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>
- - - - -
698bb48d by Wolfgang Schweer at 2020-08-20T22:07:48+02:00
debian/copyright: Updated running 'make update-copyright'.
Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>
- - - - -
a63224c1 by Wolfgang Schweer at 2020-08-20T22:10:10+02:00
documentation/scripts/get_manual: Add code to exclude the GPL from being translated.
Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>
- - - - -
2a8e1a52 by Wolfgang Schweer at 2020-08-20T22:42:50+02:00
Update debian/changelog file to reflect last commits.
Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>
- - - - -
6 changed files:
- debian/changelog
- debian/copyright
- debian/copyright.packaging
- debian/source/lintian-overrides
- documentation/scripts/get_copyright
- documentation/scripts/get_manual
Changes:
=====================================
debian/changelog
=====================================
@@ -29,11 +29,15 @@ debian-edu-doc (2.11.11) UNRELEASED; urgency=medium
manuals.
* documentation/*/: Adjust po4a.cfg files for all manuals to use addendum
files if available. Also clean up these files from outdated settings..
- * Adjust generation of the debian/copyright file now that Po4a is used to
- credit translator contributions:
- - debian/copyright.packaging: Add information for PO and addendum files.
- - documentation/scripts/get_copyright: drop translations related code.
+ * Adjust generation of the debian/copyright file.
+ - debian/copyright.packaging: Add information for PO and addendum files to
+ credit translators; adjust copyright information for various files and
+ also add information for files without copyright information.
+ - documentation/scripts/get_copyright: drop translations related code, add
+ stripped XML file which is now generated via 'scripts/get_manual'.
- debian/copyright: Generated after running 'make update-copyright'.
+ * debian/source/lintian-overrides: Cleanup from removed 'todo' file and
+ entries that now have copyright information in 'debian/copyright.packaging'.
[ Frans Spiesschaert ]
* documentation/scripts/get_manual: Add the capability of filtering out
=====================================
debian/copyright
=====================================
@@ -2,6 +2,13 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: debian-edu-doc
Upstream-Source: https://salsa.debian.org/debian-edu/debian-edu-doc.git
+Files: Makefile
+Copyright: 2007 Petter Reinholdtsen <pere at hungry.com>
+ 2007-2020 Holger Levsen <holger at debian.org>
+ 2012 David Prévot <taffit at debian.org>
+ 2020 Wolfgang Schweer <wschweer at arcor.de>
+License: GPL-2+
+
Files: debian/*
Copyright: 2006-2020 Holger Levsen <holger at debian.org>
2004-2007 Mari Wang <mariwan at ifi.uio.no>
@@ -17,7 +24,16 @@ License: GPL-2+
Files: documentation/scripts/* documentation/*/README.*translations
Copyright: 2007-2020 Holger Levsen <holger at debian.org>
2012-2014 David Prévot <taffit at debian.org>
- 2020 Wolfgang Schweer <wschweer at arcor.de>
+ 2015 Petter Reinholdtsen <pere at hungry.com>
+ 2015, 2020 Wolfgang Schweer <wschweer at arcor.de>
+ 2020 Frans Spiesschaert <Frans.Spiesschaert at yucom.be>
+License: GPL-2+
+
+Files: documentation/common/Makefile.common
+Copyright: 2012 David Prévot <taffit at debian.org>
+ 2014 Petter Reinholdtsen <pere at hungry.com>
+ 2014, 2020 Holger Levsen <holger at debian.org>
+ 2014, 2016, 2018-2020 Wolfgang Schweer <wschweer at arcor.de>
License: GPL-2+
Files: documentation/common/edu.css.xml
@@ -29,6 +45,17 @@ Copyright: 2016 Victory
2016 Wolfgang Schweer <wschweer at arcor.de>
License: GPL-2+
+Files: documentation/common/html.xsl
+Copyright: 2012 David Prévot <taffit at debian.org>
+ 2014 Wolfgang Schweer <wschweer at arcor.de>
+License: GPL-2+
+
+Files: documentation/audacity/Makefile documentation/debian-edu-*/Makefile documentation/rosegarden/Makefile
+Copyright: 2007 Petter Reinholdtsen <pere at hungry.com>
+ 2007-2020 Holger Levsen <holger at debian.org>
+ 2012-2015 David Prévot <taffit at debian.org>
+License: GPL-2+
+
Files: documentation/rosegarden/images/*
Copyright: 2008 Alf Tonny Bätz <alfton at gmail.com>
License: GPL-2+
@@ -52,7 +79,20 @@ Copyright: 2007-2009 Holger Levsen <holger at debian.org>
2007 José L. Redrejo Rodríguez
2007 John Bildoy
2012 Jürgen Leibner
- 2017, 2018, 2019 Wolfgang Schweer <wschweer at arcor.de>
+ 2017-2020 Wolfgang Schweer <wschweer at arcor.de>
+License: GPL-2+
+
+Files: documentation/rosegarden/po4a.cfg documentation/audacity/po4a.cfg
+Copyright: 2012 David Prévot <taffit at debian.org>
+ 2017, 2020 Wolfgang Schweer <wschweer at arcor.de>
+ 2020 Frans Spiesschaert <Frans.Spiesschaert at yucom.be>
+License: GPL-2+
+
+Files: documentation/debian-edu-*/po4a.cfg
+Copyright: 2012 David Prévot <taffit at debian.org>
+ 2015 Petter Reinholdtsen <pere at hungry.com>
+ 2017, 2020 Wolfgang Schweer <wschweer at arcor.de>
+ 2020 Frans Spiesschaert <Frans.Spiesschaert at yucom.be>
License: GPL-2+
Files: documentation/debian-edu-*/source/Debian_Edu_Network*.odg
@@ -79,12 +119,12 @@ Files: documentation/rosegarden/rosegarden-manual.*.po documentation/rosegarden/
Copyright: Various translators, names contained in the related Po4a addendum file.
License: GPL-2+
-Files: documentation/audacity/audacity-manual.xml documentation/audacity/source/AllInOne-audacity-manual.xml documentation/audacity/audacity-manual.pot
+Files: documentation/audacity/audacity-manual.xml documentation/audacity/audacity-manual-stripped.xml documentation/audacity/source/AllInOne-audacity-manual.xml documentation/audacity/audacity-manual.pot
Copyright: 2008, 2009 Alf Tonny Bätz
2009 Holger Levsen
License: GPL-2+
-Files: documentation/debian-edu-bullseye/debian-edu-bullseye-manual.xml documentation/debian-edu-bullseye/source/AllInOne-debian-edu-bullseye-manual.xml documentation/debian-edu-bullseye/debian-edu-bullseye-manual.pot
+Files: documentation/debian-edu-bullseye/debian-edu-bullseye-manual.xml documentation/debian-edu-bullseye/debian-edu-bullseye-manual-stripped.xml documentation/debian-edu-bullseye/source/AllInOne-debian-edu-bullseye-manual.xml documentation/debian-edu-bullseye/debian-edu-bullseye-manual.pot
Copyright: 2007-2020 Holger Levsen
2001, 2002, 2003, 2004, 2007, 2008, 2009, 2010, 2012, 2014 Petter Reinholdtsen
2007 Daniel Heß
@@ -112,7 +152,7 @@ Copyright: 2007-2020 Holger Levsen
2015 Joe Hansen
License: GPL-2+
-Files: documentation/debian-edu-buster/debian-edu-buster-manual.xml documentation/debian-edu-buster/source/AllInOne-debian-edu-buster-manual.xml documentation/debian-edu-buster/debian-edu-buster-manual.pot
+Files: documentation/debian-edu-buster/debian-edu-buster-manual.xml documentation/debian-edu-buster/debian-edu-buster-manual-stripped.xml documentation/debian-edu-buster/source/AllInOne-debian-edu-buster-manual.xml documentation/debian-edu-buster/debian-edu-buster-manual.pot
Copyright: 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Holger Levsen
2001, 2002, 2003, 2004, 2007, 2008, 2009, 2010, 2012, 2014 Petter Reinholdtsen
2007 Daniel Heß
@@ -140,7 +180,7 @@ Copyright: 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 201
2015 Joe Hansen
License: GPL-2+
-Files: documentation/debian-edu-itil/debian-edu-itil-manual.xml documentation/debian-edu-itil/source/AllInOne-debian-edu-itil-manual.xml documentation/debian-edu-itil/debian-edu-itil-manual.pot
+Files: documentation/debian-edu-itil/debian-edu-itil-manual.xml documentation/debian-edu-itil/debian-edu-itil-manual-stripped.xml documentation/debian-edu-itil/source/AllInOne-debian-edu-itil-manual.xml documentation/debian-edu-itil/debian-edu-itil-manual.pot
Copyright: 2006 Knut Yrvin
2006 Andreas Johansen
2006 Klaus Ade Johnstad
@@ -153,7 +193,7 @@ Copyright: 2006 Knut Yrvin
2015 Ingrid Yrvin
License: GPL-3+
-Files: documentation/rosegarden/rosegarden-manual.xml documentation/rosegarden/source/AllInOne-rosegarden-manual.xml documentation/rosegarden/rosegarden-manual.pot
+Files: documentation/rosegarden/rosegarden-manual.xml documentation/rosegarden/rosegarden-manual-stripped.xml documentation/rosegarden/source/AllInOne-rosegarden-manual.xml documentation/rosegarden/rosegarden-manual.pot
Copyright: 2008, 2009 Alf Tonny Bätz
2008 Holger Levsen
License: GPL-2+
=====================================
debian/copyright.packaging
=====================================
@@ -2,6 +2,13 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: debian-edu-doc
Upstream-Source: https://salsa.debian.org/debian-edu/debian-edu-doc.git
+Files: Makefile
+Copyright: 2007 Petter Reinholdtsen <pere at hungry.com>
+ 2007-2020 Holger Levsen <holger at debian.org>
+ 2012 David Prévot <taffit at debian.org>
+ 2020 Wolfgang Schweer <wschweer at arcor.de>
+License: GPL-2+
+
Files: debian/*
Copyright: 2006-2020 Holger Levsen <holger at debian.org>
2004-2007 Mari Wang <mariwan at ifi.uio.no>
@@ -17,7 +24,16 @@ License: GPL-2+
Files: documentation/scripts/* documentation/*/README.*translations
Copyright: 2007-2020 Holger Levsen <holger at debian.org>
2012-2014 David Prévot <taffit at debian.org>
- 2020 Wolfgang Schweer <wschweer at arcor.de>
+ 2015 Petter Reinholdtsen <pere at hungry.com>
+ 2015, 2020 Wolfgang Schweer <wschweer at arcor.de>
+ 2020 Frans Spiesschaert <Frans.Spiesschaert at yucom.be>
+License: GPL-2+
+
+Files: documentation/common/Makefile.common
+Copyright: 2012 David Prévot <taffit at debian.org>
+ 2014 Petter Reinholdtsen <pere at hungry.com>
+ 2014, 2020 Holger Levsen <holger at debian.org>
+ 2014, 2016, 2018-2020 Wolfgang Schweer <wschweer at arcor.de>
License: GPL-2+
Files: documentation/common/edu.css.xml
@@ -29,6 +45,17 @@ Copyright: 2016 Victory
2016 Wolfgang Schweer <wschweer at arcor.de>
License: GPL-2+
+Files: documentation/common/html.xsl
+Copyright: 2012 David Prévot <taffit at debian.org>
+ 2014 Wolfgang Schweer <wschweer at arcor.de>
+License: GPL-2+
+
+Files: documentation/audacity/Makefile documentation/debian-edu-*/Makefile documentation/rosegarden/Makefile
+Copyright: 2007 Petter Reinholdtsen <pere at hungry.com>
+ 2007-2020 Holger Levsen <holger at debian.org>
+ 2012-2015 David Prévot <taffit at debian.org>
+License: GPL-2+
+
Files: documentation/rosegarden/images/*
Copyright: 2008 Alf Tonny Bätz <alfton at gmail.com>
License: GPL-2+
@@ -52,7 +79,20 @@ Copyright: 2007-2009 Holger Levsen <holger at debian.org>
2007 José L. Redrejo Rodríguez
2007 John Bildoy
2012 Jürgen Leibner
- 2017, 2018, 2019 Wolfgang Schweer <wschweer at arcor.de>
+ 2017-2020 Wolfgang Schweer <wschweer at arcor.de>
+License: GPL-2+
+
+Files: documentation/rosegarden/po4a.cfg documentation/audacity/po4a.cfg
+Copyright: 2012 David Prévot <taffit at debian.org>
+ 2017, 2020 Wolfgang Schweer <wschweer at arcor.de>
+ 2020 Frans Spiesschaert <Frans.Spiesschaert at yucom.be>
+License: GPL-2+
+
+Files: documentation/debian-edu-*/po4a.cfg
+Copyright: 2012 David Prévot <taffit at debian.org>
+ 2015 Petter Reinholdtsen <pere at hungry.com>
+ 2017, 2020 Wolfgang Schweer <wschweer at arcor.de>
+ 2020 Frans Spiesschaert <Frans.Spiesschaert at yucom.be>
License: GPL-2+
Files: documentation/debian-edu-*/source/Debian_Edu_Network*.odg
=====================================
debian/source/lintian-overrides
=====================================
@@ -1,21 +1,7 @@
-debian-edu-doc source: file-without-copyright-information Makefile
-debian-edu-doc source: file-without-copyright-information documentation/audacity/Makefile
debian-edu-doc source: file-without-copyright-information documentation/audacity/fixme-status.txt
-debian-edu-doc source: file-without-copyright-information documentation/audacity/po4a.cfg
-debian-edu-doc source: file-without-copyright-information documentation/common/Makefile.common
-debian-edu-doc source: file-without-copyright-information documentation/common/html.xsl
-debian-edu-doc source: file-without-copyright-information documentation/debian-edu-bullseye/Makefile
debian-edu-doc source: file-without-copyright-information documentation/debian-edu-bullseye/fixme-status.txt
-debian-edu-doc source: file-without-copyright-information documentation/debian-edu-bullseye/po4a.cfg
debian-edu-doc source: file-without-copyright-information documentation/debian-edu-bullseye/version
-debian-edu-doc source: file-without-copyright-information documentation/debian-edu-buster/Makefile
debian-edu-doc source: file-without-copyright-information documentation/debian-edu-buster/fixme-status.txt
-debian-edu-doc source: file-without-copyright-information documentation/debian-edu-buster/po4a.cfg
debian-edu-doc source: file-without-copyright-information documentation/debian-edu-buster/version
-debian-edu-doc source: file-without-copyright-information documentation/rosegarden/Makefile
debian-edu-doc source: file-without-copyright-information documentation/rosegarden/fixme-status.txt
-debian-edu-doc source: file-without-copyright-information documentation/rosegarden/po4a.cfg
-debian-edu-doc source: file-without-copyright-information todo
-debian-edu-doc source: file-without-copyright-information documentation/debian-edu-itil/Makefile
debian-edu-doc source: file-without-copyright-information documentation/debian-edu-itil/fixme-status.txt
-debian-edu-doc source: file-without-copyright-information documentation/debian-edu-itil/po4a.cfg
=====================================
documentation/scripts/get_copyright
=====================================
@@ -82,7 +82,7 @@ while(<FILE>){
$buffer .= copyright($1);
$buffer .= "<!-- END en -->\n";
} else {
- $buffer = "Files: documentation/$short/$cdir.xml documentation/$short/source/AllInOne-$cdir.xml documentation/$short/$cdir.pot\n";
+ $buffer = "Files: documentation/$short/$cdir.xml documentation/$short/$cdir-stripped.xml documentation/$short/source/AllInOne-$cdir.xml documentation/$short/$cdir.pot\n";
$buffer .= "Copyright:".copyright($1);
$buffer .= "License: GPL-$2+\n\n";
}
=====================================
documentation/scripts/get_manual
=====================================
@@ -297,3 +297,7 @@ stripped_xmlfile=$name-stripped.xml
# --remove FIXME: paragraphs
sed -i '/^FIXME:/d' $stripped_xmlfile
+ # --remove GPL; exclude the ITIL manual which doesn't contain it.
+ if [ ! "$name" = "debian-edu-itil-manual" ] ; then
+ sed -ni '1h; 1!H; ${ g; s#<para>This program is free.*CONDITIONS</emphasis>#<para>#p }' $stripped_xmlfile
+ fi
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/d11d238647bab45b2d18563a34a63f3cfbf3ab40...2a8e1a52ea54c03b9a5b01e01b8aa3f204b9018f
--
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/d11d238647bab45b2d18563a34a63f3cfbf3ab40...2a8e1a52ea54c03b9a5b01e01b8aa3f204b9018f
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20200820/ef37b369/attachment-0001.html>
More information about the debian-edu-commits
mailing list