summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-06-02 19:54:13 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-06-02 19:54:13 +0200
commita1a3b809867bb06e394c07092a72f291dd11a847 (patch)
tree6a87eb073688debd5b391519b7cb7c661ecdbbfa
parent7b8e42400dc780b86479b4f0c713db5d9aa6623b (diff)
refesh/remove patches
-rw-r--r--debian/changelog6
-rw-r--r--debian/patches/0100-source_typos.patch2
-rw-r--r--debian/patches/series2
3 files changed, 6 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 7a8155d..03ed7da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
-libonig (6.2.0-1) unstable; urgency=medium
+libonig (6.3.0-1) unstable; urgency=medium
* New upstream release.
- Update symbols file.
- * Drop dh-autoreconf from both build-depends and dh --with arguments
+ - Refesh patches.
+ * Drop dh-autoreconf from both build-depends and dh --with arguments.
because this is all defaults when using dh compat 10.
* debian/copyright: Add year 2017.
+ * Remove upstream applied debian/patches/0500-CVE-2017-922[4-9].patch.
-- Jörg Frings-Fürst <debian@jff-webhosting.net> Sun, 09 Apr 2017 20:00:40 +0200
diff --git a/debian/patches/0100-source_typos.patch b/debian/patches/0100-source_typos.patch
index fe1bca0..ec96ad2 100644
--- a/debian/patches/0100-source_typos.patch
+++ b/debian/patches/0100-source_typos.patch
@@ -7,7 +7,7 @@ Index: trunk/src/regerror.c
===================================================================
--- trunk.orig/src/regerror.c
+++ trunk/src/regerror.c
-@@ -65,7 +65,7 @@ onig_error_code_to_format(int code)
+@@ -67,7 +67,7 @@ onig_error_code_to_format(int code)
case ONIGERR_UNEXPECTED_BYTECODE:
p = "unexpected bytecode (bug)"; break;
case ONIGERR_DEFAULT_ENCODING_IS_NOT_SETTED:
diff --git a/debian/patches/series b/debian/patches/series
index 06ee93d..2f55f57 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
#001-changes_build_sys.diff
0100-source_typos.patch
-0500-CVE-2017-922[4-9].patch
+#0500-CVE-2017-922[4-9].patch