Tags: patch Dear maintainer,
I've wrote a patch to fix this issue by using dh_auto_build to invoke tests. The attached 'minimal' patch fixes this issue only. The other patch attached fixes other miscellaneous issues too. Please look at debian/changelog for the list of fixed issues. I hope you like this patch. Thanks, Katsuhiko
diff -Nru pcre3-8.39/debian/changelog pcre3-8.39/debian/changelog --- pcre3-8.39/debian/changelog 2017-07-24 00:20:23.000000000 +0900 +++ pcre3-8.39/debian/changelog 2017-09-18 10:56:55.000000000 +0900 @@ -1,3 +1,12 @@ +pcre3 (2:8.39-4.0.5) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Mark STL symbols optional. + * Use dh_auto_test/dh_auto_build for build/test. + - Honour 'nocheck' in $DEB_BUILD_OPTIONS. + + -- Katsuhiko Nishimra <ktns...@gmail.com> Mon, 18 Sep 2017 10:56:55 +0900 + pcre3 (2:8.39-4) unstable; urgency=low * Remove now-deprecated Pre-Depends on multiarch-support (not needed diff -Nru pcre3-8.39/debian/libpcrecpp0v5.symbols pcre3-8.39/debian/libpcrecpp0v5.symbols --- pcre3-8.39/debian/libpcrecpp0v5.symbols 2017-03-26 01:20:59.000000000 +0900 +++ pcre3-8.39/debian/libpcrecpp0v5.symbols 2017-09-18 05:20:16.000000000 +0900 @@ -1,5 +1,4 @@ libpcrecpp.so.0 libpcrecpp0v5 #MINVER# - (c++)"void std::vector<pcrecpp::StringPiece, std::allocator<pcrecpp::StringPiece> >::_M_emplace_back_aux<pcrecpp::StringPiece>(pcrecpp::StringPiece&&)@Base" 2:8.39-2 (c++)"operator<<(std::basic_ostream<char, std::char_traits<char> >&, pcrecpp::StringPiece const&)@Base" 8.38 (c++)"pcrecpp::Arg::parse_char(char const*, int, void*)@Base" 7.7 (c++)"pcrecpp::Arg::parse_double(char const*, int, void*)@Base" 7.7 @@ -85,4 +84,6 @@ (c++)"pcrecpp::Scanner::Scanner(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 7.7 (c++)"pcrecpp::Scanner::SetSkipExpression(char const*)@Base" 7.7 (c++)"pcrecpp::Scanner::Skip(char const*)@Base" 7.7 -#MISSING: 2:8.39-2# (c++)"std::vector<pcrecpp::StringPiece, std::allocator<pcrecpp::StringPiece> >::_M_insert_aux(__gnu_cxx::__normal_iterator<pcrecpp::StringPiece*, std::vector<pcrecpp::StringPiece, std::allocator<pcrecpp::StringPiece> > >, pcrecpp::StringPiece const&)@Base" 7.7 + (c++|optional=STL)"void std::vector<pcrecpp::StringPiece, std::allocator<pcrecpp::StringPiece> >::_M_emplace_back_aux<pcrecpp::StringPiece>(pcrecpp::StringPiece&&)@Base" 2:8.39 + (c++|optional=STL)"void std::vector<pcrecpp::StringPiece, std::allocator<pcrecpp::StringPiece> >::_M_realloc_insert<pcrecpp::StringPiece const&>(__gnu_cxx::__normal_iterator<pcrecpp::StringPiece*, std::vector<pcrecpp::StringPiece, std::allocator<pcrecpp::StringPiece> > >, pcrecpp::StringPiece const&)@Base" 2:8.39 +#MISSING: 2:8.39-2# (c++|optional=STL)"std::vector<pcrecpp::StringPiece, std::allocator<pcrecpp::StringPiece> >::_M_insert_aux(__gnu_cxx::__normal_iterator<pcrecpp::StringPiece*, std::vector<pcrecpp::StringPiece, std::allocator<pcrecpp::StringPiece> > >, pcrecpp::StringPiece const&)@Base" 7.7 diff -Nru pcre3-8.39/debian/rules pcre3-8.39/debian/rules --- pcre3-8.39/debian/rules 2017-03-26 01:20:59.000000000 +0900 +++ pcre3-8.39/debian/rules 2017-09-18 10:56:23.000000000 +0900 @@ -51,10 +51,9 @@ dh_testdir # Add here commands to compile the package. - $(MAKE) $(NJOBS) -ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) - $(MAKE) check VERBOSE=1 -endif + dh_auto_build --parallel + + dh_auto_test --parallel touch build-stamp
diff -Nru pcre3-8.39/debian/changelog pcre3-8.39/debian/changelog
--- pcre3-8.39/debian/changelog 2017-07-24 00:20:23.000000000 +0900
+++ pcre3-8.39/debian/changelog 2017-09-18 05:20:16.000000000 +0900
@@ -1,3 +1,18 @@
+pcre3 (2:8.39-4.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Rewrite debian/rules.
+ - Honour 'nocheck' in DEB_BUILD_OPTIONS.
+ - Migrate from -dbg to -dbgsym packages.
+ * Bump up compat from 5 to 10.
+ * Mark STL symbols optional.
+ * uscan downloads .tar.bz2 and check signatures.
+ * Remove debian revisions from symbols files.
+ * Fix typos in manpages.
+ * Fix lintian tag udeb: unknown-field-in-control.
+
+ -- Katsuhiko Nishimra <ktns...@gmail.com> Mon, 18 Sep 2017 05:20:16 +0900
+
pcre3 (2:8.39-4) unstable; urgency=low
* Remove now-deprecated Pre-Depends on multiarch-support (not needed
diff -Nru pcre3-8.39/debian/compat pcre3-8.39/debian/compat
--- pcre3-8.39/debian/compat 2015-03-08 03:28:32.000000000 +0900
+++ pcre3-8.39/debian/compat 2017-09-18 05:20:16.000000000 +0900
@@ -1 +1 @@
-5
+10
diff -Nru pcre3-8.39/debian/control pcre3-8.39/debian/control
--- pcre3-8.39/debian/control 2017-07-24 00:18:48.000000000 +0900
+++ pcre3-8.39/debian/control 2017-09-18 05:20:16.000000000 +0900
@@ -1,12 +1,11 @@
Source: pcre3
Section: libs
Priority: optional
-Maintainer: Matthew Vernon <matt...@debian.org>
+Maintainer: Matthew Vernon <matt...@debian.org>
Standards-Version: 3.9.3
-Build-Depends: debhelper (>= 5.0.22), dpkg-dev (>= 1.16.0), dh-autoreconf
+Build-Depends: debhelper (>= 10), dpkg-dev (>= 1.16.0)
Package: libpcre3
-Section: libs
Architecture: any
Priority: important
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -35,7 +34,7 @@
Architecture: any
Priority: important
Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libpcre3-dev (<= 4.3-3)
+Breaks: libpcre3-dev (<= 4.3-3)
Description: Old Perl 5 Compatible Regular Expression Library - runtime files (udeb)
This is a library of functions to support regular expressions whose syntax
and semantics are as close as possible to those of the Perl 5 language.
@@ -43,9 +42,7 @@
This package contains the runtime libraries for the Debian Installer (udeb).
Package: libpcrecpp0v5
-Section: libs
Architecture: any
-Priority: optional
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libpcre3 (<< 6.4-1.1), libpcrecpp0
Replaces: libpcre3 (<< 6.4-1.1), libpcrecpp0
@@ -71,18 +68,6 @@
This package contains the development files, including headers, static
libraries, and documentation.
-Package: libpcre3-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: libpcre3 (= ${binary:Version}), libpcrecpp0v5 (= ${binary:Version}), ${misc:Depends}
-Multi-Arch: same
-Description: Old Perl 5 Compatible Regular Expression Library - debug symbols
- This is a library of functions to support regular expressions whose syntax
- and semantics are as close as possible to those of the Perl 5 language.
- .
- This package contains the debug symbols,
-
Package: pcregrep
Section: utils
Architecture: any
@@ -97,7 +82,6 @@
example of programming with libpcre.
Package: libpcre16-3
-Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Multi-Arch: same
@@ -109,7 +93,6 @@
This package contains the 16 bit runtime library.
Package: libpcre32-3
-Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Multi-Arch: same
diff -Nru pcre3-8.39/debian/dirs pcre3-8.39/debian/dirs
--- pcre3-8.39/debian/dirs 2015-03-08 03:28:32.000000000 +0900
+++ pcre3-8.39/debian/dirs 1970-01-01 09:00:00.000000000 +0900
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin
diff -Nru pcre3-8.39/debian/libpcre16-3.symbols.in pcre3-8.39/debian/libpcre16-3.symbols.in
--- pcre3-8.39/debian/libpcre16-3.symbols.in 2017-03-26 01:20:59.000000000 +0900
+++ pcre3-8.39/debian/libpcre16-3.symbols.in 2017-09-18 05:20:16.000000000 +0900
@@ -1,34 +1,34 @@
libpcre16.so.3 libpcre16-3 #MINVER#
- pcre16_assign_jit_stack@Base 2:8.35-4
- pcre16_callout@Base 2:8.35-4
- pcre16_compile2@Base 2:8.35-4
- pcre16_compile@Base 2:8.35-4
- pcre16_config@Base 2:8.35-4
- pcre16_copy_named_substring@Base 2:8.35-4
- pcre16_copy_substring@Base 2:8.35-4
- pcre16_dfa_exec@Base 2:8.35-4
- pcre16_exec@Base 2:8.35-4
- pcre16_free@Base 2:8.35-4
- pcre16_free_study@Base 2:8.35-4
- pcre16_free_substring@Base 2:8.35-4
- pcre16_free_substring_list@Base 2:8.35-4
- pcre16_fullinfo@Base 2:8.35-4
- pcre16_get_named_substring@Base 2:8.35-4
- pcre16_get_stringnumber@Base 2:8.35-4
- pcre16_get_stringtable_entries@Base 2:8.35-4
- pcre16_get_substring@Base 2:8.35-4
- pcre16_get_substring_list@Base 2:8.35-4
-JIT pcre16_jit_exec@Base 2:8.35-4
- pcre16_jit_free_unused_memory@Base 2:8.35-4
- pcre16_jit_stack_alloc@Base 2:8.35-4
- pcre16_jit_stack_free@Base 2:8.35-4
- pcre16_maketables@Base 2:8.35-4
- pcre16_malloc@Base 2:8.35-4
- pcre16_pattern_to_host_byte_order@Base 2:8.35-4
- pcre16_refcount@Base 2:8.35-4
- pcre16_stack_free@Base 2:8.35-4
- pcre16_stack_guard@Base 2:8.35-4
- pcre16_stack_malloc@Base 2:8.35-4
- pcre16_study@Base 2:8.35-4
- pcre16_utf16_to_host_byte_order@Base 2:8.35-4
- pcre16_version@Base 2:8.35-4
+ pcre16_assign_jit_stack@Base 2:8.35
+ pcre16_callout@Base 2:8.35
+ pcre16_compile2@Base 2:8.35
+ pcre16_compile@Base 2:8.35
+ pcre16_config@Base 2:8.35
+ pcre16_copy_named_substring@Base 2:8.35
+ pcre16_copy_substring@Base 2:8.35
+ pcre16_dfa_exec@Base 2:8.35
+ pcre16_exec@Base 2:8.35
+ pcre16_free@Base 2:8.35
+ pcre16_free_study@Base 2:8.35
+ pcre16_free_substring@Base 2:8.35
+ pcre16_free_substring_list@Base 2:8.35
+ pcre16_fullinfo@Base 2:8.35
+ pcre16_get_named_substring@Base 2:8.35
+ pcre16_get_stringnumber@Base 2:8.35
+ pcre16_get_stringtable_entries@Base 2:8.35
+ pcre16_get_substring@Base 2:8.35
+ pcre16_get_substring_list@Base 2:8.35
+JIT pcre16_jit_exec@Base 2:8.35
+ pcre16_jit_free_unused_memory@Base 2:8.35
+ pcre16_jit_stack_alloc@Base 2:8.35
+ pcre16_jit_stack_free@Base 2:8.35
+ pcre16_maketables@Base 2:8.35
+ pcre16_malloc@Base 2:8.35
+ pcre16_pattern_to_host_byte_order@Base 2:8.35
+ pcre16_refcount@Base 2:8.35
+ pcre16_stack_free@Base 2:8.35
+ pcre16_stack_guard@Base 2:8.35
+ pcre16_stack_malloc@Base 2:8.35
+ pcre16_study@Base 2:8.35
+ pcre16_utf16_to_host_byte_order@Base 2:8.35
+ pcre16_version@Base 2:8.35
diff -Nru pcre3-8.39/debian/libpcre32-3.symbols.in pcre3-8.39/debian/libpcre32-3.symbols.in
--- pcre3-8.39/debian/libpcre32-3.symbols.in 2017-03-26 01:20:59.000000000 +0900
+++ pcre3-8.39/debian/libpcre32-3.symbols.in 2017-09-18 05:20:16.000000000 +0900
@@ -1,34 +1,34 @@
libpcre32.so.3 libpcre32-3 #MINVER#
- pcre32_assign_jit_stack@Base 2:8.35-4
- pcre32_callout@Base 2:8.35-4
- pcre32_compile2@Base 2:8.35-4
- pcre32_compile@Base 2:8.35-4
- pcre32_config@Base 2:8.35-4
- pcre32_copy_named_substring@Base 2:8.35-4
- pcre32_copy_substring@Base 2:8.35-4
- pcre32_dfa_exec@Base 2:8.35-4
- pcre32_exec@Base 2:8.35-4
- pcre32_free@Base 2:8.35-4
- pcre32_free_study@Base 2:8.35-4
- pcre32_free_substring@Base 2:8.35-4
- pcre32_free_substring_list@Base 2:8.35-4
- pcre32_fullinfo@Base 2:8.35-4
- pcre32_get_named_substring@Base 2:8.35-4
- pcre32_get_stringnumber@Base 2:8.35-4
- pcre32_get_stringtable_entries@Base 2:8.35-4
- pcre32_get_substring@Base 2:8.35-4
- pcre32_get_substring_list@Base 2:8.35-4
-JIT pcre32_jit_exec@Base 2:8.35-4
- pcre32_jit_free_unused_memory@Base 2:8.35-4
- pcre32_jit_stack_alloc@Base 2:8.35-4
- pcre32_jit_stack_free@Base 2:8.35-4
- pcre32_maketables@Base 2:8.35-4
- pcre32_malloc@Base 2:8.35-4
- pcre32_pattern_to_host_byte_order@Base 2:8.35-4
- pcre32_refcount@Base 2:8.35-4
- pcre32_stack_free@Base 2:8.35-4
- pcre32_stack_guard@Base 2:8.35-4
- pcre32_stack_malloc@Base 2:8.35-4
- pcre32_study@Base 2:8.35-4
- pcre32_utf32_to_host_byte_order@Base 2:8.35-4
- pcre32_version@Base 2:8.35-4
+ pcre32_assign_jit_stack@Base 2:8.35
+ pcre32_callout@Base 2:8.35
+ pcre32_compile2@Base 2:8.35
+ pcre32_compile@Base 2:8.35
+ pcre32_config@Base 2:8.35
+ pcre32_copy_named_substring@Base 2:8.35
+ pcre32_copy_substring@Base 2:8.35
+ pcre32_dfa_exec@Base 2:8.35
+ pcre32_exec@Base 2:8.35
+ pcre32_free@Base 2:8.35
+ pcre32_free_study@Base 2:8.35
+ pcre32_free_substring@Base 2:8.35
+ pcre32_free_substring_list@Base 2:8.35
+ pcre32_fullinfo@Base 2:8.35
+ pcre32_get_named_substring@Base 2:8.35
+ pcre32_get_stringnumber@Base 2:8.35
+ pcre32_get_stringtable_entries@Base 2:8.35
+ pcre32_get_substring@Base 2:8.35
+ pcre32_get_substring_list@Base 2:8.35
+JIT pcre32_jit_exec@Base 2:8.35
+ pcre32_jit_free_unused_memory@Base 2:8.35
+ pcre32_jit_stack_alloc@Base 2:8.35
+ pcre32_jit_stack_free@Base 2:8.35
+ pcre32_maketables@Base 2:8.35
+ pcre32_malloc@Base 2:8.35
+ pcre32_pattern_to_host_byte_order@Base 2:8.35
+ pcre32_refcount@Base 2:8.35
+ pcre32_stack_free@Base 2:8.35
+ pcre32_stack_guard@Base 2:8.35
+ pcre32_stack_malloc@Base 2:8.35
+ pcre32_study@Base 2:8.35
+ pcre32_utf32_to_host_byte_order@Base 2:8.35
+ pcre32_version@Base 2:8.35
diff -Nru pcre3-8.39/debian/libpcrecpp0v5.symbols pcre3-8.39/debian/libpcrecpp0v5.symbols
--- pcre3-8.39/debian/libpcrecpp0v5.symbols 2017-03-26 01:20:59.000000000 +0900
+++ pcre3-8.39/debian/libpcrecpp0v5.symbols 2017-09-18 05:20:16.000000000 +0900
@@ -1,5 +1,4 @@
libpcrecpp.so.0 libpcrecpp0v5 #MINVER#
- (c++)"void std::vector<pcrecpp::StringPiece, std::allocator<pcrecpp::StringPiece> >::_M_emplace_back_aux<pcrecpp::StringPiece>(pcrecpp::StringPiece&&)@Base" 2:8.39-2
(c++)"operator<<(std::basic_ostream<char, std::char_traits<char> >&, pcrecpp::StringPiece const&)@Base" 8.38
(c++)"pcrecpp::Arg::parse_char(char const*, int, void*)@Base" 7.7
(c++)"pcrecpp::Arg::parse_double(char const*, int, void*)@Base" 7.7
@@ -85,4 +84,6 @@
(c++)"pcrecpp::Scanner::Scanner(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 7.7
(c++)"pcrecpp::Scanner::SetSkipExpression(char const*)@Base" 7.7
(c++)"pcrecpp::Scanner::Skip(char const*)@Base" 7.7
-#MISSING: 2:8.39-2# (c++)"std::vector<pcrecpp::StringPiece, std::allocator<pcrecpp::StringPiece> >::_M_insert_aux(__gnu_cxx::__normal_iterator<pcrecpp::StringPiece*, std::vector<pcrecpp::StringPiece, std::allocator<pcrecpp::StringPiece> > >, pcrecpp::StringPiece const&)@Base" 7.7
+ (c++|optional=STL)"void std::vector<pcrecpp::StringPiece, std::allocator<pcrecpp::StringPiece> >::_M_emplace_back_aux<pcrecpp::StringPiece>(pcrecpp::StringPiece&&)@Base" 2:8.39
+ (c++|optional=STL)"void std::vector<pcrecpp::StringPiece, std::allocator<pcrecpp::StringPiece> >::_M_realloc_insert<pcrecpp::StringPiece const&>(__gnu_cxx::__normal_iterator<pcrecpp::StringPiece*, std::vector<pcrecpp::StringPiece, std::allocator<pcrecpp::StringPiece> > >, pcrecpp::StringPiece const&)@Base" 2:8.39
+#MISSING: 2:8.39-2# (c++|optional=STL)"std::vector<pcrecpp::StringPiece, std::allocator<pcrecpp::StringPiece> >::_M_insert_aux(__gnu_cxx::__normal_iterator<pcrecpp::StringPiece*, std::vector<pcrecpp::StringPiece, std::allocator<pcrecpp::StringPiece> > >, pcrecpp::StringPiece const&)@Base" 7.7
diff -Nru pcre3-8.39/debian/patches/fix-typo-in-manpages.patch pcre3-8.39/debian/patches/fix-typo-in-manpages.patch
--- pcre3-8.39/debian/patches/fix-typo-in-manpages.patch 1970-01-01 09:00:00.000000000 +0900
+++ pcre3-8.39/debian/patches/fix-typo-in-manpages.patch 2017-09-18 05:20:16.000000000 +0900
@@ -0,0 +1,73 @@
+--- a/doc/pcre16.3
++++ b/doc/pcre16.3
+@@ -158,7 +158,7 @@
+ .rs
+ .sp
+ In Unix-like systems, the 16-bit library is called \fBlibpcre16\fP, and can
+-normally be accesss by adding \fB-lpcre16\fP to the command for linking an
++normally be access by adding \fB-lpcre16\fP to the command for linking an
+ application that uses PCRE.
+ .
+ .
+--- a/doc/pcre32.3
++++ b/doc/pcre32.3
+@@ -157,7 +157,7 @@
+ .rs
+ .sp
+ In Unix-like systems, the 32-bit library is called \fBlibpcre32\fP, and can
+-normally be accesss by adding \fB-lpcre32\fP to the command for linking an
++normally be access by adding \fB-lpcre32\fP to the command for linking an
+ application that uses PCRE.
+ .
+ .
+--- a/doc/pcredemo.3
++++ b/doc/pcredemo.3
+@@ -161,7 +161,7 @@
+ return 1;
+ }
+
+-/* Match succeded */
++/* Match succeeded */
+
+ printf("\enMatch succeeded at offset %d\en", ovector[0]);
+
+@@ -379,7 +379,7 @@
+ return 1;
+ }
+
+- /* Match succeded */
++ /* Match succeeded */
+
+ printf("\enMatch succeeded again at offset %d\en", ovector[0]);
+
+--- a/doc/pcrejit.3
++++ b/doc/pcrejit.3
+@@ -269,7 +269,7 @@
+ This is a suggestion for how a multithreaded program that needs to set up
+ non-default JIT stacks might operate:
+ .sp
+- During thread initalization
++ During thread initialization
+ thread_local_var = pcre_jit_stack_alloc(...)
+ .sp
+ During thread exit
+@@ -339,7 +339,7 @@
+ pattern causes stack overflow with a stack of 1M? Is that 1M kept until the
+ stack is freed?
+ .sp
+-Especially on embedded sytems, it might be a good idea to release memory
++Especially on embedded systems, it might be a good idea to release memory
+ sometimes without freeing the stack. There is no API for this at the moment.
+ Probably a function call which returns with the currently allocated memory for
+ any stack and another which allows releasing memory (shrinking the stack) would
+--- a/doc/pcrepattern.3
++++ b/doc/pcrepattern.3
+@@ -656,7 +656,7 @@
+ .P
+ It is possible to restrict \eR to match only CR, LF, or CRLF (instead of the
+ complete set of Unicode line endings) by setting the option PCRE_BSR_ANYCRLF
+-either at compile time or when the pattern is matched. (BSR is an abbrevation
++either at compile time or when the pattern is matched. (BSR is an abbreviation
+ for "backslash R".) This can be made the default when PCRE is built; if this is
+ the case, the other behaviour can be requested via the PCRE_BSR_UNICODE option.
+ It is also possible to specify these settings by starting a pattern string with
diff -Nru pcre3-8.39/debian/patches/series pcre3-8.39/debian/patches/series
--- pcre3-8.39/debian/patches/series 2017-03-26 01:20:59.000000000 +0900
+++ pcre3-8.39/debian/patches/series 2017-09-18 05:20:16.000000000 +0900
@@ -7,3 +7,4 @@
Disable_JIT_on_sparc64.patch
CVE-2017-6004.patch
upstream-fix-for-cve-2017-7186-upstream-
+fix-typo-in-manpages.patch
diff -Nru pcre3-8.39/debian/rules pcre3-8.39/debian/rules
--- pcre3-8.39/debian/rules 2017-03-26 01:20:59.000000000 +0900
+++ pcre3-8.39/debian/rules 2017-09-18 05:20:16.000000000 +0900
@@ -27,67 +27,28 @@
ENABLE_JIT=$(shell . debian/jit-test)
-configure-stamp:
- dh_testdir
- # Add here commands to configure the package.
- dh_autoreconf
- CC_FOR_BUILD=cc ./configure \
- --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
- --prefix=/usr --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info \
- --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
+export DEB_CFLAGS_MAINT_APPEND=-Wall
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
+%:
+ dh $@ --parallel --with autoreconf
+
+override_dh_auto_configure:
+ env CC_FOR_BUILD=cc dh_auto_configure -- \
--enable-utf8 --enable-unicode-properties \
--disable-silent-rules \
$(ENABLE_JIT) \
--enable-pcre16 \
- --enable-pcre32 \
- $(shell DEB_CFLAGS_MAINT_APPEND=-Wall DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --export=configure)
- touch configure-stamp
-
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp: configure-stamp
- dh_testdir
-
- # Add here commands to compile the package.
- $(MAKE) $(NJOBS)
-ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
- $(MAKE) check VERBOSE=1
-endif
+ --enable-pcre32
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f configure-stamp build-stamp
- # Add here commands to clean up after the build process.
- [ ! -f Makefile ] || $(MAKE) distclean
-### -test -r /usr/share/misc/config.sub && \
-### cp -f /usr/share/misc/config.sub config.sub
-### -test -r /usr/share/misc/config.guess && \
-### cp -f /usr/share/misc/config.guess config.guess
+override_dh_clean:
+ dh_clean
rm -f dftables testsavedregex
rm -f debian/libpcre3.symbols
rm -f debian/libpcre16-3.symbols
rm -f debian/libpcre32-3.symbols
- dh_autoreconf_clean
- dh_clean
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/tmp
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir -a
- dh_testroot -a
+override_dh_install:
dh_install -a
# This man page is in the main package, don't want it in -dev
rm debian/libpcre3-dev/usr/share/man/man3/pcrepattern.3
@@ -101,26 +62,10 @@
dh_link -a
-# dh_installdebconf -a
- dh_installdocs -a
- dh_installexamples -a
-# dh_installmenu -a
-# dh_installlogrotate -a
-# dh_installemacsen -a
-# dh_installpam -a
-# dh_installmime -a
-# dh_installinit -a
-# dh_installcron -a
- dh_installman -a
- dh_installinfo -a
-# dh_undocumented -a
- dh_installchangelogs -a ChangeLog
- dh_strip -a --dbg-package=libpcre3-dbg
- # Don't include pcregrep or libraries from udeb in debug package
- rm -r debian/libpcre3-dbg/usr/lib/debug/usr/bin
- rm debian/libpcre3-dbg/usr/lib/debug/usr/lib/libpcre*
- dh_compress -a
- dh_fixperms -a
+override_dh_strip:
+ dh_strip --dbgsym-migration='libpcre3-dbg (<< 2:8.39-4.1~)'
+
+override_dh_makeshlibs:
ifneq (,$(ENABLE_JIT))
sed -e 's/JIT//' debian/libpcre3.symbols.in > debian/libpcre3.symbols
sed -e 's/JIT//' debian/libpcre16-3.symbols.in > debian/libpcre16-3.symbols
@@ -133,14 +78,6 @@
dh_makeshlibs -plibpcre3 --add-udeb="libpcre3-udeb" -V 'libpcre3 (>= 1:8.35)' -- -c4
dh_makeshlibs -plibpcrecpp0v5 -V 'libpcrecpp0v5 (>= 7.7)' -- -c4
dh_makeshlibs -plibpcre16-3 -plibpcre32-3 -- -c4
- dh_installdeb -a
-# dh_perl -a
- dh_shlibdeps -a -ldebian/libpcre3/usr/lib/$(DEB_HOST_MULTIARCH)
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
-binary-indep:
-
-binary: binary-arch binary-indep
-.PHONY: build clean binary-arch binary install
+override_dh_shlibdeps:
+ dh_shlibdeps -a -ldebian/libpcre3/usr/lib/$(DEB_HOST_MULTIARCH)
diff -Nru pcre3-8.39/debian/upstream/signing-key.asc pcre3-8.39/debian/upstream/signing-key.asc
--- pcre3-8.39/debian/upstream/signing-key.asc 1970-01-01 09:00:00.000000000 +0900
+++ pcre3-8.39/debian/upstream/signing-key.asc 2017-09-18 05:20:16.000000000 +0900
@@ -0,0 +1,44 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+uIS9nkk2GrGx5+N6cYMy8JqG
+=qlVT
+-----END PGP PUBLIC KEY BLOCK-----
diff -Nru pcre3-8.39/debian/watch pcre3-8.39/debian/watch
--- pcre3-8.39/debian/watch 2017-03-26 01:20:59.000000000 +0900
+++ pcre3-8.39/debian/watch 2017-09-18 05:20:16.000000000 +0900
@@ -1,2 +1,4 @@
-version=3
-ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-([\d\.]+)\.zip
+version=4
+opts="pgpsigurlmangle=s/$/.sig/,pasv" \
+ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-([.\d]+)\.tar\.bz2 \
+debian uupdate
signature.asc
Description: PGP signature
