[debian-edu-commits] [Git][debian-edu/debian-edu][master] 3 commits: debian/copyright: add tasks/desktop-cinnamon (thanks lintian) and update years...

Holger Levsen gitlab at salsa.debian.org
Mon May 11 14:56:42 BST 2020



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


Commits:
7d33b895 by Holger Levsen at 2020-05-11T15:34:15+02:00
debian/copyright: add tasks/desktop-cinnamon (thanks lintian) and update years for Wolfgand and myself.

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

- - - - -
c21e2a6c by Holger Levsen at 2020-05-11T15:44:26+02:00
debian/control.stub: Bump debhelper-compat to 13.

(after confirming with diffoscope this causes no other changes.)

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

- - - - -
2e13fb0c by Holger Levsen at 2020-05-11T15:55:43+02:00
release as 2.11.18

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

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/control.stub
- debian/copyright


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,4 @@
-debian-edu (2.11.18) UNRELEASED; urgency=medium
-
-  [ Holger Levsen ]
-  * Replace use of deprecated $ADTTMP with $AUTOPKGTEST_TMP, thanks
-    lintian-brush.
-  * debian/control: Update after running 'make dist'.
+debian-edu (2.11.18) unstable; urgency=medium
 
   [ Wolfgang Schweer ]
   * task-print-service (previously task-print-server, see 2.11.9) has been
@@ -12,7 +7,14 @@ debian-edu (2.11.18) UNRELEASED; urgency=medium
     Recommend print-service related packages cups, cups-bsd, cups-pdf,
     foomatic-db-compressed-ppds, hp-ppd, hpijs-ppds and hplip-gui.
 
- -- Holger Levsen <holger at debian.org>  Sun, 26 Apr 2020 16:56:31 +0200
+  [ Holger Levsen ]
+  * debian/tests/test-metapkgs: replace use of deprecated $ADTTMP with
+    $AUTOPKGTEST_TMP, thanks lintian-brush.
+  * debian/control.stub: Bump debhelper-compat to 13.
+  * debian/copyright: add tasks/desktop-cinnamon (thanks lintian) and update
+    years for Wolfgang and myself.
+
+ -- Holger Levsen <holger at debian.org>  Mon, 11 May 2020 15:45:11 +0200
 
 debian-edu (2.11.17) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -8,7 +8,7 @@ Uploaders: Petter Reinholdtsen <pere at debian.org>,
  Mike Gabriel <sunweaver at debian.org>,
  Wolfgang Schweer <wschweer at arcor.de>,
  Dominik George <nik at naturalnet.de>
-Build-Depends: debhelper-compat (= 12), blends-dev
+Build-Depends: debhelper-compat (= 13), blends-dev
 Standards-Version: 4.5.0
 Rules-Requires-Root: no
 Vcs-Git: https://salsa.debian.org/debian-edu/debian-edu.git


=====================================
debian/control.stub
=====================================
@@ -7,7 +7,7 @@ Uploaders: Petter Reinholdtsen <pere at debian.org>,
  Mike Gabriel <sunweaver at debian.org>,
  Wolfgang Schweer <wschweer at arcor.de>,
  Dominik George <nik at naturalnet.de>
-Build-Depends: debhelper-compat (= 12), blends-dev
+Build-Depends: debhelper-compat (= 13), blends-dev
 Standards-Version: 4.5.0
 Rules-Requires-Root: no
 Vcs-Git: https://salsa.debian.org/debian-edu/debian-edu.git


=====================================
debian/copyright
=====================================
@@ -72,6 +72,7 @@ Files: debian/*
  tasks/main-server
  tasks/mathematics
  tasks/electronics
+ tasks/desktop-cinnamon
  tasks/desktop-gnome
  tasks/common
  tasks/laptop
@@ -114,9 +115,9 @@ Files: debian/*
  tasks.ctl
 Copyright: 2001, Raphael Hertzog <hertzog at debian.org>
   2001-2018, Petter Reinholdtsen <pere at hungry.com>
-  2006-2018, Holger Levsen <holger at layer-acht.org>
+  2006-2020, Holger Levsen <holger at layer-acht.org>
   2011-2018, Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-  2013-2018, Wolfgang Schweer <w.schweer at gmx.de>
+  2013-2020, Wolfgang Schweer <w.schweer at gmx.de>
 License: GPL-2+
 
 Files: pixmaps/edu-geography.png



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/compare/51114b76a456dcb3943b02d636b83c672ab6a1c2...2e13fb0c89365b463b0bbec3a94b7b55db28e669

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/compare/51114b76a456dcb3943b02d636b83c672ab6a1c2...2e13fb0c89365b463b0bbec3a94b7b55db28e669
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/20200511/6b8122ac/attachment-0001.html>


More information about the debian-edu-commits mailing list