pre-upload approval for readline5 NMU

[Holger Levsen <holger@layer-acht.org>]

Hi,

I'm asking for pre-upload approval (from the release team) for readline5, 
fixing the RC bug #670111 and the multiarch-bug #670028. I'd like to upload 
this now, but to DELAYED-5 to give the maintainer some time to do their own 
upload.

The debdiff is attached.


cheers,
	Holger

diff -u readline5-5.2/debian/rules readline5-5.2/debian/rules
--- readline5-5.2/debian/rules
+++ readline5-5.2/debian/rules
@@ -393,6 +393,10 @@
 	mkdir -p $(d_rld)/usr/share/doc/$(p_rl)/examples
 	cp -p $(builddir)/examples/Makefile examples/*.c \
 		$(d_rld)/usr/share/doc/$(p_rl)/examples/
+	sed -i -e's,srcdir = .*/readline5-5.2/examples,srcdir = /usr/share/doc/libreadline5/examples,' \
+	    -e's,VPATH = .:.*/readline5-5.2/examples,VPATH = .:/usr/share/doc/libreadline5/examples,' \
+	    -e's,top_srcdir = .*/readline5-5.2,top_srcdir = /usr/include/readline/,' \
+	    $(d_rld)/usr/share/doc/$(p_rl)/examples/Makefile
 	ln -sf $(p_rl) $(d_rld)/usr/share/doc/$(p_rld)
 	ln -sf $(p_rl) $(d_rlg)/usr/share/doc/$(p_rlg)
 
diff -u readline5-5.2/debian/control readline5-5.2/debian/control
--- readline5-5.2/debian/control
+++ readline5-5.2/debian/control
@@ -34,7 +34,7 @@
 Package: libreadline-gplv2-dev
 Architecture: any
 Depends: libreadline5 (= ${binary:Version}), libtinfo-dev, ${shlibs:Depends}, ${misc:Depends}, dpkg (>= 1.15.4) | install-info
-Conflicts: libreadline-dev, libreadline5-dev
+Conflicts: libreadline-dev, libreadline5-dev, libreadline6-dev
 Replaces: libreadline5-dev
 Multi-Arch: same
 Section: libdevel
diff -u readline5-5.2/debian/changelog readline5-5.2/debian/changelog
--- readline5-5.2/debian/changelog
+++ readline5-5.2/debian/changelog
@@ -1,3 +1,14 @@
+readline5 (5.2-11.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * libreadline-gplv2-dev: explicitly conflict against libreadline6-dev.
+    Closes: #670111.
+  * libreadline-gplv2-dev: substitute build- and architecture-dependant paths
+    in examples/Makefile with their actual, arch-indep value.
+    Closes: #658850, #670028.
+
+ -- Florian Schlichting <fschlich@zedat.fu-berlin.de>  Sat, 15 Sep 2012 20:57:13 +0200
+
 readline5 (5.2-11) unstable; urgency=low
 
   * Do not link against any libncurses* library, just against libtinfo.