[debian-edu-commits] [Git][debian-edu/debian-edu-doc][master] 7 commits: debian/control: Add myself to uploaders. Thanks to Holger for maintaining this package for so long.
Mike Gabriel (@sunweaver)
gitlab at salsa.debian.org
Sun Apr 13 22:24:07 BST 2025
Mike Gabriel pushed to branch master at Debian Edu / debian-edu-doc
Commits:
36d3dcf2 by Mike Gabriel at 2025-04-13T21:58:37+02:00
debian/control: Add myself to uploaders. Thanks to Holger for maintaining this package for so long.
- - - - -
c4610a93 by Wolfgang Schweer at 2025-04-13T22:04:31+02:00
adjust Makefile.common to get rid of build artefacts. Closes: #1049716
- - - - -
50e3eb14 by Wolfgang Schweer at 2025-04-13T22:05:57+02:00
debian/clean: Clean-up debian/debian-edu-doc-*/ before a new build.
- - - - -
6f2eb65a by Mike Gabriel at 2025-04-13T22:34:24+02:00
debian/copyright: Use new FSF mailing address.
- - - - -
93d22dce by Mike Gabriel at 2025-04-13T22:34:32+02:00
debian/copyright.license: Use new FSF mailing address.
- - - - -
e0b2b548 by Mike Gabriel at 2025-04-13T22:34:32+02:00
debian/mail_stats_to_list: Use new FSF mailing address.
- - - - -
5594b470 by Mike Gabriel at 2025-04-13T23:23:28+02:00
release as 2.12.27
Signed-off-by: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
- - - - -
7 changed files:
- debian/changelog
- + debian/clean
- debian/control
- debian/copyright
- debian/copyright.licence
- debian/mail_stats_to_list
- documentation/common/Makefile.common
Changes:
=====================================
debian/changelog
=====================================
@@ -1,9 +1,49 @@
-debian-edu-doc (2.12.27) UNRELEASED; urgency=medium
+debian-edu-doc (2.12.27) unstable; urgency=medium
- * Start 2.12.27 development. d/changelog entries will be written on
- release using the git commit messages.
+ * Debian Edu Bookworm manual translation updates:
+ - de: Moonwalk4797
+ - zh-cn: SWfeiyu, Cube Kassaki
+ - ro: Remus-Gabriel Chelu
+ - uk: Dominic “Dee.” Furber, Serhii Horichenko
+ - ta: தமிழ்நேரம்
+
+ * Debian Edu Bullseye manual translation updates:
+ - ro: Remus-Gabriel Chelu
+ - uk: Hotripak, Serhii Horichenko
+
+ [ Frans Spiesschaert ]
+ * Add debian-edu-bullseye-manual.ta.add while the Tamil debian edu bullseye
+ anual translation passed the 15% threshold.
+ * Make tamil debian-edu-bookworm manual build again.
+ * Add language specific date formatting for pt, zh-cn, ta, and id.
+ * Trying to fix jenkins build failure for tamil debian edu bookworm manual
+ translation.
+ * Add texlive-lang-other to README.common-translations as it is needed to
+ build Indonesian pdf file.
+ * Temporarily remove Tamil manual as long as it fails to build due to several
+ XML issues.
+
+ [ наб ]
+ * d/control: remove unused Build-Depends-Indep: ldp-docbook-xsl
+
+ [ Wolfgang Schweer ]
+ * Makefile.common: Correct shell command related syntax to fix hanging build
+ process. (Closes: #1102925).
+ * debian/clean: Clean-up debian/debian-edu-doc-*/ before a new build.
+ * Adjust Makefile.common to get rid of build artefacts. (Closes: #1049716).
+
+ [ Holger Levsen ]
+ * Remove myself from uploaders as discussed during FOSDEM. It was a pleasure
+ and an honor!
+
+ [ Mike Gabriel ]
+ * Add myself to uploaders. Thanks to Holger for maintaining this package for
+ so long.
+ * debian/mail_stats_to_list: Use new FSF mailing address.
+ * debian/copyright: Use new FSF mailing address.
+ * debian/copyright.license: Use new FSF mailing address.
- -- Holger Levsen <holger at debian.org> Fri, 29 Mar 2024 14:36:11 +0100
+ -- Mike Gabriel <sunweaver at debian.org> Sun, 13 Apr 2025 21:56:34 +0200
debian-edu-doc (2.12.26) unstable; urgency=medium
=====================================
debian/clean
=====================================
@@ -0,0 +1 @@
+debian/debian-edu-doc-*/
=====================================
debian/control
=====================================
@@ -28,6 +28,8 @@ Build-Depends-Indep: dblatex,
fonts-ipafont-gothic, fonts-ipaexfont-gothic,
unzip
Maintainer: Debian Edu Developers <debian-edu at lists.debian.org>
+Uploaders:
+ Mike Gabriel <sunweaver at debian.org>,
Standards-Version: 4.6.2
Rules-Requires-Root: no
Homepage: https://wiki.debian.org/DebianEdu/Documentation/Bookworm
=====================================
debian/copyright
=====================================
@@ -245,8 +245,8 @@ License: GPL-2+
.
You should have received a copy of the GNU General Public
License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA 02110-1301 USA
+ Software Foundation, Inc., 31 Milk Street, # 960789,
+ Boston, MA 02196, USA
.
On Debian systems, the full text of the GNU General Public
License version 2 can be found in the file
@@ -265,7 +265,7 @@ License: GPL-3+
.
You should have received a copy of the GNU General Public License
along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ Foundation, Inc., 31 Milk Street, # 960789, Boston, MA 02196, USA
.
On Debian systems, the complete text of the GNU General
Public License 3 can be found in `/usr/share/common-licenses/GPL-3'.
=====================================
debian/copyright.licence
=====================================
@@ -13,8 +13,8 @@ License: GPL-2+
.
You should have received a copy of the GNU General Public
License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA 02110-1301 USA
+ Software Foundation, Inc., 31 Milk Street, # 960789,
+ Boston, MA 02196, USA
.
On Debian systems, the full text of the GNU General Public
License version 2 can be found in the file
@@ -33,7 +33,7 @@ License: GPL-3+
.
You should have received a copy of the GNU General Public License
along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ Foundation, Inc., 31 Milk Street, # 960789, Boston, MA 02196, USA
.
On Debian systems, the complete text of the GNU General
Public License 3 can be found in `/usr/share/common-licenses/GPL-3'.
=====================================
debian/mail_stats_to_list
=====================================
@@ -14,7 +14,7 @@
#
# 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.,
-# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# 31 Milk Street, # 960789, Boston, MA 02196, USA
#
# send reminders about the status of the package
=====================================
documentation/common/Makefile.common
=====================================
@@ -67,8 +67,15 @@ build: build-html build-epub
ifndef LINGUA
build-xml:
+ # keep unmodified files for later use
+ for f in $(LANGUAGES) ; do \
+ cp $(name).$$f.po $(name).$$f.po.orig ; \
+ done
+ cp $(name).pot $(name).pot.orig
# create localized XML files
po4a --msgmerge-opt --no-location po4a.cfg
+ # keep unmodified file for later use
+ cp $(name).xml $(name).xml.orig
# rewrap the PO file just to be sure
msgcat --no-location -o $(name).pot $(name).pot
# special case English master file
@@ -100,11 +107,17 @@ build-xml:
sed -i $(SED_102) $(name).$$f.xml ; \
fi ; \
done
+ # restore modified PO files
+ for f in $(LANGUAGES) ; do \
+ cp $(name).$$f.po.orig $(name).$$f.po ; \
+ done
else
build-xml:
# create the localized XML file
po4a --translate-only $(name).$(LINGUA).xml po4a.cfg
# rewrap the PO file just to be sure
+ # but keep the unmodified file for later use
+ cp $(name).$(LINGUA).po $(name).$(LINGUA).po.orig
msgcat -o $(name).$(LINGUA).po $(name).$(LINGUA).po
# modify localized XML file
if [ -e $(name).$(LINGUA).xml ] ; then \
@@ -130,6 +143,7 @@ build-xml:
sed -i $(SED_101) $(name).$(LINGUA).xml ; \
sed -i $(SED_102) $(name).$(LINGUA).xml ; \
fi
+ mv $(name).$(LINGUA).po.orig $(name).$(LINGUA).po
endif
ifndef LINGUA
@@ -290,3 +304,10 @@ clean:
rm -f *.po~
rm -rf images-tmp
rm -f .collapsed.$(name).*.xml
+ # restore possibly modified POT and XML files
+ if [ -e $(name).pot.orig ] ; then \
+ mv $(name).pot.orig $(name).pot ; \
+ fi ; \
+ if [ -e $(name).xml.orig ] ; then \
+ mv $(name).xml.orig $(name).xml ; \
+ fi
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/d1056b1d9e22f8f983fb901602cc7e17ae02a9a2...5594b4706931657a65265b288e7b81e703bb5567
--
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/d1056b1d9e22f8f983fb901602cc7e17ae02a9a2...5594b4706931657a65265b288e7b81e703bb5567
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/20250413/23971a08/attachment-0001.htm>
More information about the debian-edu-commits
mailing list