Bug#836621: diffpdf: diff for NMU version 2.1.3-1.1

[Mattia Rizzolo]

Control: tags 836621 + patch
Control: tags 836621 + pending

Dear maintainer,

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

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 diffpdf-2.1.3 diffpdf-2.1.3

 changelog                   |   13 +++++++++++++
 control                     |    5 ++---
 copyright                   |    8 ++++----
 menu                        |    7 -------
 patches/02-buildflags.patch |   17 +++++++++++++++++
 patches/series              |    1 +
 rules                       |    2 +-
 7 files changed, 38 insertions(+), 15 deletions(-)

diff -Nru diffpdf-2.1.3/debian/changelog diffpdf-2.1.3/debian/changelog
--- diffpdf-2.1.3/debian/changelog	2013-11-04 16:16:33.000000000 +0000
+++ diffpdf-2.1.3/debian/changelog	2016-09-27 08:34:37.000000000 +0000
@@ -1,3 +1,16 @@
+diffpdf (2.1.3-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Stop using hardening-wrapper, make use of dpkg-buildflags with
+      DEB_BUILD_MAINT_OPTIONS=hardening=+all
+    instead.  Closes: #836621
+  * Use https in Vcs-Git.
+  * Drop menu file, as it has been deprecated by the tech-ctte.
+  * Add patch to have qmake use build flags from the environment.
+  * d/copyright: right order of paragraph to respect copyright-format 1.0.
+
+ -- Mattia Rizzolo <mat...@debian.org>  Tue, 27 Sep 2016 08:34:37 +0000
+
 diffpdf (2.1.3-1) unstable; urgency=low
 
   * New upstream version (Closes: #703440).
diff -Nru diffpdf-2.1.3/debian/control diffpdf-2.1.3/debian/control
--- diffpdf-2.1.3/debian/control	2013-11-04 16:16:33.000000000 +0000
+++ diffpdf-2.1.3/debian/control	2016-09-27 08:19:24.000000000 +0000
@@ -9,11 +9,10 @@
  , qt4-linguist-tools
  , libpoppler-qt4-dev
  , libpoppler-cpp-dev
- , hardening-wrapper
 Standards-Version: 3.9.5
 Homepage: http://www.qtrac.eu/diffpdf.html
-Vcs-Git: git://anonscm.debian.org/collab-maint/diffpdf.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/diffpdf.git
+Vcs-Git: https://anonscm.debian.org/git/collab-maint/diffpdf.git
+Vcs-Browser: https://anonscm.debian.org/git/collab-maint/diffpdf.git
 
 Package: diffpdf
 Architecture: any
diff -Nru diffpdf-2.1.3/debian/copyright diffpdf-2.1.3/debian/copyright
--- diffpdf-2.1.3/debian/copyright	2013-11-04 16:16:33.000000000 +0000
+++ diffpdf-2.1.3/debian/copyright	2016-09-27 08:33:39.000000000 +0000
@@ -2,14 +2,14 @@
 Upstream-Name: DiffPDF
 Upstream-Contact: Mark Summerfield <m...@qtrac.eu>
 
-Files: debian/*
-Copyright: © 2009-2012, David Paleino <da...@debian.org>
-License: GPL-2+
-
 Files: *
 Copyright: © 2008-2012, Qtrac Ltd.
 License: GPL-2+
 
+Files: debian/*
+Copyright: © 2009-2012, David Paleino <da...@debian.org>
+License: GPL-2+
+
 License: GPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
diff -Nru diffpdf-2.1.3/debian/menu diffpdf-2.1.3/debian/menu
--- diffpdf-2.1.3/debian/menu	2013-11-04 16:16:33.000000000 +0000
+++ diffpdf-2.1.3/debian/menu	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-?package(diffpdf): \
-	needs="X11" \
-	section="Applications/Viewers" \
-	title="DiffPDF" \
-	hints="Qt" \
-	command="diffpdf" \
-	icon="/usr/share/pixmaps/diffpdf.xpm"
diff -Nru diffpdf-2.1.3/debian/patches/02-buildflags.patch diffpdf-2.1.3/debian/patches/02-buildflags.patch
--- diffpdf-2.1.3/debian/patches/02-buildflags.patch	1970-01-01 00:00:00.000000000 +0000
+++ diffpdf-2.1.3/debian/patches/02-buildflags.patch	2016-09-27 08:31:01.000000000 +0000
@@ -0,0 +1,17 @@
+Description: teach qmake to use the compiling flags from the environment
+Author: Mattia Rizzolo <mat...@debian.org>
+Last-Update: 2016-09-27
+Forwarded: no
+
+--- a/diffpdf.pro
++++ b/diffpdf.pro
+@@ -32,6 +32,9 @@
+ TRANSLATIONS += diffpdf_es.ts
+ CODECFORTR    = UTF-8
+ LIBS	     += -lpoppler-qt4
++QMAKE_CFLAGS += $$(CPPFLAGS) $$(CFLAGS)
++QMAKE_CXXFLAGS += $$(CPPFLAGS) $$(CXXFLAGS)
++QMAKE_LFLAGS += $$(LDFLAGS)
+ win32 {
+     CONFIG += release
+ }
diff -Nru diffpdf-2.1.3/debian/patches/series diffpdf-2.1.3/debian/patches/series
--- diffpdf-2.1.3/debian/patches/series	2013-11-04 16:16:33.000000000 +0000
+++ diffpdf-2.1.3/debian/patches/series	2016-09-27 08:26:20.000000000 +0000
@@ -1 +1,2 @@
 01-fix_manpage.patch
+02-buildflags.patch
diff -Nru diffpdf-2.1.3/debian/rules diffpdf-2.1.3/debian/rules
--- diffpdf-2.1.3/debian/rules	2013-11-04 16:16:33.000000000 +0000
+++ diffpdf-2.1.3/debian/rules	2016-09-27 08:17:42.000000000 +0000
@@ -4,7 +4,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export DEB_BUILD_HARDENING=1
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 override_dh_auto_build:
 	qmake-qt4 diffpdf.pro

signature.asc
Description: PGP signature