The libstdc++-6-dev & libobjc-6-dev are only install with clang-X.Y

and libclang-X.Y-dev and no longer with libclang1-X.Y
(Closes: #841309)
This commit is contained in:
Sylvestre Ledru 2016-10-24 08:48:22 +00:00
parent f095a237b9
commit 397d4bf886
3 changed files with 16 additions and 5 deletions

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
llvm-toolchain-3.9 (1:3.9-3) unstable; urgency=medium
* The libstdc++-6-dev & libobjc-6-dev are only install with clang-X.Y
and libclang-X.Y-dev and no longer with libclang1-X.Y
(Closes: #841309)
-- Sylvestre Ledru <sylvestre@debian.org> Mon, 24 Oct 2016 10:45:07 +0200
llvm-toolchain-3.9 (1:3.9-2) unstable; urgency=medium
* Merge clang-include-fixer-3.9 into clang-3.9. Don't think

7
debian/control vendored
View File

@ -21,7 +21,7 @@ Vcs-Browser: https://svn.debian.org/viewsvn/pkg-llvm/llvm-toolchain/branches/3.9
Package: clang-3.9
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
libclang-common-3.9-dev (= ${binary:Version}),
${dep:devlibs-objc}, libclang-common-3.9-dev (= ${binary:Version}),
libclang1-3.9 (= ${binary:Version}), libc6-dev, binutils
Provides: c-compiler, objc-compiler, c++-compiler
Recommends: llvm-3.9-dev, python
@ -86,7 +86,7 @@ Description: C, C++ and Objective-C compiler (LLVM based) - Documentation
Package: libclang1-3.9
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}
Depends: ${shlibs:Depends}, ${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Description: C interface to the clang library
@ -127,7 +127,8 @@ Package: libclang-3.9-dev
Architecture: any
Section: libdevel
Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
libclang1-3.9 (= ${binary:Version}), libclang-common-3.9-dev (= ${binary:Version})
${dep:devlibs-objc}, libclang1-3.9 (= ${binary:Version}),
libclang-common-3.9-dev (= ${binary:Version})
Description: clang library - Development package
Clang project is a C, C++, Objective C and Objective C++ front-end
for the LLVM compiler. Its goal is to offer a replacement to the GNU Compiler

6
debian/rules vendored
View File

@ -50,9 +50,11 @@ ifneq (,$(findstring $(DEB_HOST_ARCH),armel))
endif
ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' g++-$(GCC_VERSION)) ge 4.8-20121128-1~ ; echo $$?),0)
control_vars = '-Vdep:devlibs=libstdc++-$(GCC_VERSION)-dev, libgcc-$(GCC_VERSION)-dev, libobjc-$(GCC_VERSION)-dev'
control_vars = '-Vdep:devlibs=libstdc++-$(GCC_VERSION)-dev, libgcc-$(GCC_VERSION)-dev' \
'-Vdep:devlibs-objc=libobjc-$(GCC_VERSION)-dev'
else ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' g++-$(GCC_VERSION)) ge 4.7.2-10~ ; echo $$?),0)
control_vars = '-Vdep:devlibs=libstdc++6-$(GCC_VERSION)-dev, libgcc-$(GCC_VERSION)-dev, libobjc-$(GCC_VERSION)-dev'
control_vars = '-Vdep:devlibs=libstdc++6-$(GCC_VERSION)-dev, libgcc-$(GCC_VERSION)-dev' \
'-Vdep:devlibs-objc=libobjc-$(GCC_VERSION)-dev'
else
control_vars = '-Vdep:devlibs=libstdc++6-$(GCC_VERSION)-dev'
endif