[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#924691: marked as done (unblock: potool/0.16-4)

Your message dated Sat, 16 Mar 2019 11:37:23 +0000
with message-id <E1h57cx-0000xk-6K@respighi.debian.org>
and subject line unblock potool
has caused the Debian Bug report #924691,
regarding unblock: potool/0.16-4
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
924691: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=924691
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package potool

I was not able to upload this update earlier in the freeze cycle, but I
think our users will be better served by having -4 in buster than -3:
- these are rather low risk changes,
- the added autopkgtests means we now actually check whether it does
  work,
- it's a leaf package, so no impact to other packages.

Summary of key changes between 0.16-3 and 0.16-4:
- add a missing depends on sensible-utils
- properly pass all hardening flags (by using a more recent DH compat
  level and dropping explicit *FLAGS variables from debian/rules)

While at it, I also:
- added DEP8 tests
- bumped standards-version
- moved Homepage field to where it belongs
- added vcs-* fields
- bumped copyright years

Src debdiff attached.

unblock potool/0.16-4

diff -Nru potool-0.16/debian/changelog potool-0.16/debian/changelog
--- potool-0.16/debian/changelog	2017-09-24 21:00:55.000000000 +0200
+++ potool-0.16/debian/changelog	2019-03-04 21:42:07.000000000 +0100
@@ -1,3 +1,14 @@
+potool (0.16-4) unstable; urgency=medium
+
+  * Bumped debhelper compat level to 9
+  * Bumped Standards-Version, no changes needed
+  * Added Vcs-* headers, moved the Homepage one to the top stanza
+  * Declared a dependency on sensible-utils
+  * Removed explicit setting of *FLAGS, as dh does this more correctly
+  * Enabled all hardening options
+
+ -- Marcin Owsiany <porridge@debian.org>  Mon, 04 Mar 2019 21:42:07 +0100
+
 potool (0.16-3) unstable; urgency=medium
 
   * Updated standards-version, no changes needed
diff -Nru potool-0.16/debian/compat potool-0.16/debian/compat
--- potool-0.16/debian/compat	2013-02-27 07:37:29.000000000 +0100
+++ potool-0.16/debian/compat	2019-03-04 20:13:06.000000000 +0100
@@ -1 +1 @@
-8
+9
diff -Nru potool-0.16/debian/control potool-0.16/debian/control
--- potool-0.16/debian/control	2017-09-24 21:00:48.000000000 +0200
+++ potool-0.16/debian/control	2019-03-04 21:42:07.000000000 +0100
@@ -2,14 +2,16 @@
 Section: utils
 Priority: optional
 Maintainer: Marcin Owsiany <porridge@debian.org>
-Standards-Version: 4.1.0
-Build-Depends: libglib2.0-dev, bison, flex, debhelper (>= 8), rename
+Standards-Version: 4.3.0
+Build-Depends: libglib2.0-dev, bison, flex, debhelper (>> 9), rename
+Vcs-Git: https://github.com/porridge/potool -b debian
+Vcs-Browser: https://github.com/porridge/potool/tree/debian
+Homepage: http://marcin.owsiany.pl/potool-page
 
 Package: potool
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, sensible-utils
 Breaks: poedit (<< 1.0.3-2)
-Homepage: http://marcin.owsiany.pl/potool-page
 Description: program to aid manipulation of gettext po files
  This package contains the filter program 'potool', as well
  as a few helper scripts:
diff -Nru potool-0.16/debian/copyright potool-0.16/debian/copyright
--- potool-0.16/debian/copyright	2013-02-27 07:37:29.000000000 +0100
+++ potool-0.16/debian/copyright	2019-03-04 21:15:59.000000000 +0100
@@ -11,7 +11,7 @@
 
 potool is a program aiding editing of po files
 Copyright (C) 1999-2000 Zbigniew Chyla <cyba@gnome.pl>
-Copyright (C) 2000-2012 Marcin Owsiany <porridge@debian.org>
+Copyright (C) 2000-2019 Marcin Owsiany <porridge@debian.org>
 
 License information:
 
diff -Nru potool-0.16/debian/rules potool-0.16/debian/rules
--- potool-0.16/debian/rules	2013-02-27 07:37:29.000000000 +0100
+++ potool-0.16/debian/rules	2019-03-04 21:36:18.000000000 +0100
@@ -1,10 +1,8 @@
 #!/usr/bin/make -f
-# Copyright 2012 Marcin Owsiany <porridge@debian.org>
+# Copyright 2012,2019 Marcin Owsiany <porridge@debian.org>
 
 export DH_VERBOSE=1
-export CFLAGS   := $(shell dpkg-buildflags --get CFLAGS)
-export CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
-export LDFLAGS  := $(shell dpkg-buildflags --get LDFLAGS)
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 %:
 	dh $@
 
diff -Nru potool-0.16/debian/tests/control potool-0.16/debian/tests/control
--- potool-0.16/debian/tests/control	1970-01-01 01:00:00.000000000 +0100
+++ potool-0.16/debian/tests/control	2019-03-04 21:13:41.000000000 +0100
@@ -0,0 +1,2 @@
+Test-Command: test $(potool -n ctxt -n str -n dcmt -n linf -s -fnt debian/tests/data/smoke-test-input.po) -eq 0
+Features: test-name=smoke
diff -Nru potool-0.16/debian/tests/data/smoke-test-input.po potool-0.16/debian/tests/data/smoke-test-input.po
--- potool-0.16/debian/tests/data/smoke-test-input.po	1970-01-01 01:00:00.000000000 +0100
+++ potool-0.16/debian/tests/data/smoke-test-input.po	2019-03-04 21:12:12.000000000 +0100
@@ -0,0 +1,25 @@
+# file comment
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: blah 0.0.1\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+
+#: src/simple.c:757
+msgid "one"
+msgstr "two"
+
+#: src/a.c:52 src/b.c:69
+#: src/c.c:305
+#, c-format
+msgid ""
+"fo%so \n"
+"\\bar"
+msgstr ""
+"blah\n"
+"\\boom%s"

--- End Message ---
--- Begin Message --- 
Unblocked.

--- End Message ---
Reply to: