Hi, I request to unblock the following packages: libcorelinux/0.4.32-7.2 netcdf/3.6.1-1 Those uploads of these packages only fix the /usr/doc transition, and they are the last (known) ones to be fixed. It would be good if the /usr/doc transition was already fixed in etch for these packages (whether it's because they leave stray symlinks, or because it's not FHS-compliant, or just to get this transition over with). Debdiffs attached. netcdf is not a new upstream, but the previous QA upload did not use the correct Debian revision. Thanks, Thijs
diff -Nru /tmp/3RE1JsOIEt/libcorelinux-0.4.32/debian/changelog /tmp/ajmGjzGuf0/libcorelinux-0.4.32/debian/changelog --- /tmp/3RE1JsOIEt/libcorelinux-0.4.32/debian/changelog 2006-10-19 16:31:48.000000000 +0200 +++ /tmp/ajmGjzGuf0/libcorelinux-0.4.32/debian/changelog 2007-01-05 16:01:03.000000000 +0100 @@ -1,3 +1,11 @@ +libcorelinux (0.4.32-7.2) unstable; urgency=medium + + * Non-maintainer upload with maintainer approval. + * Remove obsolete /usr/doc/libcorelinux symlink on + package upgrade (Closes: #351740). + + -- Thijs Kinkhorst <thijs@debian.org> Fri, 5 Jan 2007 15:32:22 +0100 + libcorelinux (0.4.32-7.1) unstable; urgency=high * Non-maintainer upload for RC bug. diff -Nru /tmp/3RE1JsOIEt/libcorelinux-0.4.32/debian/libcorelinuxc2a.postinst /tmp/ajmGjzGuf0/libcorelinux-0.4.32/debian/libcorelinuxc2a.postinst --- /tmp/3RE1JsOIEt/libcorelinux-0.4.32/debian/libcorelinuxc2a.postinst 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/ajmGjzGuf0/libcorelinux-0.4.32/debian/libcorelinuxc2a.postinst 2007-01-05 16:04:46.000000000 +0100 @@ -0,0 +1,7 @@ +#!/bin/sh + +# Remove stale symlink, a leftover from the sarge +# version. This can be removed after Etch. +rm -f /usr/doc/libcorelinux + +#DEBHELPER#
diff -u netcdf-3.6.1/debian/changelog netcdf-3.6.1/debian/changelog
--- netcdf-3.6.1/debian/changelog
+++ netcdf-3.6.1/debian/changelog
@@ -1,3 +1,11 @@
+netcdf (3.6.1-1) unstable; urgency=medium
+
+ * QA upload.
+ * Remove stale /usr/doc symlinks if they still exist from a previous
+ package version that didn't clean it up correctly (Closes: #378647).
+
+ -- Thijs Kinkhorst <thijs@debian.org> Fri, 5 Jan 2007 16:32:16 +0100
+
netcdf (3.6.1-0.2) unstable; urgency=low
* QA upload.
diff -u netcdf-3.6.1/debian/rules netcdf-3.6.1/debian/rules
--- netcdf-3.6.1/debian/rules
+++ netcdf-3.6.1/debian/rules
@@ -135,7 +135,7 @@
install -d debian/tmp debian/tmp/DEBIAN
install -d debian/tmp/usr/share/doc/$(package)$(soname)
# Install Debian package control information files
- sed -e 's/netcdf/$(package)$(soname)/' < debian/postinst \
+ sed -e 's/netcdf/$(package)$(soname)/' < debian/$(package)$(soname).postinst \
> debian/tmp/DEBIAN/postinst
chmod 755 debian/tmp/DEBIAN/postinst
sed -e 's/netcdf/$(package)$(soname)/' < debian/prerm \
@@ -221,7 +221,7 @@
install -d debian/tmp/usr/share/doc/$(p_lib)
# Install Debian package control information files
sed -e 's/netcdf/$(p_lib)/' \
- < debian/postinst > debian/tmp/DEBIAN/postinst
+ < debian/$(p_lib).postinst > debian/tmp/DEBIAN/postinst
chmod 755 debian/tmp/DEBIAN/postinst
sed -e 's/netcdf/$(p_lib)/' \
< debian/prerm > debian/tmp/DEBIAN/prerm
@@ -259,7 +259,7 @@
install -d debian/tmp-cxx/usr/share/doc/$(p_cxx)
# Install Debian package control information files
sed -e 's/netcdf/$(p_cxx)/' \
- < debian/postinst > debian/tmp-cxx/DEBIAN/postinst
+ < debian/$(p_cxx).postinst > debian/tmp-cxx/DEBIAN/postinst
chmod 755 debian/tmp-cxx/DEBIAN/postinst
sed -e 's/netcdf/$(p_cxx)/' \
< debian/prerm > debian/tmp-cxx/DEBIAN/prerm
@@ -299,6 +299,12 @@
install -d debian/tmp-bin debian/tmp-bin/DEBIAN
install -d debian/tmp-bin/usr/share/doc/$(package)-bin
# Install Debian package control information files
+ cp -a debian/$(package)g-dev.postinst \
+ debian/tmp-dev/DEBIAN/postinst
+ chmod 755 debian/tmp-dev/DEBIAN/postinst
+ cp -a debian/$(package)-bin.postinst \
+ debian/tmp-bin/DEBIAN/postinst
+ chmod 755 debian/tmp-bin/DEBIAN/postinst
sed -e 's/netcdf/$(package)g-dev/; /ldconfig/d' \
< debian/prerm > debian/tmp-dev/DEBIAN/prerm
chmod 755 debian/tmp-dev/DEBIAN/prerm
reverted:
--- netcdf-3.6.1/debian/postinst
+++ netcdf-3.6.1.orig/debian/postinst
@@ -1,5 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = "configure" ]; then
- ldconfig
-fi
diff -u netcdf-3.6.1/src/config.h netcdf-3.6.1/src/config.h
--- netcdf-3.6.1/src/config.h
+++ netcdf-3.6.1/src/config.h
@@ -108,7 +108,7 @@
#define SIZEOF_INT 4
/* The size of a `long', as computed by sizeof. */
-#define SIZEOF_LONG 8
+#define SIZEOF_LONG 4
/* type size */
#define SIZEOF_OFF_T 8
@@ -117,7 +117,7 @@
#define SIZEOF_SHORT 2
/* type size */
-#define SIZEOF_SIZE_T 8
+#define SIZEOF_SIZE_T 4
/* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be
@@ -144,7 +144,7 @@
/* #undef WORDS_BIGENDIAN */
/* Number of bits in a file offset, on hosts where this is settable. */
-/* #undef _FILE_OFFSET_BITS */
+#define _FILE_OFFSET_BITS 64
/* Define for large files, on AIX-style hosts. */
/* #undef _LARGE_FILES */
only in patch2:
unchanged:
--- netcdf-3.6.1.orig/debian/libnetcdf3.postinst
+++ netcdf-3.6.1/debian/libnetcdf3.postinst
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if [ "$1" = "configure" ]; then
+ ldconfig
+fi
+
+# Remove stale symlink, a leftover from the sarge
+# version. This code can be removed after Etch.
+rm -f /usr/doc/netcdfg3
+
only in patch2:
unchanged:
--- netcdf-3.6.1.orig/debian/libnetcdf++3.postinst
+++ netcdf-3.6.1/debian/libnetcdf++3.postinst
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if [ "$1" = "configure" ]; then
+ ldconfig
+fi
+
+# Remove stale symlink, a leftover from the sarge
+# version. This code can be removed after Etch.
+rm -f /usr/doc/netcdfg3
+
only in patch2:
unchanged:
--- netcdf-3.6.1.orig/debian/netcdfg-dev.postinst
+++ netcdf-3.6.1/debian/netcdfg-dev.postinst
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if [ "$1" = "configure" ]; then
+ ldconfig
+fi
+
+# Remove stale symlink, a leftover from the sarge
+# version. This code can be removed after Etch.
+rm -f /usr/doc/netcdfg-dev
+
only in patch2:
unchanged:
--- netcdf-3.6.1.orig/debian/netcdf-bin.postinst
+++ netcdf-3.6.1/debian/netcdf-bin.postinst
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# Remove stale symlink, a leftover from the sarge
+# version. This code can be removed after Etch.
+rm -f /usr/doc/netcdf-bin
+
Attachment:
signature.asc
Description: This is a digitally signed message part