From 8798f4c989c044b36fe410ebf2e53e368404165c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 3 Sep 2014 06:48:44 +0000 Subject: [PATCH] * New snapshot release * sync from 1:3.5~+rc4-2~exp1 * libclang-3.6.so should be used instead libclang.so. Update the soname to match the new lib name (Closes: #759538) * Rename liblldb.so to liblldb-3.6.so + update of the soname. * python-clang-3.6 description updated * liblldb-3.6 and python-lldb-3.6 added * lldb-3.6-dev renamed to liblldb-3.6-dev to match the previous changes * Manpages for llvm-ranlib, clang-apply-replacements, pp-trace and clang-tidy added * clang-3.6 should depends on binutils (for ld, at least) (Closes: #751030) * clang/www/analyzer/scripts/dbtree.js removed --- debian/changelog | 35 +++++++++++------------ debian/patches/series | 1 + debian/patches/strip-svn.diff | 52 +++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 17 deletions(-) create mode 100644 debian/patches/strip-svn.diff diff --git a/debian/changelog b/debian/changelog index 16a84f00..c9e537f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +llvm-toolchain-snapshot (1:3.6~svn216933-1~exp1) experimental; urgency=medium + + * New snapshot release + * sync from 1:3.5~+rc4-2~exp1 + * libclang-3.6.so should be used instead libclang.so. Update the soname + to match the new lib name (Closes: #759538) + * Rename liblldb.so to liblldb-3.6.so + update of the soname. + * python-clang-3.6 description updated + * liblldb-3.6 and python-lldb-3.6 added + * lldb-3.6-dev renamed to liblldb-3.6-dev to match the previous changes + * Manpages for llvm-ranlib, clang-apply-replacements, pp-trace and clang-tidy + added + * clang-3.6 should depends on binutils (for ld, at least) + (Closes: #751030) + * clang/www/analyzer/scripts/dbtree.js removed + + -- Sylvestre Ledru Sat, 30 Aug 2014 18:09:20 +0200 + llvm-toolchain-snapshot (1:3.6~svn215195-3) unstable; urgency=medium * Just like in 3.4 & 3.5, bring back lldb & lldb-dev under mips & mipsel @@ -24,23 +42,6 @@ llvm-toolchain-snapshot (1:3.6~svn215195-1) unstable; urgency=medium -- Sylvestre Ledru Mon, 04 Aug 2014 13:36:15 +0200 -llvm-toolchain-3.5 (1:3.5~+rc4-2~exp1) experimental; urgency=medium - - * sync from 1:3.4.2-9~exp1 - * libclang-3.5.so should be used instead libclang.so. Update the soname - to match the new lib name (Closes: #759538) - * Rename liblldb.so to liblldb-3.5.so + update of the soname. - * python-clang-3.5 description updated - * liblldb-3.5 and python-lldb-3.5 added - * lldb-3.5-dev renamed to liblldb-3.5-dev to match the previous changes - * Manpages for llvm-ranlib, clang-apply-replacements, pp-trace and clang-tidy - added - * clang-3.5 should depends on binutils (for ld, at least) - (Closes: #751030) - * clang/www/analyzer/scripts/dbtree.js removed - - -- Sylvestre Ledru Sat, 30 Aug 2014 18:09:20 +0200 - llvm-toolchain-3.4 (1:3.4.2-8) unstable; urgency=medium * Try to bring back lldb-3.4-dev on mips & mipsel (Closes: #758314) diff --git a/debian/patches/series b/debian/patches/series index d669496a..4e4e5b90 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -39,3 +39,4 @@ hurd-EIEIO-undef.diff silent-MCJIIT-tests.diff kfreebsd-lldb-mi.diff lldb-libname.diff +strip-svn.diff diff --git a/debian/patches/strip-svn.diff b/debian/patches/strip-svn.diff new file mode 100644 index 00000000..56ea9e50 --- /dev/null +++ b/debian/patches/strip-svn.diff @@ -0,0 +1,52 @@ +Index: llvm-toolchain-snapshot_3.6~svn216901/autoconf/configure.ac +=================================================================== +--- llvm-toolchain-snapshot_3.6~svn216901.orig/autoconf/configure.ac ++++ llvm-toolchain-snapshot_3.6~svn216901/autoconf/configure.ac +@@ -32,12 +32,12 @@ dnl===---------------------------------- + dnl Initialize autoconf and define the package name, version number and + dnl address for reporting bugs. + +-AC_INIT([LLVM],[3.6.0svn],[http://llvm.org/bugs/]) ++AC_INIT([LLVM],[3.6.0],[http://llvm.org/bugs/]) + + LLVM_VERSION_MAJOR=3 + LLVM_VERSION_MINOR=6 + LLVM_VERSION_PATCH=0 +-LLVM_VERSION_SUFFIX=svn ++LLVM_VERSION_SUFFIX= + + AC_DEFINE_UNQUOTED([LLVM_VERSION_MAJOR], $LLVM_VERSION_MAJOR, [Major version of the LLVM API]) + AC_DEFINE_UNQUOTED([LLVM_VERSION_MINOR], $LLVM_VERSION_MINOR, [Minor version of the LLVM API]) +Index: llvm-toolchain-snapshot_3.6~svn216901/configure +=================================================================== +--- llvm-toolchain-snapshot_3.6~svn216901.orig/configure ++++ llvm-toolchain-snapshot_3.6~svn216901/configure +@@ -561,8 +561,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} + # Identity of this package. + PACKAGE_NAME='LLVM' + PACKAGE_TARNAME='llvm' +-PACKAGE_VERSION='3.6.0svn' +-PACKAGE_STRING='LLVM 3.6.0svn' ++PACKAGE_VERSION='3.6.0' ++PACKAGE_STRING='LLVM 3.6.0' + PACKAGE_BUGREPORT='http://llvm.org/bugs/' + + ac_unique_file="lib/IR/Module.cpp" +@@ -1316,7 +1316,7 @@ if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +-\`configure' configures LLVM 3.6.0svn to adapt to many kinds of systems. ++\`configure' configures LLVM 3.6.0 to adapt to many kinds of systems. + + Usage: $0 [OPTION]... [VAR=VALUE]... + +@@ -1926,7 +1926,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + LLVM_VERSION_MAJOR=3 + LLVM_VERSION_MINOR=6 + LLVM_VERSION_PATCH=0 +-LLVM_VERSION_SUFFIX=svn ++LLVM_VERSION_SUFFIX= + + + cat >>confdefs.h <<_ACEOF