Merge lp:~gandelman-a/ubuntu/oneiric/netcat-openbsd/merge into lp:ubuntu/oneiric/netcat-openbsd

[Adam Gandelman]

quit-timer.patch deltas have been resolved in debian patch.

netcat-openbsd (1.89-4ubuntu1) UNRELEASED; urgency=low

  * Merge from Debian unstable. Remaining changes:
    - debian/patches/dccp.patch: Added support for dccp
    - debian/patches/netcat-info.patch: Add info about netcat-traditional
      if you are looking for an option when it is not available. (LP: #590925)
    - debian/patches/verbose-message-to-stderr.patch: Log "Connection to ..."
      messages to stderr (LP: #519210)
    - Modify Maintainer value to match the DebianMaintainerField
      specification.
    - Fix build failure with --as-needed.

 -- Adam Gandelman <email address hidden> Thu, 30 Jun 2011 04:56:22 -070

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-11 14:31:06 +0000
+++ debian/changelog	2011-06-30 12:06:37 +0000
@@ -1,3 +1,28 @@
+netcat-openbsd (1.89-4ubuntu1) UNRELEASED; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/patches/dccp.patch: Added support for dccp
+    - debian/patches/netcat-info.patch: Add info about netcat-traditional
+      if you are looking for an option when it is not available.
+      (LP: #590925)
+    - debian/patches/verbose-message-to-stderr.patch: Log "Connection to ..."
+      messages to stderr (LP: #519210)
+    - Modify Maintainer value to match the DebianMaintainerField
+      specification.
+    - Fix build failure with --as-needed.
+
+ -- Adam Gandelman <[e-mail]>  Thu, 30 Jun 2011 04:56:22 -0700
+
+netcat-openbsd (1.89-4) unstable; urgency=low
+
+  * Quit immediately after EOF if -q is not given (i.e. make the default
+    equivalent to -q 0). This is the standard upstream behavior and what
+    other Linux distributions use. It is different from netcat-traditional,
+    but compatibility with other versions of OpenBSD netcat is more
+    important. (Closes: #502188)
+
+ -- Decklin Foster <[e-mail]>  Sun, 18 Apr 2010 20:05:08 -0400
+
 netcat-openbsd (1.89-3ubuntu6) oneiric; urgency=low
 
   * debian/patches/dccp.patch: Added support for dccp