[debian-edu-commits] [Git][debian-edu/debian-edu][master] 2 commits: Override dist: target in Makefile to run the above sed after running 'make dist'.

[Holger Levsen]

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


Commits:
27e828d8 by Holger Levsen at 2018-10-09T17:08:24Z
Override dist: target in Makefile to run the above sed after running 'make dist'.

- - - - -
fc1089e5 by Holger Levsen at 2018-10-09T17:08:24Z
Updated after running 'make dist'

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

- - - - -


3 changed files:

- Makefile
- debian/changelog
- debian/control


Changes:

=====================================
Makefile
=====================================
@@ -4,3 +4,12 @@ TASKSELOPTS = -u
 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
+dist:
+	        rm -f $(BLEND)-tasks.desc debian/control
+	        make -f debian/rules get-orig-source
+		sed -i 's#source#binary#' debian/control
+


=====================================
debian/changelog
=====================================
@@ -1,5 +1,6 @@
 debian-edu (2.10.40) UNRELEASED; urgency=medium
 
+  [ Wolfgang Schweer ]
   * debian/control.stub:
     - Adjust binary package education-tasks. (Closes: #910498).
       + Replace Architecture: all with Architecture: any
@@ -7,6 +8,10 @@ debian-edu (2.10.40) UNRELEASED; urgency=medium
   * debian/control: Updated after running 'make dist' and afterwards running 
     "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'. 
+
  -- Wolfgang Schweer <wschweer at arcor.de>  Tue, 09 Oct 2018 17:06:40 +0200
 
 debian-edu (2.10.39) unstable; urgency=medium


=====================================
debian/control
=====================================
@@ -682,7 +682,7 @@ Recommends: anjuta,
             fp-units-net,
             fp-units-rtl,
             fp-utils,
-            fpc-source,
+            fpc-binary,
             geany,
             idle3,
             kdevelop,



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/compare/2e1a5d999ea95a3b44b6e9749c29b56b49dda1b8...fc1089e55ab9c39e6d756fa78b89b4d473d486ff

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/compare/2e1a5d999ea95a3b44b6e9749c29b56b49dda1b8...fc1089e55ab9c39e6d756fa78b89b4d473d486ff
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/7bc87b37/attachment-0001.html>