Merge lp:~logan/ubuntu/saucy/radvd/1.9.1-1.1 into lp:ubuntu/saucy/radvd

Proposed by Logan Rosen
Status: Merged
Merged at revision: 25
Proposed branch: lp:~logan/ubuntu/saucy/radvd/1.9.1-1.1
Merge into: lp:ubuntu/saucy/radvd
Diff against target: 52 lines (+18/-2)
4 files modified
debian/changelog (+14/-0)
debian/compat (+1/-1)
debian/control (+1/-1)
debian/rules (+2/-0)
To merge this branch: bzr merge lp:~logan/ubuntu/saucy/radvd/1.9.1-1.1
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Ubuntu branches Pending
Review via email: mp+169581@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Good work.

review: Approve

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 2013-05-27 09:02:03 +0000
3+++ debian/changelog 2013-06-15 01:31:24 +0000
4@@ -1,3 +1,17 @@
5+radvd (1:1.9.1-1.1ubuntu1) saucy; urgency=low
6+
7+ * Merge from Debian unstable. Remaining changes:
8+ - debian/tests: Add autopkgtest.
9+
10+ -- Logan Rosen <logan@ubuntu.com> Fri, 14 Jun 2013 21:16:50 -0400
11+
12+radvd (1:1.9.1-1.1) unstable; urgency=low
13+
14+ * Non-maintainer upload with maintainer approval.
15+ * Apply patch to enable hardening build flags (Closes: #665715).
16+
17+ -- Thijs Kinkhorst <thijs@debian.org> Fri, 07 Jun 2013 11:04:30 +0200
18+
19 radvd (1:1.9.1-1ubuntu1) saucy; urgency=low
20
21 * debian/tests: Add autopkgtest.
22
23=== modified file 'debian/compat'
24--- debian/compat 2009-09-28 20:54:12 +0000
25+++ debian/compat 2013-06-15 01:31:24 +0000
26@@ -1,1 +1,1 @@
27-7
28+9
29
30=== modified file 'debian/control'
31--- debian/control 2013-05-27 09:02:03 +0000
32+++ debian/control 2013-06-15 01:31:24 +0000
33@@ -4,7 +4,7 @@
34 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
35 XSBC-Original-Maintainer: Ghe Rivero <ghe@debian.org>
36 Standards-Version: 3.9.3
37-Build-Depends: autotools-dev, debhelper (>= 7.0.50~), flex, bison,
38+Build-Depends: autotools-dev, debhelper (>= 9), flex, bison,
39 pkg-config,
40 libdaemon-dev
41 XS-Testsuite: autopkgtest
42
43=== modified file 'debian/rules'
44--- debian/rules 2011-12-09 10:18:38 +0000
45+++ debian/rules 2013-06-15 01:31:24 +0000
46@@ -1,5 +1,7 @@
47 #!/usr/bin/make -f
48
49+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
50+
51 %:
52 dh $@
53

Subscribers

People subscribed via source and target branches

to all changes: