From 6f5d6e0bfa8e6f8a3de16e4d537abcce4e94547d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 3 Jan 2015 14:31:42 +0100 Subject: some work for the new release. see debian/changelog --- debian/changelog | 40 ++++++++++++++++++++++++++++--- debian/control | 3 --- debian/copyright | 2 +- debian/libonig2-dbg.postinst | 2 +- debian/libonig2-dbg.postrm | 2 +- debian/libonig2-dbg.preinst | 2 +- debian/patches/001-changes_build_sys.diff | 14 +++++------ debian/rules | 12 ++++++---- debian/symbols | 2 ++ 9 files changed, 57 insertions(+), 22 deletions(-) diff --git a/debian/changelog b/debian/changelog index 47c12ec..d340e8c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,46 @@ -libonig (5.9.5-4) UNRELEASED; urgency=medium +libonig (5.9.6-1) unstable; urgency=medium + * New upstream release. + * Refresh debian/patches/001-changes_build_sys.diff. + * Refresh debian/symbols. + * debian/rules: + - rewrite override_dh_strip. + - Add dpkg-gensymbols to generate symbol file(s) + on every build. + * debian/copyright: + Add year 2015 to my entry at debian/*. * debian/control: + - Remove useless Depends ${shlibs:Depends} from libonig2-dbg + and libonig-dev - Add dpkg to Depends of libonig2-dbg to prevent error on upgrade wheezy to jessie. (Closes: #769556). - - Remove hardening-wrapper from Build-Depends. - Bump Standards-Version to 3.9.6 (no changes required). + - Add Vcs-* fields pointed to alioth. + - Remove deprecated hardening-wrapper from Build-Depends + (Closes: #774485). + * debian/*.postrm, debian/*.postinst, debian/*.preinst: + - Change version in calls of dpkg-maintscript-helper symlink_to_dir + to 5.9.6-1~. + * Revert unwanted NMUs 5.9.5-3.1 & 5.9.5-3.2, replace with own version. + * Add Vcs + + -- Jörg Frings-Fürst Sat, 03 Jan 2015 14:04:23 +0100 + +libonig (5.9.5-3.2) unstable; urgency=medium + + * Non-maintainer upload. + * Fix version for calls to dpkg-maintscript-helper symlink_to_dir. + (closes: #769556). + + -- Ivo De Decker Sun, 28 Dec 2014 12:11:12 +0100 + +libonig (5.9.5-3.1) unstable; urgency=high + + * Non-maintainer upload. + * Add missing pre-dependency on dpkg for dpkg-maintscript-helper + symlink_to_dir (closes: #769556). - -- Jörg Frings-Fürst Sat, 15 Nov 2014 08:11:34 +0100 + -- Julien Cristau Sat, 15 Nov 2014 11:53:45 +0100 libonig (5.9.5-3) unstable; urgency=medium diff --git a/debian/control b/debian/control index 018ace3..e14b510 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,6 @@ Source: libonig Section: libs Priority: extra Maintainer: Jörg Frings-Fürst -Homepage: http://www.geocities.jp/kosako3/oniguruma/ Build-Depends: debhelper (>= 9), dh-autoreconf @@ -31,7 +30,6 @@ Architecture: any Multi-Arch: same Depends: ${misc:Depends}, - ${shlibs:Depends}, libonig2 (= ${binary:Version}) Pre-Depends: dpkg (>= 1.17.21) @@ -48,7 +46,6 @@ Priority: optional Architecture: any Depends: ${misc:Depends}, - ${shlibs:Depends}, libonig2 (= ${binary:Version}) Description: Development files for libonig2 The characteristics of this library is that different diff --git a/debian/copyright b/debian/copyright index 34c7b93..ff2cbb2 100644 --- a/debian/copyright +++ b/debian/copyright @@ -30,7 +30,7 @@ License: BSD-2-clause Files: debian/* Copyright: 2006-2008 Max Kellermann - 2014 Jörg Frings-Fürst + 2014-2015 Jörg Frings-Fürst License: GPL-2+ License: GPL-2+ diff --git a/debian/libonig2-dbg.postinst b/debian/libonig2-dbg.postinst index 5eaf0cc..a749289 100644 --- a/debian/libonig2-dbg.postinst +++ b/debian/libonig2-dbg.postinst @@ -24,7 +24,7 @@ case "$1" in configure|abort-upgrade|abort-remove|abort-deconfigure) # Replace documentation directory symlink - dpkg-maintscript-helper symlink_to_dir /usr/share/doc/libonig2-dbg /usr/share/doc/libonig2 5.9.1-1~ -- "$@" + dpkg-maintscript-helper symlink_to_dir /usr/share/doc/libonig2-dbg /usr/share/doc/libonig2 5.9.6-1~ -- "$@" ;; *) diff --git a/debian/libonig2-dbg.postrm b/debian/libonig2-dbg.postrm index 87f4705..70afa31 100644 --- a/debian/libonig2-dbg.postrm +++ b/debian/libonig2-dbg.postrm @@ -18,7 +18,7 @@ set -e case "$1" in purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - dpkg-maintscript-helper symlink_to_dir /usr/share/doc/libonig2-dbg /usr/share/doc/libonig2 5.9.1-1~ -- "$@" + dpkg-maintscript-helper symlink_to_dir /usr/share/doc/libonig2-dbg /usr/share/doc/libonig2 5.9.6-1~ -- "$@" ;; *) diff --git a/debian/libonig2-dbg.preinst b/debian/libonig2-dbg.preinst index eb3a840..988f802 100644 --- a/debian/libonig2-dbg.preinst +++ b/debian/libonig2-dbg.preinst @@ -15,7 +15,7 @@ set -e case "$1" in install|upgrade|abort-upgrade) - dpkg-maintscript-helper symlink_to_dir /usr/share/doc/libonig2-dbg /usr/share/doc/libonig2 5.9.1-1~ -- "$@" + dpkg-maintscript-helper symlink_to_dir /usr/share/doc/libonig2-dbg /usr/share/doc/libonig2 5.9.6-1~ -- "$@" ;; *) echo "preinst called with unknown argument \`$1'" >&2 diff --git a/debian/patches/001-changes_build_sys.diff b/debian/patches/001-changes_build_sys.diff index cf98b0c..5750433 100644 --- a/debian/patches/001-changes_build_sys.diff +++ b/debian/patches/001-changes_build_sys.diff @@ -6,11 +6,11 @@ Last-Update: 2014-05-07 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ Index: trunk/configure.in =================================================================== ---- trunk.orig/configure.in 2014-05-07 16:35:17.303465288 +0200 -+++ trunk/configure.in 2014-05-07 16:35:49.536109222 +0200 +--- trunk.orig/configure.in ++++ trunk/configure.in @@ -1,9 +1,11 @@ dnl Process this file with autoconf to produce a configure script. - AC_INIT(onig, 5.9.5) + AC_INIT(onig, 5.9.6) + +AUTOMAKE_OPTIONS=subdir-objects @@ -21,7 +21,7 @@ Index: trunk/configure.in AC_CONFIG_HEADER(config.h) -@@ -41,7 +43,7 @@ +@@ -41,7 +43,7 @@ fi dnl Checks for programs. AC_PROG_CC AM_PROG_LIBTOOL @@ -32,9 +32,9 @@ Index: trunk/configure.in AC_PROG_INSTALL Index: trunk/Makefile.am =================================================================== ---- trunk.orig/Makefile.am 2014-05-07 16:35:17.303465288 +0200 -+++ trunk/Makefile.am 2014-05-07 16:35:17.295465127 +0200 -@@ -3,6 +3,7 @@ +--- trunk.orig/Makefile.am ++++ trunk/Makefile.am +@@ -3,6 +3,7 @@ encdir = $(top_srcdir)/enc sampledir = $(top_srcdir)/sample libname = libonig.la diff --git a/debian/rules b/debian/rules index d768ea6..ba2d2db 100755 --- a/debian/rules +++ b/debian/rules @@ -11,6 +11,8 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all +VERSION = $(shell head -n1 debian/changelog | sed -e 's/.*(//;s/-.*).*//;s/\+/\-/') + %: dh $@ --with autoreconf @@ -18,12 +20,12 @@ override_dh_installman: dh_installman -plibonig-dev -A debian/onig-config.1 override_dh_strip: - set -e; \ - for pkg in $(patsubst %-dbg,%,$(filter %-dbg,$(shell dh_listpackages))); do \ - dh_strip -p$${pkg} --dbg-package=$${pkg}-dbg; \ - done - dh_strip -s --remaining-packages + dh_strip --dbg-package=libonig2-dbg override_dh_install: dh_install --fail-missing -X.la -X.a +override_dh_makeshlibs: + dh_makeshlibs + dpkg-gensymbols -v$(VERSION) -plibonig2 + diff --git a/debian/symbols b/debian/symbols index 9844db6..650008f 100644 --- a/debian/symbols +++ b/debian/symbols @@ -46,6 +46,7 @@ libonig.so.2 libonig2 #MINVER# OnigSyntaxPosixBasic@Base 5.9.5 OnigSyntaxPosixExtended@Base 5.9.5 OnigSyntaxRuby@Base 5.9.5 + onig_add_end_call@Base 5.9.6 onig_bbuf_init@Base 5.9.5 onig_capture_tree_traverse@Base 5.9.5 onig_chain_link_add@Base 5.9.5 @@ -153,6 +154,7 @@ libonig.so.2 libonig2 #MINVER# onigenc_ascii_apply_all_case_fold@Base 5.9.5 onigenc_ascii_get_case_fold_codes_by_str@Base 5.9.5 onigenc_ascii_mbc_case_fold@Base 5.9.5 + onigenc_end_unicode@Base 5.9.6 onigenc_get_case_fold_codes_by_str_with_map@Base 5.9.5 onigenc_get_default_encoding@Base 5.9.5 onigenc_get_left_adjust_char_head@Base 5.9.5 -- cgit v1.2.3