[debian-edu-commits] [Git][debian-edu/debian-edu][master] 3 commits: Also use overriden dist: target in Makefile to remove empty trailing line in…

[Holger Levsen]

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


Commits:
0d36ff90 by Holger Levsen at 2018-10-09T17:22:46Z
Also use overriden dist: target in Makefile to remove empty trailing line in debian/control, thanks lintian.

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

- - - - -
5f6e944d by Holger Levsen at 2018-10-09T17:34:45Z
use perl as the previous sed command doesnt work in a Makefile...

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

- - - - -
d48ce691 by Holger Levsen at 2018-10-09T17:34:53Z
release as 2.10.40

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

- - - - -


3 changed files:

- Makefile
- debian/changelog
- debian/control


Changes:

=====================================
Makefile
=====================================
@@ -6,10 +6,11 @@ GENCONTROL_DEPENDS = true
 include /usr/share/blends-dev/Makefile
 
 # override target from /usr/share/blends-dev/Makefile
-# this is a workaround for a missing feature in blends-dev (we should probably file a wishlist bug)
-# see #910498
+# this is a workaround for two missing features in blends-dev (we should probably file wishlist bugs)
+# a.) depends on arch:any packages should refer binary version to allow binNMUs (see #910498)
+# b.) remove empty trailing line in debian/control to avoid pedantic lintian warning
 dist:
 	        rm -f $(BLEND)-tasks.desc debian/control
 	        make -f debian/rules get-orig-source
 		sed -i 's#source:Version#binary:Version#' debian/control
-
+		perl -i -pe "chomp if eof" debian/control


=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-debian-edu (2.10.40) UNRELEASED; urgency=medium
+debian-edu (2.10.40) unstable; urgency=medium
 
   [ Wolfgang Schweer ]
   * debian/control.stub:
@@ -9,10 +9,11 @@ debian-edu (2.10.40) UNRELEASED; urgency=medium
     "sed -i 's#source:Version#binary:Version#' debian/control".
 
   [ Holger Levsen ]
-  * Override dist: target in Makefile to run the above sed after running 'make
-    dist'.
+  * Override dist: target in Makefile
+    - to run the above sed after running 'make dist'.
+    - remove empty trailing line in debian/control, thanks lintian.
 
- -- Wolfgang Schweer <wschweer at arcor.de>  Tue, 09 Oct 2018 17:06:40 +0200
+ -- Holger Levsen <holger at debian.org>  Tue, 09 Oct 2018 18:34:48 +0100
 
 debian-edu (2.10.39) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -1425,4 +1425,3 @@ Recommends: education-desktop-other,
 Description: Debian Edu networked workstation packages
  A metapackage containing dependencies for packages required on all
  networked workstation installations in the Debian Edu Blend.
-



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/compare/95de8ee5ebab097ea76329f63fd72292e91de146...d48ce6916aaf2e2c04f4e66409759e9562cd9d8c

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/compare/95de8ee5ebab097ea76329f63fd72292e91de146...d48ce6916aaf2e2c04f4e66409759e9562cd9d8c
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/20181009/a8623af0/attachment-0001.html>