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

Subscribers

People subscribed via source and target branches

to all changes: