Control: tags -1 - moreinfo
On Wed, 20 Mar 2019 13:02:13 +0100 Emilio Pozuelo Monfort <po...@debian.org>
wrote:
> Yeah, it's too late for debhelper compat bumps really. Please revert that and
> remove the moreinfo tag when that's done. The rest looks fine.
I have now reverted the debhelper compat bump. I have also updated
the meta-information of one of the two patches (the issue has been
fixed upstream in the meantime).
I have attached a debdiff between the version in testing (3.1-5) and
the new version in unstable (3.1-7).
Thanks,
Fabian
diff -Nru squirrel3-3.1/debian/changelog squirrel3-3.1/debian/changelog
--- squirrel3-3.1/debian/changelog 2017-09-17 21:31:30.000000000 +0200
+++ squirrel3-3.1/debian/changelog 2019-03-20 20:37:02.000000000 +0100
@@ -1,3 +1,22 @@
+squirrel3 (3.1-7) unstable; urgency=medium
+
+ * Revert upgrade to debhelper compat level 12.
+ * Update meta-information of 02-sphinx-ext.patch.
+
+ -- Fabian Wolff <fabi.wo...@arcor.de> Wed, 20 Mar 2019 20:37:02 +0100
+
+squirrel3 (3.1-6) unstable; urgency=medium
+
+ * Update Vcs-Git and Vcs-Browser fields in debian/control.
+ * Add patch 02-sphinx-ext.patch to disable the pngmath Sphinx
+ extension (Closes: #923012).
+ * Add Applied-Upstream field to header of patch
+ 01-fix-spelling-errors.patch.
+ * Upgrade to Standards-Version 4.3.0 (no changes).
+ * Upgrade to debhelper compat level 12.
+
+ -- Fabian Wolff <fabi.wo...@arcor.de> Sun, 03 Mar 2019 01:37:29 +0100
+
squirrel3 (3.1-5) unstable; urgency=medium
* Update debian/copyright.
diff -Nru squirrel3-3.1/debian/control squirrel3-3.1/debian/control
--- squirrel3-3.1/debian/control 2017-09-17 21:31:30.000000000 +0200
+++ squirrel3-3.1/debian/control 2019-03-20 20:37:02.000000000 +0100
@@ -9,10 +9,10 @@
texlive-latex-extra,
texlive-generic-extra,
latexmk
-Standards-Version: 4.1.0
+Standards-Version: 4.3.0
Homepage: http://squirrel-lang.org/
-Vcs-Git: https://anonscm.debian.org/git/collab-maint/squirrel3.git
-Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/squirrel3.git
+Vcs-Git: https://salsa.debian.org/wolff-guest/squirrel3.git/
+Vcs-Browser: https://salsa.debian.org/wolff-guest/squirrel3
Package: squirrel3
Architecture: any
diff -Nru squirrel3-3.1/debian/patches/01-fix-spelling-errors.patch squirrel3-3.1/debian/patches/01-fix-spelling-errors.patch
--- squirrel3-3.1/debian/patches/01-fix-spelling-errors.patch 2017-09-17 21:31:30.000000000 +0200
+++ squirrel3-3.1/debian/patches/01-fix-spelling-errors.patch 2019-03-20 20:37:02.000000000 +0100
@@ -3,7 +3,8 @@
false positive).
Author: Fabian Wolff <fabi.wo...@arcor.de>
Forwarded: https://github.com/albertodemichelis/squirrel/pull/30
-Last-Update: 2016-04-03
+Applied-Upstream: https://github.com/albertodemichelis/squirrel/commit/6db0aa2095da222d06a0690eaacd5a8966c0651e
+Last-Update: 2019-03-03
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/sq/sq.c
diff -Nru squirrel3-3.1/debian/patches/02-sphinx-ext.patch squirrel3-3.1/debian/patches/02-sphinx-ext.patch
--- squirrel3-3.1/debian/patches/02-sphinx-ext.patch 1970-01-01 01:00:00.000000000 +0100
+++ squirrel3-3.1/debian/patches/02-sphinx-ext.patch 2019-03-20 20:37:02.000000000 +0100
@@ -0,0 +1,19 @@
+Description: Remove pngmath extension from Sphinx configuration
+Author: Fabian Wolff <fabi.wo...@arcor.de>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=923012
+Forwarded: https://github.com/albertodemichelis/squirrel/issues/176
+Applied-Upstream: https://github.com/albertodemichelis/squirrel/commit/ca2c74b319ce379a00b646750bbbcd6cb81a39ed
+Last-Update: 2019-03-20
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/doc/source/conf.py
++++ b/doc/source/conf.py
+@@ -30,7 +30,7 @@
+ # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+ # ones.
+ extensions = [
+- 'sphinx.ext.pngmath',
++# 'sphinx.ext.pngmath',
+ ]
+
+ # Add any paths that contain templates here, relative to this directory.
diff -Nru squirrel3-3.1/debian/patches/series squirrel3-3.1/debian/patches/series
--- squirrel3-3.1/debian/patches/series 2017-09-17 21:31:30.000000000 +0200
+++ squirrel3-3.1/debian/patches/series 2019-03-20 20:37:02.000000000 +0100
@@ -1 +1,2 @@
01-fix-spelling-errors.patch
+02-sphinx-ext.patch
