Bug#772640: unblock: gamera/3.4.1+svn1423-4
Plus, here's the diff between 3.4.1+svn1423-1 and 3.4.1+svn1423-4.
Greetings,
Daniel Stender
--
http://qa.debian.org/developer.php?login=debian%40danielstender.com
GPG key: 4096R/DF5182C8
46CB 1CA8 9EA3 B743 7676 1DB9 15E0 9AF4 DF51 82C8
diff -Nru gamera-3.4.1+svn1423/debian/changelog gamera-3.4.1+svn1423/debian/changelog
--- gamera-3.4.1+svn1423/debian/changelog 2014-10-09 11:25:14.000000000 +0200
+++ gamera-3.4.1+svn1423/debian/changelog 2014-12-08 01:49:42.000000000 +0100
@@ -1,3 +1,23 @@
+gamera (3.4.1+svn1423-4) unstable; urgency=medium
+
+ * Upload to unstable.
+ * Specified patches Forwarded fields according to DEP-3.
+
+ -- Daniel Stender <debian@danielstender.com> Mon, 08 Dec 2014 01:18:36 +0100
+
+gamera (3.4.1+svn1423-3) experimental; urgency=medium
+
+ * Build dbg on arm64 with different optimization (Closes: #766740).
+ * Some patches toggled forwarded.
+
+ -- Daniel Stender <debian@danielstender.com> Thu, 20 Nov 2014 13:54:10 +0100
+
+gamera (3.4.1+svn1423-2) unstable; urgency=medium
+
+ * Added gendoc-version-parsing.diff (Closes: #767158).
+
+ -- Daniel Stender <debian@danielstender.com> Wed, 12 Nov 2014 09:45:13 +0100
+
gamera (3.4.1+svn1423-1) unstable; urgency=medium
* Updated source to SVN rev. 1423.
diff -Nru gamera-3.4.1+svn1423/debian/patches/avoid_mktemp.diff gamera-3.4.1+svn1423/debian/patches/avoid_mktemp.diff
--- gamera-3.4.1+svn1423/debian/patches/avoid_mktemp.diff 2014-07-09 01:49:56.000000000 +0200
+++ gamera-3.4.1+svn1423/debian/patches/avoid_mktemp.diff 2014-12-08 01:20:48.000000000 +0100
@@ -1,6 +1,6 @@
Description: Fixed security hole because of usage of tmpfile.mktemp()
-Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=737324
-Forwarded: no
+Bug: http://bugs.debian.org/737324
+Forwarded: http://sourceforge.net/p/gamera/code/1424/tree//trunk/gamera/gamera/io.py?diff=50c1e1f034309d0a1716b4b0:1423
Author: Daniel Stender <debian@danielstender.com>
Last-Update: 2014-07-09
--- a/gamera/io.py
diff -Nru gamera-3.4.1+svn1423/debian/patches/gendoc-use-wxversion.diff gamera-3.4.1+svn1423/debian/patches/gendoc-use-wxversion.diff
--- gamera-3.4.1+svn1423/debian/patches/gendoc-use-wxversion.diff 2014-08-06 13:25:21.000000000 +0200
+++ gamera-3.4.1+svn1423/debian/patches/gendoc-use-wxversion.diff 2014-12-08 01:20:48.000000000 +0100
@@ -2,7 +2,7 @@
Make the documentation generator prefer wxPython 2.8 over other versions.
This patch is intended to alleviate Debian bug #451104.
Author: Jakub Wilk <jwilk@debian.org>
-Forwarded: not-needed
+Forwarded: no
Reviewed-by: Daniel Stender <debian@danielstender.com>
Last-Update: 2014-08-06
diff -Nru gamera-3.4.1+svn1423/debian/patches/gendoc-version-parsing.diff gamera-3.4.1+svn1423/debian/patches/gendoc-version-parsing.diff
--- gamera-3.4.1+svn1423/debian/patches/gendoc-version-parsing.diff 1970-01-01 01:00:00.000000000 +0100
+++ gamera-3.4.1+svn1423/debian/patches/gendoc-version-parsing.diff 2014-12-08 01:20:48.000000000 +0100
@@ -0,0 +1,29 @@
+Description: fix invalid version number ValueError
+ the 'anarchic' version numbering of Pygments (currently in Sid: '2.0rc1') doesn't
+ fit into the needs for distutils.version.StrictVersion. LooseVersion isn't perfect,
+ but fulfills what's needed here
+Author: Daniel Stender <debian@danielstender.com>
+Bug: http://bugs.debian.org/767158
+Forwarded: http://sourceforge.net/p/gamera/code/1424/tree//trunk/gamera/gamera/gendoc.py?diff=50c1e1f034309d0a1716b4b0:1423
+Last-Update: 2014-10-29
+
+--- a/gamera/gendoc.py
++++ b/gamera/gendoc.py
+@@ -29,7 +29,7 @@
+ import locale
+ import traceback
+ import warnings
+-from distutils.version import StrictVersion
++from distutils.version import StrictVersion, LooseVersion
+ from gamera.util import dedent
+ try:
+ locale.setlocale(locale.LC_ALL, '')
+@@ -57,7 +57,7 @@
+ import pygments.lexers
+ import pygments.formatters
+ source_highlighter = 'pygments'
+- if StrictVersion(pygments.__version__) < StrictVersion('0.6'):
++ if LooseVersion(pygments.__version__) < LooseVersion('0.6'):
+ print "pygments version (" + pygments.__version__ + ") too old"
+ raise ImportError()
+ except ImportError, e:
diff -Nru gamera-3.4.1+svn1423/debian/patches/series gamera-3.4.1+svn1423/debian/patches/series
--- gamera-3.4.1+svn1423/debian/patches/series 2014-08-26 10:04:33.000000000 +0200
+++ gamera-3.4.1+svn1423/debian/patches/series 2014-10-30 02:00:01.000000000 +0100
@@ -10,3 +10,4 @@
trap-errors-from-pclose.diff
fix-typos.diff
avoid_mktemp.diff
+gendoc-version-parsing.diff
diff -Nru gamera-3.4.1+svn1423/debian/patches/suppress-wxdebug-assertion-messages.diff gamera-3.4.1+svn1423/debian/patches/suppress-wxdebug-assertion-messages.diff
--- gamera-3.4.1+svn1423/debian/patches/suppress-wxdebug-assertion-messages.diff 2014-09-05 15:30:41.000000000 +0200
+++ gamera-3.4.1+svn1423/debian/patches/suppress-wxdebug-assertion-messages.diff 2014-12-08 01:20:48.000000000 +0100
@@ -3,7 +3,7 @@
on exit
Author: Daniel Stender <debian@danielstender.com>
Bug: http://bugs.debian.org/758578
-Forwarded: no-needed
+Forwarded: http://sourceforge.net/p/gamera/code/1424/tree//trunk/gamera/gamera/gui/gui.py?diff=50c1e1f034309d0a1716b4b0:1423
Last-Update: 2014-08-26
--- a/gamera/gui/gui.py
diff -Nru gamera-3.4.1+svn1423/debian/patches/wxpython3.0-transition.diff gamera-3.4.1+svn1423/debian/patches/wxpython3.0-transition.diff
--- gamera-3.4.1+svn1423/debian/patches/wxpython3.0-transition.diff 2014-08-26 10:04:33.000000000 +0200
+++ gamera-3.4.1+svn1423/debian/patches/wxpython3.0-transition.diff 2014-12-08 01:20:48.000000000 +0100
@@ -3,7 +3,7 @@
cf. http://bugs.debian.org/758578, so completely disabled here
Bug: http://bugs.debian.org/757208
Author: Daniel Stender <debian@danielstender.com>
-Forwarded: no
+Forwarded: http://sourceforge.net/p/gamera/code/1424/tree//trunk/gamera/gamera/gui/gui_util.py?diff=50c1e1f034309d0a1716b4b0:1423
Last-Update: 2014-08-26
--- a/gamera/gui/gamera_display.py
diff -Nru gamera-3.4.1+svn1423/debian/rules gamera-3.4.1+svn1423/debian/rules
--- gamera-3.4.1+svn1423/debian/rules 2014-10-08 13:05:18.000000000 +0200
+++ gamera-3.4.1+svn1423/debian/rules 2014-11-20 13:26:59.000000000 +0100
@@ -8,10 +8,16 @@
export PYTHONHASHSEED=random
export CFLAGS = $(shell dpkg-buildflags --get CFLAGS)
-export CFLAGS_noopt = $(patsubst -O2,-Og,$(CFLAGS))
export CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
export LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
+DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+ifeq ($(DEB_BUILD_ARCH),arm64)
+export CFLAGS_noopt = $(patsubst -O2,-O0,$(CFLAGS))
+else
+export CFLAGS_noopt = $(patsubst -O2,-Og,$(CFLAGS))
+endif
+
nproc = $(or $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))),1)
python2 = $(shell pyversions -r)
python2d = $(addsuffix -dbg,$(python2))
Reply to: