[debian-edu-commits] [Git][debian-edu/debian-edu-artwork][master] 4 commits: Drop art-{buster, softwaves}/g-i/README files

Wolfgang Schweer (@schweer-guest) gitlab at salsa.debian.org
Thu Oct 21 15:16:56 BST 2021



Wolfgang Schweer pushed to branch master at Debian Edu / debian-edu-artwork


Commits:
26f8bb3d by Wolfgang Schweer at 2021-10-21T15:09:47+02:00
Drop art-{buster,softwaves}/g-i/README files

Both ISO image generation and PXE installation setup are using a Debian Edu
specific PNG file for the Debian Installer logo since some time.

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -
1c1bec6a by Wolfgang Schweer at 2021-10-21T15:27:36+02:00
Add autopkgtest to validate SVG and XML files, taken from src:desktop-base

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -
8522150b by Wolfgang Schweer at 2021-10-21T15:40:47+02:00
d/copyright: Update some years, order entries by date, and add Aurélien Couderc

Aurélien added the autopkgtest to src:desktop-base some time ago, these tests
are now also used unmodified for src:debian-edu-artwork.

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -
077dcfbf by Wolfgang Schweer at 2021-10-21T15:52:38+02:00
debian/control: Improve descriptions for binary packages

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -


9 changed files:

- − art-buster/g-i/README
- − art-softwaves/g-i/README
- debian/changelog
- debian/control
- debian/copyright
- + debian/tests/control
- + debian/tests/validate-svgs-xmllint
- + debian/tests/validate-xmls-lint
- + debian/tests/xmllint-functions


Changes:

=====================================
art-buster/g-i/README deleted
=====================================
@@ -1,12 +0,0 @@
-We should find a way to replace the banner image used in the graphical
-version of the debian installer.  The image used by g-i is
-/usr/share/graphics/logo_debian.png from the rootskel-gtk package.
-It  is a PNG image data, 800 x 75, 8-bit/color RGBA, non-interlaced.
-
-It is unknown how to properly replace it in a custom debian distribution..
-Perhaps we need to make our own g-i boot images to make it happen.
-
-An idea is to modify debian-cd to append a compressed cpio archive with
-this replacement file to the initrd.gz file used when booting g-i.  It
-will then replace the original file when the initrd is unpackaged into
-memory.


=====================================
art-softwaves/g-i/README deleted
=====================================
@@ -1,12 +0,0 @@
-We should find a way to replace the banner image used in the graphical
-version of the debian installer.  The image used by g-i is
-/usr/share/graphics/logo_debian.png from the rootskel-gtk package.
-It  is a PNG image data, 800 x 75, 8-bit/color RGBA, non-interlaced.
-
-It is unknown how to properly replace it in a custom debian distribution..
-Perhaps we need to make our own g-i boot images to make it happen.
-
-An idea is to modify debian-cd to append a compressed cpio archive with
-this replacement file to the initrd.gz file used when booting g-i.  It
-will then replace the original file when the initrd is unpackaged into
-memory.


=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+debian-edu-artwork (2.12.0.2-1) UNRELEASED; urgency=medium
+
+  * Drop art-{buster,softwaves}/g-i/README files: Both ISO image generation
+    and PXE installation setup are using a Debian Edu specific PNG file for the
+    Debian Installer logo since some time.
+  * Add autopkgtest to validate SVG and XML files, taken from src:desktop-base.
+  * debian/copyright: Update some years, order entries by date, and also add
+    Aurélien Couderc (autopkgtest).
+  * debian/control: Improve descriptions for binary packages.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Thu, 21 Oct 2021 14:59:07 +0200
+
 debian-edu-artwork (2.12.0.1-1) unstable; urgency=medium
 
   [ Wolfgang Schweer ]


=====================================
debian/control
=====================================
@@ -35,7 +35,7 @@ Enhances: gdm3,
           slim,
 Description: Debian Edu themes and artwork
  This package contains a collection of images, themes, wallpapers and splash
- screens for use with Debian Edu.
+ screens for use with Debian Edu, a Debian Pure Blend.
  .
  This package contains files that all Debian Edu themes have in common.
 
@@ -46,7 +46,7 @@ Depends: ${misc:Depends},
 Recommends: debian-edu-artwork,
 Description: Debian Edu softWaves ("stretch") theme and artwork
  The Debian Edu Artwork package set provides a collection of images, themes,
- wallpapers and splash screens for use with Debian Edu.
+ wallpapers and splash screens for use with Debian Edu, a Debian Pure Blend.
  .
  This package contains all files for the Debian Edu Softwaves artwork for the
  "stretch" based release.
@@ -59,7 +59,7 @@ Recommends: debian-edu-artwork,
             fonts-quicksand,
 Description: Debian Edu futurePrototype "buster" theme and artwork
  The Debian Edu Artwork package set provides a collection of images, themes,
- wallpapers and splash screens for use with Debian Edu.
+ wallpapers and splash screens for use with Debian Edu, a Debian Pure Blend.
  .
  This package contains all files for the Debian Edu artwork for the "buster"
  based release.
@@ -71,7 +71,7 @@ Depends: ${misc:Depends},
 Recommends: debian-edu-artwork
 Description: Debian Edu Homeworld "bullseye" theme and artwork
  The Debian Edu Artwork package set provides a collection of images, themes,
