[med-svn] [castxml] 03/07: Prepare new upstream

Gert Wollny gert-guest at moszumanska.debian.org
Sun Jan 31 15:39:06 UTC 2016


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

gert-guest pushed a commit to branch master
in repository castxml.

commit 37904ad19600bfcd7fe7ee5ea09ce1fa121f5810
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Sun Jan 31 15:21:38 2016 +0000

    Prepare new upstream
---
 debian/changelog |  8 ++++++++
 debian/control   |  2 +-
 debian/gbp.conf  |  3 +++
 debian/rules     | 13 -------------
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bf08b5a..f582e7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+castxml (0.1+git20160131-1) UNRELEASED; urgency=medium
+
+  [Gert Wollny]
+  * New upstream Closes:  #812883
+  * Depend on llvm-3.7, removed need to work around  #785931  
+
+ --  <gw.fossdev at gmail.com>  Sun, 31 Jan 2016 14:08:24 +0000
+
 castxml (0.1+git20150807-1) unstable; urgency=medium
 
   * New Upstream.
diff --git a/debian/control b/debian/control
index 0c4be9b..bbef12d 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Vcs-Git: git://anonscm.debian.org/debian-med/castxml.git
 Homepage: https://github.com/CastXML/CastXML
 Section: devel
 Priority: optional
-Build-Depends: debhelper (>= 9), cmake, help2man, libclang-3.6-dev, llvm-3.6-dev, libedit-dev, zlib1g-dev
+Build-Depends: debhelper (>= 9), cmake, help2man, libclang-3.7-dev, llvm-3.7-dev, libedit-dev, zlib1g-dev
 Standards-Version: 3.9.6
 
 Package: castxml
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..af46c8f
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+pristine-tar = True
+
diff --git a/debian/rules b/debian/rules
index 360d122..15779f2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,17 +2,6 @@
 
 CMAKE_FLAGS = -DCastXML_INSTALL_DOC_DIR:STRING=/usr/share/doc/castxml
 
-# Bug 785931 prevents using "find_package(LLVM)".  We work around this
-# by (1) copying a modified version of LLVMConfig.cmake into cwd, and
-# (2) modifying CMAKE_PREFIX_PATH so that find_package() searches the
-# cwd.
-
-bogus_llvmconfig = /usr/share/llvm-3.6/cmake/LLVMConfig.cmake
-ifneq (,$(wildcard $(bogus_llvmconfig)))
-	CMAKE_FLAGS += -DCMAKE_PREFIX_PATH:STRING="."
-override_dh_auto_configure: bug_785931_workaround
-endif
-
 %:
 	dh $@
 
@@ -23,5 +12,3 @@ override_dh_installman:
 	help2man -n "Create an XML representation of C++ declarations" --no-info debian/castxml/usr/bin/castxml  > castxml.1
 	dh_installman castxml.1
 
-bug_785931_workaround:
-	sed -e 's,/usr/lib/llvm-3.6/share/llvm/cmake,/usr/share/llvm-3.6/cmake,' $(bogus_llvmconfig) > LLVMConfig.cmake

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/castxml.git



More information about the debian-med-commit mailing list