Control: tags -1 patch

Hi Sandro,

On Tue, Feb 06, 2018 at 04:02:07PM -0500, Sandro Tosi wrote:
>    patch is welcome, NMU is not; feel free to upload the patch to this bug
>    and i'll take care of the upload. thanks for working on this Debian bug

That's fair.  The main thing I'd like to avoid is the autoremoval of
rdepending packages ;-) I pushed to the following remote and have also
attached the patches (see commit messages for more info):
https://salsa.debian.org/sten-guest/python-regex.git

Cheers,
Nicholas

>    On Tue, Feb 6, 2018 at 3:54 PM, Nicholas D Steeves <nstee...@gmail.com>
>    wrote:
> 
>      Hi Andreas,
>      On Mon, Feb 05, 2018 at 06:32:35PM -0500, Nicholas D Steeves wrote:
>      > Hi Andreas and Sandro,
>      >
>      > On Thu, Jan 11, 2018 at 05:04:13PM +0100, Andreas Beckmann wrote:
>      > > Followup-For: Bug #886944
>      > > Control: affects -1 + python-regex-dbg
>      > >
>      > > Hi,
>      > >
>      > > similar issue in python-regex-dbg:
>      > >
>      > > 0m33.5s ERROR: FAIL: silently overwrites files via directory
>      symlinks:
>      > >   /usr/share/doc/python-regex-dbg/Features.html (python-regex-dbg)
>      != /usr/share/doc/python-regex/Features.html (python-regex)
>      > >     /usr/share/doc/python-regex-dbg -> python-regex
>      > >   /usr/share/doc/python-regex-dbg/Features.rst.gz
>      (python-regex-dbg) != /usr/share/doc/python-regex/Features.rst.gz
>      (python-regex)
>      > >     /usr/share/doc/python-regex-dbg -> python-regex
>      > >   /usr/share/doc/python-regex-dbg/README (python-regex-dbg) !=
>      /usr/share/doc/python-regex/README (python-regex)
>      > >     /usr/share/doc/python-regex-dbg -> python-regex
>      > >   /usr/share/doc/python-regex-dbg/UnicodeProperties.txt.gz
>      (python-regex-dbg) !=
>      /usr/share/doc/python-regex/UnicodeProperties.txt.gz (python-regex)
>      > >     /usr/share/doc/python-regex-dbg -> python-regex
>      > >   /usr/share/doc/python-regex-dbg/changelog.Debian.gz
>      (python-regex-dbg) != /usr/share/doc/python-regex/changelog.Debian.gz
>      (python-regex)
>      > >     /usr/share/doc/python-regex-dbg -> python-regex
>      > >   /usr/share/doc/python-regex-dbg/copyright (python-regex-dbg) !=
>      /usr/share/doc/python-regex/copyright (python-regex)
>      > >     /usr/share/doc/python-regex-dbg -> python-regex
>      > >
>      > > and probably python3-regex-dbg as well, although that does not get
>      > > tested by piuparts as long as python3-regex fails.
>      > >
>      > >
>      > > Andreas
>      >
>      > I'll attempt to fix this evening, because if calibre is removed from
>      > testing than my planned backport will be in jeopardy.  If I succeed
>      > I'll prepare an NMU, but in any case I'll reply to this bug with my
>      > results.
>      >
>      > Cheers,
>      > Nicholas
> 
>      Solved it!  I'll prepare a minimal NMU later today.  Would you please
>      consider sponsoring the upload (I'll CC you for the RFS)?
> 
>      Regards,
>      Nicholas
> 
>    --
>    Sandro "morph" Tosi
>    My website: http://sandrotosi.me/
>    Me at Debian: http://wiki.debian.org/SandroTosi
>    G+: https://plus.google.com/u/0/+SandroTosi
From d7bcc37b3f9361413495e181159b4d9db317d524 Mon Sep 17 00:00:00 2001
From: Nicholas D Steeves <nstee...@gmail.com>
Date: Tue, 6 Feb 2018 15:43:34 -0500
Subject: [PATCH 1/2] Correct errors in maintscripts. (Closes: #886944)

From dpkg-maintscript-helper(1):
     symlink_to_dir pathname old-target

Maintscripts had:
     symlink_to_dir pathname new-target
---
 debian/python-regex-dbg.maintscript  | 2 +-
 debian/python3-regex-dbg.maintscript | 2 +-
 debian/python3-regex.maintscript     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/python-regex-dbg.maintscript b/debian/python-regex-dbg.maintscript
index 06d5276..f3c7bd1 100644
--- a/debian/python-regex-dbg.maintscript
+++ b/debian/python-regex-dbg.maintscript
@@ -1 +1 @@
-symlink_to_dir /usr/share/doc/python-regex-dbg python-regex-dbg 0.1.20171212-1
+symlink_to_dir /usr/share/doc/python-regex-dbg python-regex 0.1.20171212-1~
diff --git a/debian/python3-regex-dbg.maintscript b/debian/python3-regex-dbg.maintscript
index cb7b44f..62674c9 100644
--- a/debian/python3-regex-dbg.maintscript
+++ b/debian/python3-regex-dbg.maintscript
@@ -1 +1 @@
-symlink_to_dir /usr/share/doc/python3-regex-dbg python3-regex-dbg 0.1.20171212-1
+symlink_to_dir /usr/share/doc/python3-regex-dbg python-regex 0.1.20171212-1~
diff --git a/debian/python3-regex.maintscript b/debian/python3-regex.maintscript
index 899180d..c476fdd 100644
--- a/debian/python3-regex.maintscript
+++ b/debian/python3-regex.maintscript
@@ -1 +1 @@
-symlink_to_dir /usr/share/doc/python3-regex python3-regex 0.1.20171212-1
+symlink_to_dir /usr/share/doc/python3-regex python-regex 0.1.20171212-1~
-- 
2.11.0

From e11e4ceecb1a0192825201f0aa80371d9c2ec890 Mon Sep 17 00:00:00 2001
From: Nicholas D Steeves <nstee...@gmail.com>
Date: Tue, 6 Feb 2018 16:28:54 -0500
Subject: [PATCH 2/2] Update maintscripts for new upstream version.

I think this will be required for each new upstream version until
buster is released, because the version included in the buster release
is the upper range defined in the maintscript. Eg: to insure a clean
upgrade from stretch.
---
 debian/python-regex-dbg.maintscript  | 2 +-
 debian/python3-regex-dbg.maintscript | 2 +-
 debian/python3-regex.maintscript     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/python-regex-dbg.maintscript b/debian/python-regex-dbg.maintscript
index f3c7bd1..d748174 100644
--- a/debian/python-regex-dbg.maintscript
+++ b/debian/python-regex-dbg.maintscript
@@ -1 +1 @@
-symlink_to_dir /usr/share/doc/python-regex-dbg python-regex 0.1.20171212-1~
+symlink_to_dir /usr/share/doc/python-regex-dbg python-regex 0.1.20180203-1~
diff --git a/debian/python3-regex-dbg.maintscript b/debian/python3-regex-dbg.maintscript
index 62674c9..90ccb4c 100644
--- a/debian/python3-regex-dbg.maintscript
+++ b/debian/python3-regex-dbg.maintscript
@@ -1 +1 @@
-symlink_to_dir /usr/share/doc/python3-regex-dbg python-regex 0.1.20171212-1~
+symlink_to_dir /usr/share/doc/python3-regex-dbg python-regex 0.1.20180203-1~
diff --git a/debian/python3-regex.maintscript b/debian/python3-regex.maintscript
index c476fdd..c5a8862 100644
--- a/debian/python3-regex.maintscript
+++ b/debian/python3-regex.maintscript
@@ -1 +1 @@
-symlink_to_dir /usr/share/doc/python3-regex python-regex 0.1.20171212-1~
+symlink_to_dir /usr/share/doc/python3-regex python-regex 0.1.20180203-1~
-- 
2.11.0

Attachment: signature.asc
Description: PGP signature

Reply via email to