- wallpapers and splash screens for use with Debian Edu.
+ wallpapers and splash screens for use with Debian Edu, a Debian Pure Blend.
  .
  This package contains all files for the Debian Edu artwork for the "bullseye"
  based release.


=====================================
debian/copyright
=====================================
@@ -5,11 +5,12 @@ Source: https://salsa.debian.org/debian-edu/debian-edu-artwork
 
 Files: *
 Copyright: 2005-2014, Petter Reinholdtsen <pere at debian.org>
+ 2007-2021, Holger Levsen <holger at layer-acht.org>
+ 2010-2011, Andreas B. Mundt <andi.mundt at web.de>
  2011-2013, Christoph Muetze <gizmo at pixelz.de>
- 2011, Andreas B. Mundt <andi.mundt at web.de>
- 2007-2020, Holger Levsen <holger at layer-acht.org>
- 2012-2020, Wolfgang Schweer <schweer at arcor.de>
- 2014, Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+ 2011, 2014, 2018-2020, Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+ 2012-2021, Wolfgang Schweer <schweer at arcor.de>
+ 2021, Aurélien COUDERC <coucouf at debian.org>
 License: GPL-2+
 
 License: GPL-2+


=====================================
debian/tests/control
=====================================
@@ -0,0 +1,2 @@
+Tests: validate-xmls-lint, validate-svgs-xmllint
+Depends: libxml2-utils


=====================================
debian/tests/validate-svgs-xmllint
=====================================
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+dir_name=$(dirname $0)
+. ${dir_name}/xmllint-functions
+
+XML_FILE_PATTERN="*.svg"
+XML_LINT_SUMMARY="svgs-xmllint-summary.csv"
+if [[ -n ${AUTOPKGTEST_ARTIFACTS} ]] ; then
+    XML_LINT_SUMMARY="${AUTOPKGTEST_ARTIFACTS}/${XML_LINT_SUMMARY}"
+fi
+
+
+xml_lint_command="lint_xmls ${XML_FILE_PATTERN} ${XML_LINT_SUMMARY}"
+echo "$0: running '${xml_lint_command}'..."
+${xml_lint_command}
+xml_lint_result=$?
+
+echo "$0: '${xml_lint_command}' returned ${xml_lint_result}"
+
+
+exit ${xml_lint_result}
+


=====================================
debian/tests/validate-xmls-lint
=====================================
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+dir_name=$(dirname $0)
+. ${dir_name}/xmllint-functions
+
+XML_FILE_PATTERN="*.xml"
+XML_LINT_SUMMARY="xmls-lint-summary.csv"
+if [[ -n ${AUTOPKGTEST_ARTIFACTS} ]] ; then
+    XML_LINT_SUMMARY="${AUTOPKGTEST_ARTIFACTS}/${XML_LINT_SUMMARY}"
+fi
+
+
+xml_lint_command="lint_xmls ${XML_FILE_PATTERN} ${XML_LINT_SUMMARY}"
+echo "$0: running '${xml_lint_command}'..."
+${xml_lint_command}
+xml_lint_result=$?
+
+echo "$0: '${xml_lint_command}' returned ${xml_lint_result}"
+
+
+exit ${xml_lint_result}
+


=====================================
debian/tests/xmllint-functions
=====================================
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+lint_xmls() {
+    local xml_file_pattern=$1
+    local xml_lint_summary=$2
+
+    if [ "$#" -ne 2 ] ; then
+        echo "$0: wrong number of arguments."
+        echo "Expected:"
+        echo "    $0 xml_file_pattern summary_file_name"
+        return 255
+    fi
+
+    echo "Running xmllint for pattern '${xml_file_pattern}'"
+    echo "Current directory is '$(pwd)'"
+    echo "Result will be stored in ${xml_lint_summary}"
+    echo
+
+    echo "file,xmllint_status" > ${xml_lint_summary}
+
+    local files_list=$(find . -name "${xml_file_pattern}")
+    local nb_files=$(echo "${files_list}" | wc -l)
+    local nb_ok=0
+    local nb_errors=0
+
+    echo "${nb_files} files will be checked"
+
+    while IFS= read -d $'\n' -r xml_file ; do
+        xmllint --noout ${xml_file}
+        local xmllint_result=$?
+        echo "${xml_file},${xmllint_result}" >> ${xml_lint_summary}
+        if [ ${xmllint_result} -eq 0 ] ; then
+            echo "'${xml_file}' is OK"
+            ((nb_ok++))
+        else
+            echo "'${xml_file}' has errors"
+            ((nb_errors++))
+        fi
+    done <<< "${files_list}"
+
+    echo "Results of xmllint for pattern '${xml_file_pattern}'"
+    echo "    Checked: ${nb_files}"
+    echo "    OK:      ${nb_ok}"
+    echo "    Errors:  ${nb_errors}"
+
+    return ${nb_errors}
+
+}



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-artwork/-/compare/935dd226a0aa34653050f6ff9e861a7bc2547a09...077dcfbf1aff7353e8c0a6d27673b6bb07b4c586

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-artwork/-/compare/935dd226a0aa34653050f6ff9e861a7bc2547a09...077dcfbf1aff7353e8c0a6d27673b6bb07b4c586
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/20211021/88d6a4c8/attachment-0001.htm>


More information about the debian-edu-commits mailing list