Followup-For: Bug #693984

Hi,

I have just asked the SRM for fixing via s-p-u:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=700672
and this will be granted very likely.

A proposed patch is attached, I intend to NMU libzorpll once that
request was accepted. Unfortunately p-u-NEW will close on Monday for the
next point release that is scheduled for 23rd, so I can probably only 
upload this to DELAYED/1 to be in time ...

In case you have any objections, please let me know and I won't NMU.


Andreas
diffstat for libzorpll_3.3.0.12-4 libzorpll_3.3.0.12-4+squeeze1

 changelog |    9 +++++++++
 control   |    2 ++
 2 files changed, 11 insertions(+)

diff -u libzorpll-3.3.0.12/debian/changelog libzorpll-3.3.0.12/debian/changelog
--- libzorpll-3.3.0.12/debian/changelog
+++ libzorpll-3.3.0.12/debian/changelog
@@ -1,3 +1,12 @@
+libzorpll (3.3.0.12-4+squeeze1) stable; urgency=low
+
+  * Non-maintainer upload.
+  * libzorpll-dev: Add (unversioned) Breaks/Replaces: libzorp2-dev due to a
+    file conflict. libzorp2-dev was removed after lenny and now libzorpll-dev
+    ships /usr/include/zorp/streamblob.h.  (Closes: #693984)
+
+ -- Andreas Beckmann <a...@debian.org>  Sat, 16 Feb 2013 00:02:20 +0100
+
 libzorpll (3.3.0.12-4) unstable; urgency=low
 
   * Fixed process.c compilation error when libcap is not
diff -u libzorpll-3.3.0.12/debian/control libzorpll-3.3.0.12/debian/control
--- libzorpll-3.3.0.12/debian/control
+++ libzorpll-3.3.0.12/debian/control
@@ -23,6 +23,8 @@
 Section: libdevel
 Architecture: any
 Depends: libzorpll3.3-0 (= ${binary:Version}), ${misc:Depends}, libglib2.0-dev, libcap-dev [linux-any], libssl-dev
+Breaks: libzorp2-dev
+Replaces: libzorp2-dev
 Description: Low level library functions for Zorp, development files
  Zorp is a new generation firewall. It is essentially a transparent proxy
  firewall, with strict protocol analyzing proxies, a modular architecture,

Reply via email to