From a1a3b809867bb06e394c07092a72f291dd11a847 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 2 Jun 2017 19:54:13 +0200 Subject: refesh/remove patches --- debian/changelog | 6 ++++-- debian/patches/0100-source_typos.patch | 2 +- debian/patches/series | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'debian') 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 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 -- cgit v1.2.3 From fdbb426abaf3f9f2a619e3bc36c6fe139ace8175 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 2 Jun 2017 21:32:30 +0200 Subject: Use the automatic debug symbol packages --- debian/changelog | 7 +++++-- debian/control | 17 ----------------- debian/rules | 3 --- 3 files changed, 5 insertions(+), 22 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 03ed7da..f7a5854 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,13 +2,16 @@ libonig (6.3.0-1) unstable; urgency=medium * New upstream release. - Update symbols file. - - Refesh patches. + - Refresh 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. + * Use the automatic debug symbol packages: + - Remove libonig4-dbg section from debian/control. + - Remove override_dh_strip from debian/rules. - -- Jörg Frings-Fürst Sun, 09 Apr 2017 20:00:40 +0200 + -- Jörg Frings-Fürst Fri, 02 Jun 2017 19:00:40 +0200 libonig (6.1.3-2) unstable; urgency=high diff --git a/debian/control b/debian/control index c5fbb3d..10fe51c 100644 --- a/debian/control +++ b/debian/control @@ -24,23 +24,6 @@ Description: regular expressions library Different character encoding for every regular expression object can be specified. -Package: libonig4-dbg -Section: debug -Architecture: any -Multi-Arch: same -Depends: - ${misc:Depends}, - libonig4 (= ${binary:Version}) -Pre-Depends: - ${misc:Pre-Depends} -Description: regular expressions library — debugging symbols - Oniguruma is a library for working with regular expressions. - . - Different character encoding for every regular expression object can - be specified. - . - This package provides the debugging symbols. - Package: libonig-dev Section: libdevel Priority: optional diff --git a/debian/rules b/debian/rules index 69ed6ac..32be672 100755 --- a/debian/rules +++ b/debian/rules @@ -22,9 +22,6 @@ VERSION = $(shell head -n1 debian/changelog | sed -e 's/.*(//;s/-.*).*//;s/\+/\- %: dh $@ -override_dh_strip: - dh_strip --dbg-package=libonig4-dbg - override_dh_install: $(RM) debian/tmp/usr/bin/onig-config dh_install --fail-missing -X.la -X.a -- cgit v1.2.3 From b4f38d7d8bf8b2d5fa755c8fbd868e502eb66130 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 3 Jun 2017 08:40:25 +0200 Subject: New debian/DEVELOP.debian --- debian/DEVELOP.Debian | 18 ++++++++++++++++++ debian/changelog | 1 + 2 files changed, 19 insertions(+) create mode 100644 debian/DEVELOP.Debian (limited to 'debian') diff --git a/debian/DEVELOP.Debian b/debian/DEVELOP.Debian new file mode 100644 index 0000000..e4f2b3d --- /dev/null +++ b/debian/DEVELOP.Debian @@ -0,0 +1,18 @@ +Hello, + +now I use the branching model from Vincent Driessen[1]. + +I use the gitflow-avh[2]. with the Documentation[3]. +The Debian package can be found here[4]. + +Please upload unattended uploads use a branch feature/. + + +Many thanks. + + -- Jörg Frings-Fürst Fri, 02 Jun 2017 19:00:40 +0200 + +[1] http://nvie.com/posts/a-successful-git-branching-model/ +[2] https://github.com/petervanderdoes/gitflow-avh +[3] https://github.com/petervanderdoes/gitflow-avh/wiki +[4] https://tracker.debian.org/pkg/git-flow diff --git a/debian/changelog b/debian/changelog index f7a5854..800946a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ libonig (6.3.0-1) unstable; urgency=medium * Use the automatic debug symbol packages: - Remove libonig4-dbg section from debian/control. - Remove override_dh_strip from debian/rules. + * New debian/DEVELOP.debian -- Jörg Frings-Fürst Fri, 02 Jun 2017 19:00:40 +0200 -- cgit v1.2.3 From 71b65baf8495580286b34c803901c6061baf16e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 25 Jun 2017 09:17:58 +0200 Subject: renname d/DEVELOP.Debian to d/README.source --- debian/DEVELOP.Debian | 18 ------------------ debian/README.source | 18 ++++++++++++++++++ debian/changelog | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) delete mode 100644 debian/DEVELOP.Debian create mode 100644 debian/README.source (limited to 'debian') diff --git a/debian/DEVELOP.Debian b/debian/DEVELOP.Debian deleted file mode 100644 index e4f2b3d..0000000 --- a/debian/DEVELOP.Debian +++ /dev/null @@ -1,18 +0,0 @@ -Hello, - -now I use the branching model from Vincent Driessen[1]. - -I use the gitflow-avh[2]. with the Documentation[3]. -The Debian package can be found here[4]. - -Please upload unattended uploads use a branch feature/. - - -Many thanks. - - -- Jörg Frings-Fürst Fri, 02 Jun 2017 19:00:40 +0200 - -[1] http://nvie.com/posts/a-successful-git-branching-model/ -[2] https://github.com/petervanderdoes/gitflow-avh -[3] https://github.com/petervanderdoes/gitflow-avh/wiki -[4] https://tracker.debian.org/pkg/git-flow diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..e4f2b3d --- /dev/null +++ b/debian/README.source @@ -0,0 +1,18 @@ +Hello, + +now I use the branching model from Vincent Driessen[1]. + +I use the gitflow-avh[2]. with the Documentation[3]. +The Debian package can be found here[4]. + +Please upload unattended uploads use a branch feature/. + + +Many thanks. + + -- Jörg Frings-Fürst Fri, 02 Jun 2017 19:00:40 +0200 + +[1] http://nvie.com/posts/a-successful-git-branching-model/ +[2] https://github.com/petervanderdoes/gitflow-avh +[3] https://github.com/petervanderdoes/gitflow-avh/wiki +[4] https://tracker.debian.org/pkg/git-flow diff --git a/debian/changelog b/debian/changelog index 800946a..eeb4e7b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,7 +10,7 @@ libonig (6.3.0-1) unstable; urgency=medium * Use the automatic debug symbol packages: - Remove libonig4-dbg section from debian/control. - Remove override_dh_strip from debian/rules. - * New debian/DEVELOP.debian + * New README.source to explain the branching model used. -- Jörg Frings-Fürst Fri, 02 Jun 2017 19:00:40 +0200 -- cgit v1.2.3 From 3ef49f8de6794777791fdc48ee4b73926ea51e1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 25 Jun 2017 09:53:51 +0200 Subject: Declare compliance with Debian Policy 4.0.0 --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index eeb4e7b..b137077 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ libonig (6.3.0-1) unstable; urgency=medium - Remove libonig4-dbg section from debian/control. - Remove override_dh_strip from debian/rules. * New README.source to explain the branching model used. + * Declare compliance with Debian Policy 4.0.0. (No changes needed). -- Jörg Frings-Fürst Fri, 02 Jun 2017 19:00:40 +0200 diff --git a/debian/control b/debian/control index 10fe51c..6b25f28 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: extra Maintainer: Jörg Frings-Fürst Build-Depends: debhelper (>= 10) -Standards-Version: 3.9.8 +Standards-Version: 4.0.0 Homepage: https://github.com/kkos/oniguruma Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/libonig.git Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/libonig.git -- cgit v1.2.3