control: retitle -1 unblock: llvm-defaults/1:3.0-14+nmu2 Le 08/09/2012 10:55, Adam D. Barratt a écrit : > On Sat, 2012-09-08 at 09:16 -0400, David Prévot wrote: >> Damn… Should I upload a “Fix previous changelog entry” version > That would be good, if only to avoid future confusion; thanks. Done. Please find attach the actual nmu1-nmu2 fix, and the updated debdiff since 1:3.0-13 in Wheezy. unblock: llvm-defaults/1:3.0-14+nmu2 Regards David
diff -Nru llvm-defaults-0.14+nmu1/debian/changelog llvm-defaults-0.14+nmu2/debian/changelog
--- llvm-defaults-0.14+nmu1/debian/changelog 2012-09-07 22:13:00.000000000 -0400
+++ llvm-defaults-0.14+nmu2/debian/changelog 2012-09-08 11:18:32.000000000 -0400
@@ -1,8 +1,15 @@
+llvm-defaults (0.14+nmu2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix previous changelog entry, thanks to Adam D. Barrat for spotting it.
+
+ -- David Prévot <taffit@debian.org> Sat, 08 Sep 2012 11:18:28 -0400
+
llvm-defaults (0.14+nmu1) unstable; urgency=low
* Non-maintainer upload.
* Fix empty /usr/share/doc/ directories after Squeeze â?? Wheezy upgrade: add
- *.preinst to remove directory before the symlink is created.
+ *.postinst to remove directory before the symlink is created.
(Closes: #685170)
-- David Prévot <taffit@debian.org> Fri, 07 Sep 2012 22:12:56 -0400
diff -Nru --exclude po llvm-defaults-0.13/debian/changelog llvm-defaults-0.14+nmu2/debian/changelog --- llvm-defaults-0.13/debian/changelog 2012-06-29 17:51:41.000000000 -0400 +++ llvm-defaults-0.14+nmu2/debian/changelog 2012-09-08 11:06:35.000000000 -0400 @@ -1,3 +1,27 @@ +llvm-defaults (0.14+nmu2) UNRELEASED; urgency=low + + * Non-maintainer upload. + * Fix previous changelog entry, thanks to Adam D. Barrat for spotting it. + + -- David Prévot <taffit@debian.org> Sat, 08 Sep 2012 11:04:01 -0400 + +llvm-defaults (0.14+nmu1) unstable; urgency=low + + * Non-maintainer upload. + * Fix empty /usr/share/doc/ directories after Squeeze â?? Wheezy upgrade: add + *.postinst to remove directory before the symlink is created. + (Closes: #685170) + + -- David Prévot <taffit@debian.org> Fri, 07 Sep 2012 22:12:56 -0400 + +llvm-defaults (0.14) unstable; urgency=low + + [ Vincent Legout ] + * debian/rules: Update symlinks to match binaries and manpages from llvm-3.0 + instead of llvm-2.7 (Closes: #674896) + + -- Sylvestre Ledru <sylvestre@debian.org> Mon, 16 Jul 2012 22:39:22 +0200 + llvm-defaults (0.13) unstable; urgency=low * Fix the symlink bad path. Thanks to Sam Hocevar (Closes: #679468) diff -Nru --exclude po llvm-defaults-0.13/debian/libllvm-ocaml-dev.postinst llvm-defaults-0.14+nmu2/debian/libllvm-ocaml-dev.postinst --- llvm-defaults-0.13/debian/libllvm-ocaml-dev.postinst 1969-12-31 20:00:00.000000000 -0400 +++ llvm-defaults-0.14+nmu2/debian/libllvm-ocaml-dev.postinst 2012-09-07 21:53:21.000000000 -0400 @@ -0,0 +1,13 @@ +#!/bin/sh +set -e + +# Replace documentation directory with symlink +if [ -d /usr/share/doc/libllvm-ocaml-dev ] && [ ! -L /usr/share/doc/libllvm-ocaml-dev ]; then + if rmdir /usr/share/doc/libllvm-ocaml-dev 2>/dev/null; then + ln -sf llvm-runtime /usr/share/doc/libllvm-ocaml-dev + fi +fi + +#DEBHELPER# + +exit 0 diff -Nru --exclude po llvm-defaults-0.13/debian/llvm-dev.postinst llvm-defaults-0.14+nmu2/debian/llvm-dev.postinst --- llvm-defaults-0.13/debian/llvm-dev.postinst 1969-12-31 20:00:00.000000000 -0400 +++ llvm-defaults-0.14+nmu2/debian/llvm-dev.postinst 2012-09-07 21:52:57.000000000 -0400 @@ -0,0 +1,13 @@ +#!/bin/sh +set -e + +# Replace documentation directory with symlink +if [ -d /usr/share/doc/llvm-dev ] && [ ! -L /usr/share/doc/llvm-dev ]; then + if rmdir /usr/share/doc/llvm-dev 2>/dev/null; then + ln -sf llvm-runtime /usr/share/doc/llvm-dev + fi +fi + +#DEBHELPER# + +exit 0 diff -Nru --exclude po llvm-defaults-0.13/debian/llvm.postinst llvm-defaults-0.14+nmu2/debian/llvm.postinst --- llvm-defaults-0.13/debian/llvm.postinst 1969-12-31 20:00:00.000000000 -0400 +++ llvm-defaults-0.14+nmu2/debian/llvm.postinst 2012-09-07 21:43:32.000000000 -0400 @@ -0,0 +1,13 @@ +#!/bin/sh +set -e + +# Replace documentation directory with symlink +if [ -d /usr/share/doc/llvm ] && [ ! -L /usr/share/doc/llvm ]; then + if rmdir /usr/share/doc/llvm 2>/dev/null; then + ln -sf llvm-runtime /usr/share/doc/llvm + fi +fi + +#DEBHELPER# + +exit 0 diff -Nru --exclude po llvm-defaults-0.13/debian/rules llvm-defaults-0.14+nmu2/debian/rules --- llvm-defaults-0.13/debian/rules 2012-06-29 17:50:58.000000000 -0400 +++ llvm-defaults-0.14+nmu2/debian/rules 2012-07-16 16:39:07.000000000 -0400 @@ -107,18 +107,19 @@ dh_installdirs -pllvm \ usr/bin usr/share/man/man1 for bin in \ - llvm-as llvm-prof llvm-bcanalyzer llvm-dis llvmc \ - llvm-ranlib llvm-ld llvm-link llvm-nm tblgen llvm-ar \ - llvm-extract llvm-config llc bugpoint opt ; do \ + bugpoint llc llvm-ar llvm-as llvm-bcanalyzer llvm-config \ + llvm-cov llvm-diff llvm-dis llvm-dwarfdump llvm-extract \ + llvm-ld llvm-link llvm-mc llvm-nm llvm-objdump llvm-prof \ + llvm-ranlib llvm-rtdyld llvm-size llvm-stub llvm-tblgen \ + macho-dump opt ; do \ dh_link -pllvm \ /usr/lib/llvm-$(PV_LLVM)/bin/$$bin \ /usr/bin/$$bin ; \ done for man in \ - opt bugpoint llvm-ranlib llvmc llvm-as llvm-ar llvmgxx \ - llvm-prof llvm-ld tblgen llvm-bcanalyzer llvm-dis \ - llvm-config llc llvm-link lit llvm-extract llvm-nm \ - llvmgcc ; do \ + bugpoint lit llc llvm-ar llvm-as llvm-bcanalyzer llvm-config \ + llvm-diff llvm-dis llvm-extract llvm-ld llvm-link llvm-nm \ + llvm-prof llvm-ranlib opt tblgen ; do \ dh_link -pllvm \ /usr/share/man/man1/$$man-$(PV_LLVM).1.gz \ /usr/share/man/man1/$$man.1.gz ; \
Attachment:
signature.asc
Description: OpenPGP digital signature