[debian-edu-commits] [Git][debian-edu/debian-edu-doc][master] 3 commits: scripts/get_manual: save the AllinOne*.xml files in documentation/*/source/...

[Holger Levsen]

Holger Levsen pushed to branch master at Debian Edu / debian-edu-doc


Commits:
381ddbbb by Holger Levsen at 2020-02-26T15:31:26+01:00
scripts/get_manual: save the AllinOne*.xml files in documentation/*/source/ and move existing files there.

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
a457c2e6 by Holger Levsen at 2020-02-26T15:49:59+01:00
d/copyright: add information about scripts/get_manual.

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
99983547 by Holger Levsen at 2020-02-26T15:54:17+01:00
scripts/get_copyright: include AllinOne*.xml files in debian/copyright.

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


10 changed files:

- debian/changelog
- debian/copyright
- debian/copyright.packaging
- documentation/audacity/AllInOne-audacity-manual.xml → documentation/audacity/source/AllInOne-audacity-manual.xml
- documentation/debian-edu-bullseye/AllInOne-debian-edu-bullseye-manual.xml → documentation/debian-edu-bullseye/source/AllInOne-debian-edu-bullseye-manual.xml
- documentation/debian-edu-buster/AllInOne-debian-edu-buster-manual.xml → documentation/debian-edu-buster/source/AllInOne-debian-edu-buster-manual.xml
- documentation/debian-edu-itil/AllInOne-debian-edu-itil-manual.xml → documentation/debian-edu-itil/source/AllInOne-debian-edu-itil-manual.xml
- documentation/rosegarden/AllInOne-rosegarden-manual.xml → documentation/rosegarden/source/AllInOne-rosegarden-manual.xml
- documentation/scripts/get_copyright
- documentation/scripts/get_manual


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+debian-edu-doc (2.11.3) UNRELEASED; urgency=medium
+
+  * scripts/get_manual: save the AllInOne*.xml files in
+    documentation/*/source/ and move existing files there.
+  * scripts/get_copyright: include AllinOne*.xml files in debian/copyright.
+  * d/copyright.packaging:
+    - add information about scripts/get_manual.
+
+ -- Holger Levsen <holger at debian.org>  Wed, 26 Feb 2020 15:30:07 +0100
+
 debian-edu-doc (2.11.2) unstable; urgency=medium
 
   [ Holger Levsen ]


=====================================
debian/copyright
=====================================
@@ -37,6 +37,12 @@ Copyright: 2007 Patrick Winnertz <patrick.winnertz at skolelinux.org>
   2009 Holger Levsen <holger at debian.org>
 License: GPL-2+
 
+Files: documentation/scripts/get_manual
+Copyright: 2008-2020 Holger Levsen <holger at debian.org>
+  2012-2014 David Prévot <taffit at debian.org>
+  2020 Wolfgang Schweer <wschweer at arcor.de>
+License: GPL-2+
+
 Files: documentation/scripts/* documentation/*/README.*translations
 Copyright: 2007-2019 Holger Levsen <holger at debian.org>
   2012 David Prévot <taffit at debian.org>
@@ -58,7 +64,7 @@ Copyright:  2006-2019 Holger Levsen <holger at debian.org>
   2004-2007 Frode Jemtland <frode.jemtland at skolelinux.no>
 License: GPL-2+
 
-Files: documentation/audacity/audacity-manual.xml documentation/audacity/audacity-manual.pot
+Files: documentation/audacity/audacity-manual.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+
@@ -130,7 +136,7 @@ Files: documentation/audacity/audacity-manual.pt_PT.po
 Copyright: 2019 Manuela Silva
 License: GPL-2+
 
-Files: documentation/debian-edu-bullseye/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/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ß
@@ -244,7 +250,7 @@ Files: documentation/debian-edu-bullseye/debian-edu-bullseye-manual.ro.po
 Copyright: 2019 Catalin Ene
 License: GPL-2+
 
-Files: documentation/debian-edu-buster/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/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ß
@@ -359,7 +365,7 @@ Files: documentation/debian-edu-buster/debian-edu-buster-manual.ro.po
 Copyright: 2019 Catalin Ene
 License: GPL-2+
 
-Files: documentation/debian-edu-itil/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/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
@@ -391,7 +397,7 @@ Files: documentation/debian-edu-itil/debian-edu-itil-manual.zh_Hant.po
 Copyright: 2019 Louies
 License: GPL-2+
 
-Files: documentation/rosegarden/rosegarden-manual.xml documentation/rosegarden/rosegarden-manual.pot
+Files: documentation/rosegarden/rosegarden-manual.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
=====================================
@@ -37,6 +37,12 @@ Copyright: 2007 Patrick Winnertz <patrick.winnertz at skolelinux.org>
   2009 Holger Levsen <holger at debian.org>
 License: GPL-2+
 
+Files: documentation/scripts/get_manual
+Copyright: 2008-2020 Holger Levsen <holger at debian.org>
+  2012-2014 David Prévot <taffit at debian.org>
+  2020 Wolfgang Schweer <wschweer at arcor.de>
+License: GPL-2+
+
 Files: documentation/scripts/* documentation/*/README.*translations
 Copyright: 2007-2019 Holger Levsen <holger at debian.org>
   2012 David Prévot <taffit at debian.org>


=====================================
documentation/audacity/AllInOne-audacity-manual.xml → documentation/audacity/source/AllInOne-audacity-manual.xml
=====================================


=====================================
documentation/debian-edu-bullseye/AllInOne-debian-edu-bullseye-manual.xml → documentation/debian-edu-bullseye/source/AllInOne-debian-edu-bullseye-manual.xml
=====================================


=====================================
documentation/debian-edu-buster/AllInOne-debian-edu-buster-manual.xml → documentation/debian-edu-buster/source/AllInOne-debian-edu-buster-manual.xml
=====================================


=====================================
documentation/debian-edu-itil/AllInOne-debian-edu-itil-manual.xml → documentation/debian-edu-itil/source/AllInOne-debian-edu-itil-manual.xml
=====================================


=====================================
documentation/rosegarden/AllInOne-rosegarden-manual.xml → documentation/rosegarden/source/AllInOne-rosegarden-manual.xml
=====================================


=====================================
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/$cdir.pot\n";
+		$buffer = "Files: documentation/$short/$cdir.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
=====================================
@@ -49,7 +49,7 @@ xmlfile=$name.xml
 # Get the docbook type manual from the wiki and store a copy as source before
 # modifying the file.
 PERL_LWP_SSL_VERIFY_HOSTNAME=0 GET -H User-Agent: "${url}AllInOne?action=show&mimetype=text/docbook"|
-tee AllInOne-$name.xml |
+tee source/AllInOne-$name.xml |
 
 # remove AllInOne page related additions from links
 sed "s%$path1/AllInOne/%%g" |



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/9c0b94d1ec16557f88d7b541e3f318f230ead9d2...999835478e3e188f6d0ba6b1b63eab708df76c76

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/9c0b94d1ec16557f88d7b541e3f318f230ead9d2...999835478e3e188f6d0ba6b1b63eab708df76c76
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/20200226/3edfa1a5/attachment-0001.html>