Control: tags 836654 + patch
Control: tags 836654 + pending

Dear maintainer,

I've prepared an NMU for siege (versioned as 4.0.2-1.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Attached git format-patch of the changes, that I'll push if the NMU
goes through.

Regards.

-- 
regards,
                        Mattia Rizzolo

GPG Key: 66AE 2B4A FCCF 3F52 DA18  4D18 4B04 3FCD B944 4540      .''`.
more about me:  https://mapreri.org                             : :'  :
Launchpad user: https://launchpad.net/~mapreri                  `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia  `-
diffstat for siege-4.0.2 siege-4.0.2

 changelog                |   12 ++++++++++++
 compat                   |    2 +-
 control                  |    8 ++++----
 rules                    |    4 ++--
 source/lintian-overrides |    5 -----
 5 files changed, 19 insertions(+), 12 deletions(-)

diff -Nru siege-4.0.2/debian/changelog siege-4.0.2/debian/changelog
--- siege-4.0.2/debian/changelog	2016-06-16 11:35:23.000000000 +0000
+++ siege-4.0.2/debian/changelog	2016-09-27 13:28:01.000000000 +0000
@@ -1,3 +1,15 @@
+siege (4.0.2-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Canonicalize Vcs-* fields.
+  * bump debhelper compat level to 9:
+    + dh exports build flags from dpkg-buildflags.
+  * Stop using hardening-wrapper, make use of dpkg-buildflags with
+        DEB_BUILD_MAINT_OPTIONS=hardening=+all
+    instead.  Closes: #836654
+
+ -- Mattia Rizzolo <mat...@debian.org>  Tue, 27 Sep 2016 13:28:01 +0000
+
 siege (4.0.2-1) unstable; urgency=medium
 
   * New upstream version 4.0.2.
diff -Nru siege-4.0.2/debian/compat siege-4.0.2/debian/compat
--- siege-4.0.2/debian/compat	2016-06-16 11:35:23.000000000 +0000
+++ siege-4.0.2/debian/compat	2016-09-27 13:26:35.000000000 +0000
@@ -1 +1 @@
-7
+9
diff -Nru siege-4.0.2/debian/control siege-4.0.2/debian/control
--- siege-4.0.2/debian/control	2016-06-16 11:35:23.000000000 +0000
+++ siege-4.0.2/debian/control	2016-09-27 13:27:41.000000000 +0000
@@ -2,11 +2,11 @@
 Section: web
 Priority: optional
 Maintainer: Josue Abarca <jmasli...@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), libssl-dev (>= 0.9.8),
- autotools-dev (>= 20100122.1), hardening-wrapper
+Build-Depends: debhelper (>= 9), libssl-dev (>= 0.9.8),
+ autotools-dev (>= 20100122.1)
 Standards-Version: 3.9.8
-Vcs-Git: https://alioth.debian.org/anonscm/git/collab-maint/siege.git
-Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/siege.git
+Vcs-Git: https://anonscm.debian.org/git/collab-maint/siege.git
+Vcs-Browser: https://anonscm.debian.org/git/collab-maint/siege.git
 Homepage: http://www.joedog.org/JoeDog/Siege
 
 Package: siege
diff -Nru siege-4.0.2/debian/rules siege-4.0.2/debian/rules
--- siege-4.0.2/debian/rules	2016-06-16 11:35:23.000000000 +0000
+++ siege-4.0.2/debian/rules	2016-09-27 13:27:28.000000000 +0000
@@ -4,8 +4,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# Enable the hardening-wrapper
-export DEB_BUILD_HARDENING=1
+# Enable the hardening build flags
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
 	dh $@ --with autotools_dev
diff -Nru siege-4.0.2/debian/source/lintian-overrides siege-4.0.2/debian/source/lintian-overrides
--- siege-4.0.2/debian/source/lintian-overrides	2016-06-16 11:35:23.000000000 +0000
+++ siege-4.0.2/debian/source/lintian-overrides	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-# Lintian now throws an error when build-depending on hardening-wrapper stating
-# that the package is obsolete, but #711193 states that the hardening-wrapper
-# is /not/ obsolete, but rather dpkg buildflags should be used instead when
-# possible -- however this is still a work in progress in the case of siege.
-siege source: build-depends-on-obsolete-package build-depends: hardening-wrapper => use dpkg-buildflags instead
From 50ca03e738bba719b7cd0c93364cf925bb1587df Mon Sep 17 00:00:00 2001
From: Mattia Rizzolo <mat...@debian.org>
Date: Tue, 27 Sep 2016 13:19:57 +0000
Subject: [PATCH 1/4] Canonicalize Vcs-* fields

---
 debian/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index cb82d5d..b70856c 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,8 @@ Maintainer: Josue Abarca <jmasli...@debian.org>
 Build-Depends: debhelper (>= 7.0.50~), libssl-dev (>= 0.9.8),
  autotools-dev (>= 20100122.1), hardening-wrapper
 Standards-Version: 3.9.8
-Vcs-Git: https://alioth.debian.org/anonscm/git/collab-maint/siege.git
-Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/siege.git
+Vcs-Git: https://anonscm.debian.org/git/collab-maint/siege.git
+Vcs-Browser: https://anonscm.debian.org/git/collab-maint/siege.git
 Homepage: http://www.joedog.org/JoeDog/Siege
 
 Package: siege
-- 
2.9.3

From 6e490e8bc05c824d20db1627632b706d5473a732 Mon Sep 17 00:00:00 2001
From: Mattia Rizzolo <mat...@debian.org>
Date: Tue, 27 Sep 2016 13:23:14 +0000
Subject: [PATCH 2/4] bump debhelper compat level to 9

+ dh exports build flags from dpkg-buildflags
---
 debian/compat  | 2 +-
 debian/control | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index b70856c..0868ac7 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: siege
 Section: web
 Priority: optional
 Maintainer: Josue Abarca <jmasli...@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), libssl-dev (>= 0.9.8),
+Build-Depends: debhelper (>= 9), libssl-dev (>= 0.9.8),
  autotools-dev (>= 20100122.1), hardening-wrapper
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/collab-maint/siege.git
-- 
2.9.3

From 0b8e286bb7b370b61fb30da990e38721b879b71b Mon Sep 17 00:00:00 2001
From: Mattia Rizzolo <mat...@debian.org>
Date: Tue, 27 Sep 2016 13:23:34 +0000
Subject: [PATCH 3/4] Stop using hardening-wrapper, make use of dpkg-buildflags
 with DEB_BUILD_MAINT_OPTIONS=hardening=+all instead

Closes: #836654
---
 debian/control                  | 2 +-
 debian/rules                    | 4 ++--
 debian/source/lintian-overrides | 5 -----
 3 files changed, 3 insertions(+), 8 deletions(-)
 delete mode 100644 debian/source/lintian-overrides

diff --git a/debian/control b/debian/control
index 0868ac7..b4524c7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: web
 Priority: optional
 Maintainer: Josue Abarca <jmasli...@debian.org>
 Build-Depends: debhelper (>= 9), libssl-dev (>= 0.9.8),
- autotools-dev (>= 20100122.1), hardening-wrapper
+ autotools-dev (>= 20100122.1)
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/collab-maint/siege.git
 Vcs-Browser: https://anonscm.debian.org/git/collab-maint/siege.git
diff --git a/debian/rules b/debian/rules
index 25c5d32..24cf17f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# Enable the hardening-wrapper
-export DEB_BUILD_HARDENING=1
+# Enable the hardening build flags
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
 	dh $@ --with autotools_dev
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
deleted file mode 100644
index fa80195..0000000
--- a/debian/source/lintian-overrides
+++ /dev/null
@@ -1,5 +0,0 @@
-# Lintian now throws an error when build-depending on hardening-wrapper stating
-# that the package is obsolete, but #711193 states that the hardening-wrapper
-# is /not/ obsolete, but rather dpkg buildflags should be used instead when
-# possible -- however this is still a work in progress in the case of siege.
-siege source: build-depends-on-obsolete-package build-depends: hardening-wrapper => use dpkg-buildflags instead
-- 
2.9.3

From b4ee341b674a499b8c80a948a0385185e80d8a7c Mon Sep 17 00:00:00 2001
From: Mattia Rizzolo <mat...@debian.org>
Date: Tue, 27 Sep 2016 13:31:31 +0000
Subject: [PATCH 4/4] changelog for 4.0.2-1.1

---
 debian/changelog | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index dd1b262..b7fd1a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+siege (4.0.2-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Canonicalize Vcs-* fields.
+  * bump debhelper compat level to 9:
+    + dh exports build flags from dpkg-buildflags.
+  * Stop using hardening-wrapper, make use of dpkg-buildflags with
+        DEB_BUILD_MAINT_OPTIONS=hardening=+all
+    instead.  Closes: #836654
+
+ -- Mattia Rizzolo <mat...@debian.org>  Tue, 27 Sep 2016 13:28:01 +0000
+
 siege (4.0.2-1) unstable; urgency=medium
 
   * New upstream version 4.0.2.
-- 
2.9.3

Attachment: signature.asc
Description: PGP signature

Reply via email to