Merge 3.6 branch fixes

debian/changelog

@@ -1,8 +1,14 @@
 llvm-toolchain-3.7 (1:3.7~+rc2-3) UNRELEASED; urgency=medium
 
+  * Team upload
   * Fix VCS fields.
   * d/p/bug783205.patch rebase s390x patch to apply to 3.7
   * d/p/CVE-2015-2305.patch, fix security issue on regcomp.c
+  * Fix many lintian warning/errors
+    - copyright fixes
+    - updated overrides for v5 switch
+    - control files
+    - disabled ocaml documentation
 
  -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 13 Aug 2015 09:02:30 +0200
 

debian/control

@@ -6,7 +6,7 @@ Uploaders: Sylvestre Ledru <sylvestre@debian.org>
 Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl, expect,
     autoconf, automake, perl, libtool, chrpath, texinfo,
     sharutils, autotools-dev (>= 20060702.1), libffi-dev (>= 3.0.9),
-    lsb-release, patchutils, diffstat, xz-utils, chrpath, python-dev,
+    lsb-release, patchutils, diffstat, xz-utils, python-dev,
     libedit-dev, swig, python-sphinx, ocaml-nox, binutils-dev,
     libjsoncpp-dev,
     lcov, procps, help2man, dh-ocaml, zlib1g-dev
@@ -14,7 +14,7 @@ Build-Conflicts: oprofile, ocaml, libllvm-3.4-ocaml-dev, libllvm-3.5-ocaml-dev,
  libllvm-3.7-ocaml-dev
 Standards-Version: 3.9.6
 Homepage: http://www.llvm.org/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-llvm/llvm-toolchain/branches/3.7/
+Vcs-Svn: svn://anonscm.debian.org/pkg-llvm/llvm-toolchain/branches/3.7/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-llvm/llvm-toolchain/branches/3.7/
 
 # ------------- clang -------------
@@ -122,9 +122,10 @@ Description: C interface to the clang library
 
 Package: libclang1-3.7-dbg
 Architecture: any
+Multi-Arch: same
 Section: debug
 Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libclang1-3.7
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libclang1-3.7 (= ${binary:Version})
 Description: clang library
  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

debian/copyright

@@ -8,7 +8,7 @@ License: U-OF-I-BSD-LIKE
 
 Files: */install-sh
 Copyright: 1994 X Consortium
-License:
+License: LLVM
  This script is licensed under the LLVM license, with the following
  additional copyrights and restrictions:
  .
@@ -106,19 +106,19 @@ Copyright: 2009-2013 Craig van Vliet
            2009-2013 Howard Hinnant
 License: U-OF-I-BSD-LIKE or MIT
 
-Files: compiler-rt/BlocksRuntime/Block.h
+Files: compiler-rt/lib/BlocksRuntime/Block.h
 Copyright: 2008-2010 Apple, Inc.
 License: MIT
 
-Files: compiler-rt/BlocksRuntime/Block_private.h
+Files: compiler-rt/lib/BlocksRuntime/Block_private.h
 Copyright: 2008-2010 Apple, Inc.
 License: MIT
 
-Files: compiler-rt/BlocksRuntime/data.c
+Files: compiler-rt/lib/BlocksRuntime/data.c
 Copyright: 2008-2010 Apple, Inc.
 License: MIT
 
-Files: compiler-rt/BlocksRuntime/runtime.c
+Files: compiler-rt/lib/BlocksRuntime/runtime.c
 Copyright: 2008-2010 Apple, Inc.
 License: MIT
 
@@ -134,7 +134,7 @@ License: BSD-3-clause
 
 Files: lib/Target/ARM/*
 Copyright: ARM Limited
-License:
+License: ARM
  ARM Limited
  .
  Software Grant License Agreement ("Agreement")
@@ -185,7 +185,7 @@ License:
 
 Files: lldb/*
 Copyright: 2010, 2012 Apple Inc.
-License:
+License: NCSA
  University of Illinois/NCSA
  Open Source License
  .
@@ -225,10 +225,10 @@ License:
  SOFTWARE.
 
 Files: lldb/test/pexpect-2.4/*
-Copyright: 
+Copyright: 2008 Noah Spurrier
-License:
+License: Expat
- Free, open source, and all that good stuff.
+
- Pexpect Copyright (c) 2008 Noah Spurrier
+License: Expat
  .
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
@@ -251,7 +251,7 @@ License:
 Files: lldb/test/unittest2/*
 Copyright: 1999-2003 Steve Purcell
            2003-2010 Python Software Foundation
-License:
+License: Python
  This module is free software, and you may redistribute it and/or modify
  it under the same terms as Python itself, so long as this copyright message
  and disclaimer are retained in their original form.
@@ -269,7 +269,7 @@ License:
 
 Files: polly/*
 Copyright: 2009-2013 Polly Team
-License:
+License: Polly
  ==============================================================================
  Polly Release License
  ==============================================================================
@@ -324,9 +324,9 @@ Files: test/YAMLParser/*
 Copyright: 2006 Kirill Simonov
 License: MIT
 
-Files: tools/debugserver/source/MacOSX/stack_logging.h
+Files: lldb/tools/debugserver/source/MacOSX/stack_logging.h
 Copyright: 1999-2007 Apple Inc.
-License:
+License: Apple
  This file contains Original Code and/or Modifications of Original Code
  as defined in and that are subject to the Apple Public Source License
  Version 2.0 (the 'License'). You may not use this file except in
@@ -346,6 +346,23 @@ Files: utils/unittest/googletest/*
 Copyright: 2006-2008, Google Inc.
 License: BSD-3-Clause
 
+License: BSD-3-Clause
+ This software is provided 'as-is', without any express or implied
+ warranty.  In no event will the authors be held liable for any damages
+ arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you must not
+    claim that you wrote the original software. If you use this software
+    in a product, an acknowledgment in the product documentation would be
+    appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+    misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
 License: U-OF-I-BSD-LIKE
  ==============================================================================
  LLVM Release License

debian/libllvm-X.Y-ocaml-dev.doc-base.in

@@ -1,8 +1,8 @@
-Document: libllvm-@LLVM_VERSION@-ocaml-dev-ocamldoc-api-reference
+#Document: libllvm-@LLVM_VERSION@-ocaml-dev-ocamldoc-api-reference
-Title: Llvm OCamldoc API Reference
+#Title: Llvm OCamldoc API Reference
-Abstract: API reference manual for libllvm-ocaml-dev (generated via OCamldoc)
+#Abstract: API reference manual for libllvm-ocaml-dev (generated via OCamldoc)
-Section: Programming/OCaml
+#Section: Programming/OCaml
-
+#
-Format: HTML
+#Format: HTML
-Index: /usr/share/doc/libllvm-@LLVM_VERSION@-ocaml-dev/html/index.html
+#Index: /usr/share/doc/libllvm-@LLVM_VERSION@-ocaml-dev/html/index.html
-Files: /usr/share/doc/libllvm-@LLVM_VERSION@-ocaml-dev/html/*
+#Files: /usr/share/doc/libllvm-@LLVM_VERSION@-ocaml-dev/html/*

debian/llvm-X.Y-runtime.postinst.in

@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
 
 if test "$1" = "configure"; then
     if test -x /usr/sbin/update-binfmts; then

debian/llvm-X.Y-runtime.prerm.in

@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
 
 if test "$1" = "remove"; then
     if test -x /usr/sbin/update-binfmts; then