Control: tags 999962 + pending Dear maintainer,
I've prepared an NMU for silversearcher-ag (versioned as 2.2.0+git20200805-1.1) and uploaded it to mentors.debian.net. Please feel free to tell me if I should delay it longer. Regards. diff -Nru silversearcher-ag-2.2.0+git20200805/debian/changelog silversearcher-ag-2.2.0+git20200805/debian/changelog --- silversearcher-ag-2.2.0+git20200805/debian/changelog 2020-08-04 18:55:35.000000000 -0700 +++ silversearcher-ag-2.2.0+git20200805/debian/changelog 2023-09-21 23:41:55.000000000 -0700 @@ -1,3 +1,14 @@ +silversearcher-ag (2.2.0+git20200805-1.1) unstable; urgency=medium + + * Non-maintainer upload + * Enable pcre2 support to replace deprecated pcre1 (Closes: #999962) + - Add d/p/enable_pcre2_support.patch cherrypicked from upstream pcre2 + branch + - Build-Depends on libpcre2-dev instead of libpcre3-dev + * Update d/copyright with copyright owners of the pcre2 patch and m4/* + + -- Xiyue Deng <manp...@gmail.com> Thu, 21 Sep 2023 23:41:55 -0700 + silversearcher-ag (2.2.0+git20200805-1) unstable; urgency=medium * New upstream snapshot (Closes: #957798) diff -Nru silversearcher-ag-2.2.0+git20200805/debian/control silversearcher-ag-2.2.0+git20200805/debian/control --- silversearcher-ag-2.2.0+git20200805/debian/control 2020-08-04 18:55:35.000000000 -0700 +++ silversearcher-ag-2.2.0+git20200805/debian/control 2023-09-06 02:57:08.000000000 -0700 @@ -2,7 +2,7 @@ Section: utils Priority: optional Maintainer: Hajime Mizuno <mizuno...@ubuntu.com> -Build-Depends: debhelper-compat (= 13), pkg-config, libpcre3-dev, zlib1g-dev, liblzma-dev +Build-Depends: debhelper-compat (= 13), pkg-config, libpcre2-dev, zlib1g-dev, liblzma-dev Standards-Version: 4.5.0 Homepage: https://github.com/ggreer/the_silver_searcher diff -Nru silversearcher-ag-2.2.0+git20200805/debian/copyright silversearcher-ag-2.2.0+git20200805/debian/copyright --- silversearcher-ag-2.2.0+git20200805/debian/copyright 2020-08-04 18:55:35.000000000 -0700 +++ silversearcher-ag-2.2.0+git20200805/debian/copyright 2023-09-21 23:39:19.000000000 -0700 @@ -7,10 +7,21 @@ Copyright: 2013-2018 Geoff Greer <ge...@greer.fm> License: Apache-2.0 +Files: m4/* +Copyright: + 2008 Steven G. Johnson <stev...@alum.mit.edu> + 2011 Daniel Richard G. <sk...@iskunk.org> +License: GPL-3+ + Files: debian/* Copyright: 2013-2018 Hajime Mizuno <mizuno...@ubuntu.com> License: Apache-2.0 +Files: debian/patches/* +Copyright: 2016 Allen Wild <allenwil...@gmail.com> + 2023 Xiyue Deng <manp...@gmail.com> +License: Apache-2.0 + License: Apache-2.0 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -26,3 +37,17 @@ . On Debian systems, the complete text of the Apache version 2.0 license can be found in "/usr/share/common-licenses/Apache-2.0". + +License: GPL-3+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. diff -Nru silversearcher-ag-2.2.0+git20200805/debian/patches/enable_pcre2_support.patch silversearcher-ag-2.2.0+git20200805/debian/patches/enable_pcre2_support.patch --- silversearcher-ag-2.2.0+git20200805/debian/patches/enable_pcre2_support.patch 2020-08-04 18:55:35.000000000 -0700 +++ silversearcher-ag-2.2.0+git20200805/debian/patches/enable_pcre2_support.patch 2023-09-06 02:57:08.000000000 -0700 @@ -1,6 +1,6 @@ Description: enable pcre2 support Cherrypick and adapt patch set that adds pcre2 support. -Author: Xiyue Deng <manphiz> +Author: Xiyue Deng <manp...@gmail.com> Bug-Debian: https://bugs.debian.org/999962 Forwarded: not-needed Applied-Upstream: @@ -75,12 +75,13 @@ CFLAGS="$CFLAGS -Wpointer-arith -Wcast-qual -Wmissing-prototypes -Wno-missing-braces -std=gnu89 -D_GNU_SOURCE" LDFLAGS="$LDFLAGS" -@@ -40,6 +38,25 @@ esac +@@ -40,6 +38,26 @@ esac LIBS="$PTHREAD_LIBS $LIBS" +AC_ARG_WITH([pcre2], + [AS_HELP_STRING([--with-pcre2], [Enable experimental support for libpcre2])]) ++with_pcre2=yes + +AS_IF([test "x$with_pcre2" = "xyes"], [ + PKG_CHECK_MODULES([PCRE2], [libpcre2-8], [
