Version in base suite: 2.3.5-3 Base version: php-horde-text-filter_2.3.5-3 Target version: php-horde-text-filter_2.3.5-3+deb10u1 Base file: /srv/ftp-master.debian.org/ftp/pool/main/p/php-horde-text-filter/php-horde-text-filter_2.3.5-3.dsc Target file: /srv/ftp-master.debian.org/policy/pool/main/p/php-horde-text-filter/php-horde-text-filter_2.3.5-3+deb10u1.dsc changelog | 12 +++++++ control | 2 - gbp.conf | 2 - patches/0001_protect_the_-_this_is_not_a_range.patch | 30 +++++++++++++++++++ patches/series | 1 5 files changed, 45 insertions(+), 2 deletions(-) diff -Nru php-horde-text-filter-2.3.5/debian/changelog php-horde-text-filter-2.3.5/debian/changelog --- php-horde-text-filter-2.3.5/debian/changelog 2018-05-15 07:22:54.000000000 +0000 +++ php-horde-text-filter-2.3.5/debian/changelog 2020-01-28 09:41:46.000000000 +0000 @@ -1,3 +1,15 @@ +php-horde-text-filter (2.3.5-3+deb10u1) buster; urgency=medium + + * QA upload. + * Mark package as orphaned (See #942282) + + [ IOhannes m zmölnig ] + * Fixed regular-expressions (used e.g. for displaying plain-text mails) + (Closes: #931255, #935816) + * Switched upstream branch in the packaging git on salsa to 'debian-buster' + + -- IOhannes m zmölnig (Debian/GNU) Tue, 28 Jan 2020 10:41:46 +0100 + php-horde-text-filter (2.3.5-3) unstable; urgency=medium * Update Standards-Version to 4.1.4, no change diff -Nru php-horde-text-filter-2.3.5/debian/control php-horde-text-filter-2.3.5/debian/control --- php-horde-text-filter-2.3.5/debian/control 2018-05-15 07:22:54.000000000 +0000 +++ php-horde-text-filter-2.3.5/debian/control 2020-01-28 09:41:46.000000000 +0000 @@ -2,7 +2,7 @@ Section: php Priority: optional Maintainer: Horde Maintainers -Uploaders: Mathieu Parent +Uploaders: Debian QA Group Build-Depends: debhelper (>= 11), pkg-php-tools (>= 1.1), pear-horde-channel Standards-Version: 4.1.4 Homepage: http://www.horde.org/ diff -Nru php-horde-text-filter-2.3.5/debian/gbp.conf php-horde-text-filter-2.3.5/debian/gbp.conf --- php-horde-text-filter-2.3.5/debian/gbp.conf 2018-05-15 07:22:54.000000000 +0000 +++ php-horde-text-filter-2.3.5/debian/gbp.conf 2020-01-28 09:41:46.000000000 +0000 @@ -1,7 +1,7 @@ [DEFAULT] pristine-tar = True upstream-branch = upstream-sid -debian-branch = debian-sid +debian-branch = debian-buster [buildpackage] export-dir = ../build-area/ diff -Nru php-horde-text-filter-2.3.5/debian/patches/0001_protect_the_-_this_is_not_a_range.patch php-horde-text-filter-2.3.5/debian/patches/0001_protect_the_-_this_is_not_a_range.patch --- php-horde-text-filter-2.3.5/debian/patches/0001_protect_the_-_this_is_not_a_range.patch 1970-01-01 00:00:00.000000000 +0000 +++ php-horde-text-filter-2.3.5/debian/patches/0001_protect_the_-_this_is_not_a_range.patch 2020-01-28 09:41:46.000000000 +0000 @@ -0,0 +1,30 @@ +Description: protect the -, this is not a range + Makes regular expressions valid... +Author: Remi Collet +Origin: upstream +Applied-Upstream: https://github.com/horde/Text_Filter/commit/8d0de407dbb95626bc54eaba078191847be9c574 +Last-Update: 2020-01-28 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- php-horde-text-filter.orig/Horde_Text_Filter-2.3.5/lib/Horde/Text/Filter/Emails.php ++++ php-horde-text-filter/Horde_Text_Filter-2.3.5/lib/Horde/Text/Filter/Emails.php +@@ -61,7 +61,7 @@ + ((?(1)\s*\])) + | + # Version 2 Pattern 9 and 10: simple email addresses. +- (^|\s|<|<|\[)([\w-+.=]+@[-A-Z0-9.]*[A-Z0-9]) ++ (^|\s|<|<|\[)([\w\-+.=]+@[-A-Z0-9.]*[A-Z0-9]) + # Pattern 11 to 13: Optional parameters + ((\?)([^\s"<]*[\w+#?\/&=]))? + # Pattern 14: Optional closing bracket +--- php-horde-text-filter.orig/Horde_Text_Filter-2.3.5/lib/Horde/Text/Filter/Linkurls.php ++++ php-horde-text-filter/Horde_Text_Filter-2.3.5/lib/Horde/Text/Filter/Linkurls.php +@@ -86,7 +86,7 @@ + (?:\b|^) + ( # Capture 1: entire matched URL + ( +- (?:[a-z][\w-+]{0,19})?:/{1,3} # URL protocol and colon followed by 1-3 ++ (?:[a-z][\w\-+]{0,19})?:/{1,3} # URL protocol and colon followed by 1-3 + # slashes, or just colon and slashes (://) + | # - or - + (?