Bug#593624: llvm: diff for NMU version 2.6-9.1
Stephane Glondu
glondu at debian.org
Thu Aug 19 17:21:28 UTC 2010
Package: llvm
Version: 2.6-9
Severity: normal
Tags: patch pending
Dear maintainer,
I've prepared an NMU for llvm (versioned as 2.6-9.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.
Regards,
--
Stéphane
diff -u llvm-2.6/debian/control llvm-2.6/debian/control
--- llvm-2.6/debian/control
+++ llvm-2.6/debian/control
@@ -43,7 +43,7 @@
Package: llvm-runtime
Architecture: any
Depends: binfmt-support, ${shlibs:Depends}, ${misc:Depends}
-Conflicts: llvm (<< 2.6-7)
+Breaks: llvm (<< 2.6-7)
Replaces: llvm (<< 2.6-7)
Description: Low-Level Virtual Machine (LLVM), bytecode interpreter
The Low-Level Virtual Machine (LLVM) is a collection of libraries and
@@ -62,7 +62,7 @@
Package: llvm-dev
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, llvm (= ${binary:Version})
+Depends: libffi-dev, ${shlibs:Depends}, ${misc:Depends}, llvm (= ${binary:Version})
Provides: llvm-libs
Conflicts: llvm-libs
Replaces: llvm-libs, llvm (<< 2.2-3)
@@ -84,7 +84,7 @@
Package: libllvm-ocaml-dev
Section: ocaml
Architecture: any
-Suggests: llvm-doc
+Suggests: llvm-doc, ocaml-findlib
Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-dev (= ${binary:Version})
Provides: ${ocaml:Provides}
Description: Low-Level Virtual Machine (LLVM) bindings for OCaml
diff -u llvm-2.6/debian/changelog llvm-2.6/debian/changelog
--- llvm-2.6/debian/changelog
+++ llvm-2.6/debian/changelog
@@ -1,3 +1,21 @@
+llvm (2.6-9.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * llvm-runtime:
+ - replace Conflicts with previous version by Breaks
+ - add explicit "set -e" in maintainer scripts
+ - properly remove llvm.binfmt in prerm script
+ * llvm-dev:
+ - install vim files in /usr/share/vim/addons, add README.Debian
+ (Closes: #593190)
+ - add dependency to libffi-dev (Closes: #573368)
+ * libllvm-ocaml-dev:
+ - apply Sylvain Le Gall's patch to fix META filename (Closes: #583475)
+ - add suggestion to ocaml-findlib
+ * Add debian/source/format
+
+ -- Stéphane Glondu <glondu at debian.org> Thu, 19 Aug 2010 18:53:44 +0200
+
llvm (2.6-9) unstable; urgency=low
* Fix testsuite:
diff -u llvm-2.6/debian/debhelper.in/llvm-runtime.postinst llvm-2.6/debian/debhelper.in/llvm-runtime.postinst
--- llvm-2.6/debian/debhelper.in/llvm-runtime.postinst
+++ llvm-2.6/debian/debhelper.in/llvm-runtime.postinst
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
if test "$1" = "configure"; then
if test -x /usr/sbin/update-binfmts; then
diff -u llvm-2.6/debian/debhelper.in/llvm-dev.install llvm-2.6/debian/debhelper.in/llvm-dev.install
--- llvm-2.6/debian/debhelper.in/llvm-dev.install
+++ llvm-2.6/debian/debhelper.in/llvm-dev.install
@@ -8,8 +8,8 @@
configure @PF@/build/
autoconf/ @PF@/build/
-utils/vim/llvm.vim usr/share/vim/vimcurrent/syntax
-utils/vim/tablegen.vim usr/share/vim/vimcurrent/syntax
+utils/vim/llvm.vim usr/share/vim/addons/syntax
+utils/vim/tablegen.vim usr/share/vim/addons/syntax
utils/emacs/emacs.el usr/share/emacs/site-lisp/llvm/
utils/emacs/llvm-mode.el usr/share/emacs/site-lisp/llvm/
diff -u llvm-2.6/debian/debhelper.in/llvm-dev.dirs llvm-2.6/debian/debhelper.in/llvm-dev.dirs
--- llvm-2.6/debian/debhelper.in/llvm-dev.dirs
+++ llvm-2.6/debian/debhelper.in/llvm-dev.dirs
@@ -3,3 +3,2 @@
usr/share/doc/llvm-dev
-usr/share/vim/vimcurrent/syntax
usr/share/emacs/site-lisp/llvm
diff -u llvm-2.6/debian/debhelper.in/llvm-runtime.prerm llvm-2.6/debian/debhelper.in/llvm-runtime.prerm
--- llvm-2.6/debian/debhelper.in/llvm-runtime.prerm
+++ llvm-2.6/debian/debhelper.in/llvm-runtime.prerm
@@ -1,9 +1,11 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
if test "$1" = "remove"; then
if test -x /usr/sbin/update-binfmts; then
update-binfmts --package llvm \
- --remove llvm /usr/bin/lli || true
+ --remove llvm.binfmt /usr/bin/lli || true
fi
fi
diff -u llvm-2.6/debian/control.in/llvm-dev llvm-2.6/debian/control.in/llvm-dev
--- llvm-2.6/debian/control.in/llvm-dev
+++ llvm-2.6/debian/control.in/llvm-dev
@@ -1,6 +1,6 @@
Package: llvm-dev
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, llvm (= ${binary:Version})
+Depends: libffi-dev, ${shlibs:Depends}, ${misc:Depends}, llvm (= ${binary:Version})
Provides: llvm-libs
Conflicts: llvm-libs
Replaces: llvm-libs, llvm (<< 2.2-3)
diff -u llvm-2.6/debian/control.in/libllvm-ocaml-dev llvm-2.6/debian/control.in/libllvm-ocaml-dev
--- llvm-2.6/debian/control.in/libllvm-ocaml-dev
+++ llvm-2.6/debian/control.in/libllvm-ocaml-dev
@@ -1,7 +1,7 @@
Package: libllvm-ocaml-dev
Section: ocaml
Architecture: any
-Suggests: llvm-doc
+Suggests: llvm-doc, ocaml-findlib
Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-dev (= ${binary:Version})
Provides: ${ocaml:Provides}
Description: Low-Level Virtual Machine (LLVM) bindings for OCaml
diff -u llvm-2.6/debian/control.in/llvm-runtime llvm-2.6/debian/control.in/llvm-runtime
--- llvm-2.6/debian/control.in/llvm-runtime
+++ llvm-2.6/debian/control.in/llvm-runtime
@@ -1,7 +1,7 @@
Package: llvm-runtime
Architecture: any
Depends: binfmt-support, ${shlibs:Depends}, ${misc:Depends}
-Conflicts: llvm (<< 2.6-7)
+Breaks: llvm (<< 2.6-7)
Replaces: llvm (<< 2.6-7)
Description: Low-Level Virtual Machine (LLVM), bytecode interpreter
The Low-Level Virtual Machine (LLVM) is a collection of libraries and
diff -u llvm-2.6/debian/packages.d/llvm.mk llvm-2.6/debian/packages.d/llvm.mk
--- llvm-2.6/debian/packages.d/llvm.mk
+++ llvm-2.6/debian/packages.d/llvm.mk
@@ -81,7 +81,7 @@
define libllvm-ocaml-dev_extra_binary
if test "x$*" = "xlibllvm-ocaml-dev" ; then \
- cp $(D)/debian/$*.META $(D)/debian/$*/$(OCAML_STDLIB_DIR)/METAS/ ; \
+ cp $(D)/debian/$*.META $(D)/debian/$*/$(OCAML_STDLIB_DIR)/METAS/META.llvm ; \
fi
endef
only in patch2:
unchanged:
--- llvm-2.6.orig/debian/llvm-dev.README.Debian
+++ llvm-2.6/debian/llvm-dev.README.Debian
@@ -0,0 +1,7 @@
+llvm-dev Debian package
+-----------------------
+
+ - To enable syntax highlighting for llvm, just execute 'vim-addons
+ install llvm'.
+
+ -- Stéphane Glondu <glondu at debian.org>, Thu, 19 Aug 2010 17:27:36 +0200
only in patch2:
unchanged:
--- llvm-2.6.orig/debian/source/format
+++ llvm-2.6/debian/source/format
@@ -0,0 +1 @@
+1.0
More information about the Pkg-llvm-team
mailing list