[debian-edu-commits] [Git][debian-edu/debian-edu][master] 2 commits: debian/control: Update after running 'make dist'.

[Holger Levsen]

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


Commits:
4f95e39e by Holger Levsen at 2020-05-07T13:42:56+02:00
debian/control: Update after running 'make dist'.

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

- - - - -
0b7f9069 by Holger Levsen at 2020-05-07T13:54:16+02:00
Replace use of deprecated $ADTTMP with $AUTOPKGTEST_TMP.

Fixes: lintian: uses-deprecated-adttmp
See-also: https://lintian.debian.org/tags/uses-deprecated-adttmp.html

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/tests/test-metapkgs


Changes:

=====================================
debian/changelog
=====================================
@@ -1,5 +1,7 @@
 debian-edu (2.11.18) UNRELEASED; urgency=medium
 
+  * Replace use of deprecated $ADTTMP with $AUTOPKGTEST_TMP, thanks
+    lintian-brush.
   * debian/control: Update after running 'make dist'.
 
  -- Holger Levsen <holger at debian.org>  Sun, 26 Apr 2020 16:56:31 +0200


=====================================
debian/control
=====================================
@@ -174,7 +174,6 @@ Recommends: education-astronomy,
             education-misc,
             education-music,
             education-physics,
-            fotoxx,
             kdeedu,
             lightdm,
             mtpaint,
@@ -182,7 +181,8 @@ Recommends: education-astronomy,
             task-cinnamon-desktop
 Suggests: education-development,
           education-primaryschool,
-          education-video
+          education-video,
+          fotoxx
 Description: Debian Edu Cinnamon desktop applications
  This metapackage depends on various Cinnanon components and desktop
  applications that are useful for teachers and their students.
@@ -266,7 +266,6 @@ Recommends: blueman,
             education-misc,
             education-music,
             education-physics,
-            fotoxx,
             hexchat,
             kdeedu,
             mtpaint,
@@ -277,7 +276,8 @@ Recommends: blueman,
             task-lxde-desktop
 Suggests: education-development,
           education-primaryschool,
-          education-video
+          education-video,
+          fotoxx
 Description: Debian Edu LXDE desktop applications
  This metapackage depends on various LXDE components and lightweight
  desktop applications that are useful for teachers and their students.
@@ -300,7 +300,6 @@ Recommends: blueman,
             education-misc,
             education-music,
             education-physics,
-            fotoxx,
             galculator,
             kdeedu,
             lightdm,
@@ -310,7 +309,8 @@ Recommends: blueman,
             task-lxqt-desktop
 Suggests: education-development,
           education-primaryschool,
-          education-video
+          education-video,
+          fotoxx
 Description: Debian Edu LXQt desktop applications
  This metapackage depends on various LXQt components and lightweight
  desktop applications that are useful for teachers and their students.


=====================================
debian/tests/test-metapkgs
=====================================
@@ -5,7 +5,7 @@ chroot_test() {
     echo
     echo "Installing Debian Edu chroot with profile $PROFILE and desktop $DESKTOP"
     echo
-    cd $ADTTMP
+    cd $AUTOPKGTEST_TMP
 
     PROFILE=$PROFILE DESKTOP=$DESKTOP EDUSUITE=$edusuite \
         sh -x /usr/share/debian-edu-config/tools/debian-edu-bless 2>&1
@@ -18,10 +18,10 @@ export LC_ALL
 
 # Undo the effect of libpam-tmpdir in case it is active, and use the
 # test specific temp directory.
-export TMP=$ADTTMP
-export TMPDIR=$ADTTMP
-export TEMP=$ADTTMP
-export TEMPDIR=$ADTTMP
+export TMP=$AUTOPKGTEST_TMP
+export TMPDIR=$AUTOPKGTEST_TMP
+export TEMP=$AUTOPKGTEST_TMP
+export TEMPDIR=$AUTOPKGTEST_TMP
 
 echo "info: File system status (/proc/mounts):"
 cat /proc/mounts



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/compare/ccd3fc0960c62f2059d2cd001bfce423605ad569...0b7f9069085bdd88b33242c47b9b919205fa969f

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/compare/ccd3fc0960c62f2059d2cd001bfce423605ad569...0b7f9069085bdd88b33242c47b9b919205fa969f
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/20200507/3122a45d/attachment-0001.html>