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

Proposed by Adam Gandelman on 2011-06-30
Status: Merged
Merged at revision: 10
Proposed branch: lp:~gandelman-a/ubuntu/oneiric/netcat-openbsd/merge
Merge into: lp:ubuntu/oneiric/netcat-openbsd
Diff against target: 32 lines (+25/-0)
1 file modified
debian/changelog (+25/-0)
To merge this branch: bzr merge lp:~gandelman-a/ubuntu/oneiric/netcat-openbsd/merge
Reviewer Review Type Date Requested Status
Ubuntu branches 2011-06-30 Pending
Review via email: mp+66446@code.launchpad.net

Description of the change

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

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-06-11 14:31:06 +0000
3+++ debian/changelog 2011-06-30 12:06:37 +0000
4@@ -1,3 +1,28 @@
5+netcat-openbsd (1.89-4ubuntu1) UNRELEASED; urgency=low
6+
7+ * Merge from Debian unstable. Remaining changes:
8+ - debian/patches/dccp.patch: Added support for dccp
9+ - debian/patches/netcat-info.patch: Add info about netcat-traditional
10+ if you are looking for an option when it is not available.
11+ (LP: #590925)
12+ - debian/patches/verbose-message-to-stderr.patch: Log "Connection to ..."
13+ messages to stderr (LP: #519210)
14+ - Modify Maintainer value to match the DebianMaintainerField
15+ specification.
16+ - Fix build failure with --as-needed.
17+
18+ -- Adam Gandelman <adamg@canonical.com> Thu, 30 Jun 2011 04:56:22 -0700
19+
20+netcat-openbsd (1.89-4) unstable; urgency=low
21+
22+ * Quit immediately after EOF if -q is not given (i.e. make the default
23+ equivalent to -q 0). This is the standard upstream behavior and what
24+ other Linux distributions use. It is different from netcat-traditional,
25+ but compatibility with other versions of OpenBSD netcat is more
26+ important. (Closes: #502188)
27+
28+ -- Decklin Foster <decklin@red-bean.com> Sun, 18 Apr 2010 20:05:08 -0400
29+
30 netcat-openbsd (1.89-3ubuntu6) oneiric; urgency=low
31
32 * debian/patches/dccp.patch: Added support for dccp

Subscribers

People subscribed via source and target branches