From 75d1cf3b7a91573145b79062f2a9f128fa3f51d1 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 1 Sep 2014 11:58:49 +0000 Subject: [PATCH 1/2] fix typo --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 204bdd03..87911db0 100644 --- a/debian/control +++ b/debian/control @@ -406,8 +406,8 @@ Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sp Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.4 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Section: libs -Replaces: lldb-3.4 (>> 1:3.4.2-9~) -Breaks: lldb-3.4 (>> 1:3.4.2-9~) +Replaces: lldb-3.4 (<< 1:3.4.2-9~) +Breaks: lldb-3.4 (<< 1:3.4.2-9~) Description: Next generation, high-performance debugger, library LLDB is a next generation, high-performance debugger. It is built as a set of reusable components which highly leverage existing libraries in the larger LLVM From 64b69380b4c0ce5a37021920185007844a38929a Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 1 Sep 2014 17:06:54 +0000 Subject: [PATCH 2/2] fix various issues --- debian/changelog | 1 + debian/clang-X.Y.lintian-overrides.in | 7 ++ debian/libclang1-X.Y.lintian-overrides.in | 6 +- debian/liblldb-X.Y.install.in | 2 +- debian/llvm-X.Y-runtime.lintian-overrides.in | 1 + debian/llvm-X.Y.lintian-overrides.in | 1 + debian/patches/lldb-libname.diff | 2 +- debian/patches/remove-dbtree.diff | 74 ++++++++++++++++++++ debian/patches/series | 1 + debian/source.lintian-overrides | 2 + 10 files changed, 92 insertions(+), 5 deletions(-) create mode 100644 debian/llvm-X.Y-runtime.lintian-overrides.in create mode 100644 debian/patches/remove-dbtree.diff create mode 100644 debian/source.lintian-overrides diff --git a/debian/changelog b/debian/changelog index 208334a0..89ae77fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ llvm-toolchain-3.4 (1:3.4.2-9~exp1) experimental; urgency=medium added * clang-3.4 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 diff --git a/debian/clang-X.Y.lintian-overrides.in b/debian/clang-X.Y.lintian-overrides.in index 52efa24f..dabecf22 100644 --- a/debian/clang-X.Y.lintian-overrides.in +++ b/debian/clang-X.Y.lintian-overrides.in @@ -2,3 +2,10 @@ clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-check.1.gz clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-tblgen.1.gz clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/scan-view.1.gz +clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-apply-replacements-@LLVM_VERSION@.1.gz +clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-check-@LLVM_VERSION@.1.gz +clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-tblgen-@LLVM_VERSION@.1.gz +clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-tidy-@LLVM_VERSION@.1.gz +clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/pp-trace-@LLVM_VERSION@.1.gz +clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/scan-view-@LLVM_VERSION@.1.gz + diff --git a/debian/libclang1-X.Y.lintian-overrides.in b/debian/libclang1-X.Y.lintian-overrides.in index 74348405..aa7ef217 100644 --- a/debian/libclang1-X.Y.lintian-overrides.in +++ b/debian/libclang1-X.Y.lintian-overrides.in @@ -1,5 +1,5 @@ -# I know and I am not planning to change that. -libclang1-@LLVM_VERSION@: package-name-doesnt-match-sonames libclang1 +# I know and I am not planning to change that yet. +libclang1-@LLVM_VERSION@: package-name-doesnt-match-sonames libclang1-@LLVM_VERSION@ # Provided as transition libclang1-@LLVM_VERSION@: dev-pkg-without-shlib-symlink usr/lib/*/libclang-@LLVM_VERSION@.so.1 usr/lib/*/libclang.so - +libclang1-@LLVM_VERSION@: ldconfig-symlink-missing-for-shlib usr/lib/*/libclang-LLVM_VERSION@.so usr/lib/*/libclang-LLVM_VERSION@.so.1 libclang-LLVM_VERSION@.so diff --git a/debian/liblldb-X.Y.install.in b/debian/liblldb-X.Y.install.in index 6b58d197..74bcb9df 100644 --- a/debian/liblldb-X.Y.install.in +++ b/debian/liblldb-X.Y.install.in @@ -1,2 +1,2 @@ usr/lib/llvm-@LLVM_VERSION@/lib/liblldb.so.1 -usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/llvm-@LLVM_VERSION@/lib/liblldb-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/debian/llvm-X.Y-runtime.lintian-overrides.in b/debian/llvm-X.Y-runtime.lintian-overrides.in new file mode 100644 index 00000000..e94e7130 --- /dev/null +++ b/debian/llvm-X.Y-runtime.lintian-overrides.in @@ -0,0 +1 @@ +llvm-@LLVM_VERSION@-runtime: binary-without-manpage usr/bin/lli-child-target-@LLVM_VERSION@ diff --git a/debian/llvm-X.Y.lintian-overrides.in b/debian/llvm-X.Y.lintian-overrides.in index ac3f7567..5bfc9240 100644 --- a/debian/llvm-X.Y.lintian-overrides.in +++ b/debian/llvm-X.Y.lintian-overrides.in @@ -7,3 +7,4 @@ llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-rt llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-size-@LLVM_VERSION@.1.gz llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-tblgen-@LLVM_VERSION@.1.gz llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/macho-dump-@LLVM_VERSION@.1.gz +llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-ranlib-@LLVM_VERSION@.1.gz diff --git a/debian/patches/lldb-libname.diff b/debian/patches/lldb-libname.diff index 5ec9149c..3d9c3b4f 100644 --- a/debian/patches/lldb-libname.diff +++ b/debian/patches/lldb-libname.diff @@ -7,7 +7,7 @@ Index: llvm-toolchain-3.4-3.4.2/lldb/lib/Makefile LLVMLibsOptions += -latomic endif - LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT).$(SONAME_EXTENSION) -+ LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)-$(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)$(SHLIBEXT).$(SONAME_EXTENSION) ++ LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)-$(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)$(SHLIBEXT) endif ifeq ($(HOST_OS),FreeBSD) diff --git a/debian/patches/remove-dbtree.diff b/debian/patches/remove-dbtree.diff new file mode 100644 index 00000000..6915835b --- /dev/null +++ b/debian/patches/remove-dbtree.diff @@ -0,0 +1,74 @@ +Index: llvm-toolchain-3.4-3.4.2/clang/www/analyzer/content.css +=================================================================== +--- llvm-toolchain-3.4-3.4.2.orig/clang/www/analyzer/content.css ++++ llvm-toolchain-3.4-3.4.2/clang/www/analyzer/content.css +@@ -99,18 +99,3 @@ table.checkers .name { font-weight:bold; + table.checkers .checked { background-color:#81F781; } + table.checkers .commented { color:#909090; } + +-/* Collapsing Trees: http://dbtree.megalingo.com/web/demo/simple-collapsible-tree.cfm */ +-#collapsetree, #collapsetree a:link, #collapsetree li a:link, #collapsetree a:visited, #collapsetree li a:visited{color:#000;text-decoration:none} +-#collapsetree,#collapsetree ul{list-style-type:none; width:auto; margin:0; padding:0} +-#collapsetree ul{padding-left:20px;display:none;overflow:auto} +-#collapsetree li ul{margin:0 auto} +-#collapsetree li{display:block;width:100%;line-height:20px;white-space:nowrap} +-#collapsetree li a{display:block;padding-left:20px;color:#000;text-decoration:none;background:url(images/tree/bullet.gif) center left no-repeat;white-space:nowrap} +-#collapsetree li a:hover{text-decoration:underline;background-color:transparent;color:#000} +-#collapsetree li ul.click{display:block} +-#collapsetree li.click a{background:url(images/tree/bullet.gif) center left no-repeat} +-#collapsetree ul li.click a{background:url(images/tree/bullet.gif) center left no-repeat} +-#collapsetree li a.subMenu,#collapsetree ul li a.subMenu{background:url(images/tree/plus.gif) center left no-repeat} +-#collapsetree li a.click{background:url(images/tree/minus.gif) center left no-repeat} +-#collapsetree ul li a.click{background:url(images/tree/minus.gif) center left no-repeat} +- +Index: llvm-toolchain-3.4-3.4.2/clang/www/analyzer/xcode.html +=================================================================== +--- llvm-toolchain-3.4-3.4.2.orig/clang/www/analyzer/xcode.html ++++ llvm-toolchain-3.4-3.4.2/clang/www/analyzer/xcode.html +@@ -6,7 +6,6 @@ + + + +- + + + +Index: llvm-toolchain-3.4-3.4.2/clang/www/analyzer/potential_checkers.html +=================================================================== +--- llvm-toolchain-3.4-3.4.2.orig/clang/www/analyzer/potential_checkers.html ++++ llvm-toolchain-3.4-3.4.2/clang/www/analyzer/potential_checkers.html +@@ -6,7 +6,6 @@ + + + +- + + + +Index: llvm-toolchain-3.4-3.4.2/clang/www/analyzer/scan-build.html +=================================================================== +--- llvm-toolchain-3.4-3.4.2.orig/clang/www/analyzer/scan-build.html ++++ llvm-toolchain-3.4-3.4.2/clang/www/analyzer/scan-build.html +@@ -6,7 +6,6 @@ + + + +- + + + +@@ -53,7 +52,7 @@ aforementioned hack fails to work.

+ +

Contents

+ +-
    ++
      +
    • Getting Started +
        +
      • Basic Usage
        • +Index: llvm-toolchain-3.4-3.4.2/clang/www/analyzer/scripts/dbtree.js +=================================================================== +--- llvm-toolchain-3.4-3.4.2.orig/clang/www/analyzer/scripts/dbtree.js ++++ llvm-toolchain-3.4-3.4.2/clang/www/analyzer/scripts/dbtree.js +@@ -1 +0,0 @@ +-eval(function(p,a,c,k,e,r){e=function(c){return(c35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('7 5,r,Q,u;7 17=[];5=H;1i();9(!1Z.1j.20){1Z.1j.20=k(a){C[C.D]=a}}7 19=\'35+/\';k 36(a){7 b,R=\'\',i=0;I(;i>16,(b&3a)>>8,b&1a)}9(a.21(i-2)==22)1m=R.23(0,R.D-2);s 9(a.21(i-1)==22)1m=R.23(0,R.D-1);s 1m=R;z 3b(1m)}7 A={24:k(){7 a=l.E(\'X\');I(7 i=0;i