[libclc] 02/02: release 0.2.0+git20160907-3

Michael Gilbert mgilbert at moszumanska.debian.org
Sat Nov 26 04:10:11 UTC 2016


This is an automated email from the git hooks/post-receive script.

mgilbert pushed a commit to branch master
in repository libclc.

commit b141590fd1293a314f61f7ee7200a73cc626b425
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sat Nov 26 04:10:42 2016 +0000

    release 0.2.0+git20160907-3
---
 debian/.gitignore              |  1 +
 debian/README.source           | 10 ++++++++++
 debian/changelog               |  7 +++++++
 debian/clang                   |  1 +
 debian/{control => control.in} |  4 ++--
 debian/rules                   | 19 +++++--------------
 6 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644
index 0000000..4db28ac
--- /dev/null
+++ b/debian/.gitignore
@@ -0,0 +1 @@
+control
diff --git a/debian/README.source b/debian/README.source
index f120234..177c4bd 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,2 +1,12 @@
+Watch File
+==========
 There is no watch file in debian/ because upstream uses git but has made
 no tags, so there is currently no way to watch upstream changes.
+
+Clang Updates
+=============
+To build with a different version of clang, just alter the clang version
+number contained in the debian/clang file, then update the control file
+with:
+
+$ ./debian/rules debian/control
diff --git a/debian/changelog b/debian/changelog
index 6a53dd0..36dffbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libclc (0.2.0+git20160907-3) unstable; urgency=medium
+
+  * Simplify clang version updates.
+  * Drop de-duplication of files that aren't duplicate any more.
+
+ -- Michael Gilbert <mgilbert at debian.org>  Sat, 26 Nov 2016 03:35:48 +0000
+
 libclc (0.2.0+git20160907-2) unstable; urgency=medium
 
   [ Andreas Boll ]
diff --git a/debian/clang b/debian/clang
new file mode 100644
index 0000000..bd28b9c
--- /dev/null
+++ b/debian/clang
@@ -0,0 +1 @@
+3.9
diff --git a/debian/control b/debian/control.in
similarity index 97%
rename from debian/control
rename to debian/control.in
index 88eb5f8..9d70c2d 100644
--- a/debian/control
+++ b/debian/control.in
@@ -7,8 +7,8 @@ Uploaders:
 Build-Depends:
  debhelper (>= 10),
  python,
- clang-3.9,
- llvm-3.9-dev,
+ clang-CLANG_VERSION,
+ llvm-CLANG_VERSION-dev,
  zlib1g-dev,
  libedit-dev,
 Standards-Version: 3.9.8
diff --git a/debian/rules b/debian/rules
index 7163973..f363c93 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,22 +6,13 @@ export DH_VERBOSE=1
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
-confflags=--prefix=/usr \
-          --with-llvm-config=/usr/bin/llvm-config-3.9 \
+LLVM_CONFIG=/usr/bin/llvm-config-$(shell cat debian/clang)
 
-path=debian/tmp/usr/lib/clc
+debian/control: debian/control.in
+	sed "s/CLANG_VERSION/$(shell cat debian/clang)/g" < $< > $@
 
-%:
+%: debian/control
 	dh $@
 
 override_dh_auto_configure:
-	./configure.py $(confflags)
-
-override_dh_install:
-	test $(shell sha512sum $(path)/cypress-r600--.bc) != $(shell sha512sum $(path)/cayman-r600--.bc) || \
-	    rm -f $(path)/cypress-r600--.bc && \
-	    ln -s cayman-r600--.bc $(path)/cypress-r600--.bc
-	test $(shell sha512sum $(path)/cedar-r600--.bc) != $(shell sha512sum $(path)/barts-r600--.bc) || \
-	    rm -f $(path)/cedar-r600--.bc && \
-	    ln -s barts-r600--.bc $(path)/cedar-r600--.bc
-	dh_install
+	./configure.py --prefix=/usr --with-llvm-config=$(LLVM_CONFIG)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/libclc.git



More information about the Pkg-opencl-commits mailing list