[Blends-commit] [Git][blends-team/blends][experimental] Move distribution name fix to blends-dev Makefile

[Ole Streicher]

Ole Streicher pushed to branch experimental at Debian Blends Team / blends


Commits:
61fcc481 by Ole Streicher at 2018-04-11T08:50:20+02:00
Move distribution name fix to blends-dev Makefile

The idea is to have a consistent and transparent behaviour between udd
and apt update methods.

- - - - -


3 changed files:

- devtools/Makefile
- − sources.list.UNRELEASED
- sources.list.unstable


Changes:

=====================================
devtools/Makefile
=====================================
--- a/devtools/Makefile
+++ b/devtools/Makefile
@@ -9,6 +9,22 @@
 # TARGET_DIST is one of stable, sarge, etch, unstable, or any other available
 # sources.list file available
 TARGET_DIST := $(shell head -1 debian/changelog |awk '{print $$3}'|tr -d ';')
+
+# using unstable as target distribution for the meta package dependencies
+# does actually not sound reasonable.  The idea is to enable a smooth transition
+# to testing for all meta packages and thus here testing is used as target
+# distribution.
+ifeq "$(TARGET_DIST)" "unstable"
+	TARGET_DIST := "testing"
+endif
+
+# It is a good practice to use UNRELEASED in the changelog as target
+# distribution for not yet finished packages and blends-dev should
+# also work in this case.
+ifeq "$(TARGET_DIST)" "UNRELEASED"
+	TARGET_DIST := "unstable"
+endif
+
 BLEND := $(shell /usr/share/blends-dev/blend-get-names blendname)
 VERSION  := $(shell dpkg-parsechangelog -ldebian/changelog | grep Version: | cut -f2 -d' ' | cut -f1 -d- )
 GENCONTROL := /usr/share/blends-dev/blend-gen-control


=====================================
sources.list.UNRELEASED deleted
=====================================
--- a/sources.list.UNRELEASED
+++ /dev/null
@@ -1,5 +0,0 @@
-# For testing purposes this sources.list might be useful.  It is a
-# good practice to use UNRELEASED in the changelog as target distribution
-# for not yet finished packages and blends-dev should also work in this
-# case
-deb http://ftp.debian.org/debian unstable main


=====================================
sources.list.unstable
=====================================
--- a/sources.list.unstable
+++ b/sources.list.unstable
@@ -1,7 +1 @@
-# using unstable as target distribution for the meta package dependencies
-# does actually not sound reasonable.  The idea is to enable a smooth transition
-# to testing for all meta packages and thus here testing is used as target
-# distribution.  You are free to provide your own source.list.unstable
-# in the source of your meta package building code to force unstable as
-# target or alternatively you could change this file (/etc/blends/sources.list.unstable).
 deb http://ftp.debian.org/debian testing main



View it on GitLab: https://salsa.debian.org/blends-team/blends/commit/61fcc481892d37e87d5c4ee05ff143ec80e34048

---
View it on GitLab: https://salsa.debian.org/blends-team/blends/commit/61fcc481892d37e87d5c4ee05ff143ec80e34048
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/blends-commit/attachments/20180411/52f1baa5/attachment-0001.html>