diff --git a/debian/changelog b/debian/changelog index 0c733ff6..50bd7bee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-3.4 (1:3.4~+rc2-1) unstable; urgency=low + + * New testing upstream release + * 0047-version-name.diff ocamldoc.diff removed (applied upstream) + + -- Sylvestre Ledru Tue, 03 Dec 2013 10:25:59 +0100 + llvm-toolchain-3.4 (1:3.4~+rc1-3) unstable; urgency=low * Remove the usage of --with-c-include-dirs, --with-cxx-include-root, diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index 3c9d417a..86b73758 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -24,6 +24,7 @@ fi if test -n "$1" -a -n "$2"; then # http://llvm.org/svn/llvm-project/{cfe,llvm,compiler-rt,...}/tags/RELEASE_34/rc1/ +# For example: sh 3.4/debian/orig-tar.sh RELEASE_34 rc2 BRANCH=$1 TAG=$2 RCRELEASE="true" diff --git a/debian/patches/0047-version-name.diff b/debian/patches/0047-version-name.diff deleted file mode 100644 index 04f6b406..00000000 --- a/debian/patches/0047-version-name.diff +++ /dev/null @@ -1,28 +0,0 @@ -Index: llvm-toolchain-snapshot_3.4~svn188990/autoconf/configure.ac -=================================================================== ---- llvm-toolchain-snapshot_3.4~svn188990.orig/autoconf/configure.ac 2013-08-22 09:07:31.936608673 +0200 -+++ llvm-toolchain-snapshot_3.4~svn188990/autoconf/configure.ac 2013-08-22 09:07:31.928608673 +0200 -@@ -31,7 +31,7 @@ - dnl===-----------------------------------------------------------------------=== - dnl Initialize autoconf and define the package name, version number and - dnl address for reporting bugs. --AC_INIT([LLVM],[3.4svn],[http://llvm.org/bugs/]) -+AC_INIT([LLVM],[3.4],[http://llvm.org/bugs/]) - AC_DEFINE([LLVM_VERSION_MAJOR], [3], [Major version of the LLVM API]) - AC_DEFINE([LLVM_VERSION_MINOR], [4], [Minor version of the LLVM API]) - -Index: llvm-toolchain-snapshot_3.4~svn188990/configure -=================================================================== ---- llvm-toolchain-snapshot_3.4~svn188990.orig/configure 2013-08-22 09:07:31.936608673 +0200 -+++ llvm-toolchain-snapshot_3.4~svn188990/configure 2013-08-22 09:07:31.932608673 +0200 -@@ -561,8 +561,8 @@ - # Identity of this package. - PACKAGE_NAME='LLVM' - PACKAGE_TARNAME='llvm' --PACKAGE_VERSION='3.4svn' --PACKAGE_STRING='LLVM 3.4svn' -+PACKAGE_VERSION='3.4' -+PACKAGE_STRING='LLVM 3.4' - PACKAGE_BUGREPORT='http://llvm.org/bugs/' - - ac_unique_file="lib/IR/Module.cpp" diff --git a/debian/patches/ocamldoc.diff b/debian/patches/ocamldoc.diff deleted file mode 100644 index 1d17c97e..00000000 --- a/debian/patches/ocamldoc.diff +++ /dev/null @@ -1,15 +0,0 @@ -Index: llvm-toolchain-snapshot_3.5~svn195268/bindings/ocaml/backends/Makefile -=================================================================== ---- llvm-toolchain-snapshot_3.5~svn195268.orig/bindings/ocaml/backends/Makefile (révision 195335) -+++ llvm-toolchain-snapshot_3.5~svn195268/bindings/ocaml/backends/Makefile (révision 195336) -@@ -53,4 +53,9 @@ - $(MAKE) -f Makefile.$$i uninstall; \ - done - --.PHONY: all-backends clean-backends install-backends uninstall-backends -+ocamldoc: stubs -+ $(Verb) for i in $(TARGETS_TO_BUILD); do \ -+ $(MAKE) -f Makefile.$$i ocamldoc; \ -+ done -+ -+.PHONY: all-backends clean-backends install-backends uninstall-backends ocamldoc diff --git a/debian/patches/series b/debian/patches/series index 416fb2c5..f996ca13 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -10,7 +10,6 @@ profile_rt.diff 0021-shared-lib-debian.patch 0023-link-libopagent.patch 0044-soname.diff -0047-version-name.diff scan-build-clang-path.diff 0050-powerpcspe-fp.diff declare_clear_cache.diff @@ -26,7 +25,6 @@ atomic_library_1.diff atomic_library_2.diff python-clangpath.diff removeduplicatedeclaration.diff -ocamldoc.diff silent-swig-warning.diff silent-MCJIIT-tests.diff include-target.diff