[med-svn] [Git][med-team/swissknife][master] 3 commits: Just realised that what I saved from SVN to Git was actually an existing package…

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / swissknife


Commits:
067dcb6f by Andreas Tille at 2018-04-14T00:04:02+02:00
Just realised that what I saved from SVN to Git was actually an existing package with lots of uncommited changes in SVN.  Restore changelog and at least latest patch (which does not apply to new upstream version and thus is commented)

- - - - -
9b9b6453 by Andreas Tille at 2018-04-14T00:06:11+02:00
Source package name is swissknife

- - - - -
984e5d11 by Andreas Tille at 2018-04-14T00:06:37+02:00
Standards-Version: 4.1.4

- - - - -


4 changed files:

- debian/changelog
- debian/control
- + debian/patches/perl_5.26.patch
- + debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,33 @@
-libswiss-perl (1.75-1) UNRELEASED; urgency=low
+swissknife (1.75-1) UNRELEASED; urgency=medium
 
-  * Initial Release
-  Tried to finalise the package but got for version 1.73 (not checked for last version)
-
-  Files=10, Tests=20,  2 wallclock secs ( 0.06 usr  0.02 sys +  1.64 cusr  0.03 csys =  1.75 CPU)
-  Result: FAIL
-  Failed 5/10 test programs. 5/20 subtests failed.
-  dh_auto_test: perl Build test --verbose 1 returned exit code 255
+  * Team upload.
   * Moved packaging from SVN to Git
+  * Standards-Version: 4.1.4
 
  -- Andreas Tille <tille at debian.org>  Tue, 03 Jan 2017 07:35:48 +0100
+
+swissknife (1.67-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "FTBFS with perl 5.26: Unescaped left brace in regex":
+    apply patches from Niko Tyni which fix regexp quantifiers and regexp
+    quoting. (Closes: #826505)
+
+ -- gregor herrmann <gregoa at debian.org>  Fri, 14 Jul 2017 23:24:18 +0200
+
+swissknife (1.67-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "FTBFS with perl 5.22: Can't use 'defined(@array)'":
+    Remove defined() from lib/SWISS/CCalt_prod.pm.
+    "defined(@array)" and "defined(%hash)" are fatal errors since Perl 5.21.x
+    (deprecated since 5.6.1).
+    (Closes: #789671)
+
+ -- gregor herrmann <gregoa at debian.org>  Thu, 27 Aug 2015 19:45:40 +0200
+
+swissknife (1.67-1) unstable; urgency=low
+
+  * Initial Release (Closes: #556458).
+
+ -- Steffen Moeller <moeller at debian.org>  Mon, 16 Nov 2009 10:18:32 +0100


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: libswiss-perl
+Source: swissknife
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Steffen Moeller <moeller at debian.org>,
            Andreas Tille <tille at debian.org>
@@ -8,9 +8,9 @@ Priority: optional
 Build-Depends: debhelper (>= 10),
                libmodule-build-perl
 Build-Depends-Indep: perl
-Standards-Version: 4.1.2
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/libswiss-perl.git
-Vcs-Git: https://anonscm.debian.org/git/debian-med/libswiss-perl.git
+Standards-Version: 4.1.4
+Vcs-Browser: https://salsa.debian.org/med-team/swissknife
+Vcs-Git: https://salsa.debian.org/med-team/swissknife.git
 Homepage: http://swissknife.sourceforge.net
 
 Package: libswiss-perl


=====================================
debian/patches/perl_5.26.patch
=====================================
--- /dev/null
+++ b/debian/patches/perl_5.26.patch
@@ -0,0 +1,34 @@
+Author: Niko Tyni, 
+        gregor herrmann <gregoa at debian.org>
+Last-Update: Fri, 14 Jul 2017 23:24:18 +0200
+Bug-Debian: https://bugs.debian.org/826505
+Description: Fix "FTBFS with perl 5.26: Unescaped left brace in regex":
+    apply patches from Niko Tyni which fix regexp quantifiers and regexp
+    quoting
+
+diff --git a/lib/SWISS/BaseClass.pm b/lib/SWISS/BaseClass.pm
+index 34ce34d..ae76059 100644
+--- a/lib/SWISS/BaseClass.pm
++++ b/lib/SWISS/BaseClass.pm
+@@ -168,7 +168,7 @@ sub setEvidenceTags {
+ sub addEvidenceTag {
+   my $self = shift;
+   my $tag = shift;
+-  unless ($self->{'evidenceTags'} =~ /[\{\,]$tag[\}\,]/) {
++  unless ($self->{'evidenceTags'} =~ /[\{\,]\Q$tag\E[\}\,]/) {
+     if ($self->{'evidenceTags'} eq '{}') {
+       $self->{'evidenceTags'} = '{' . $tag . '}';
+     } else {
+diff --git a/lib/SWISS/TextFunc.pm b/lib/SWISS/TextFunc.pm
+index 5a340cd..47641a1 100644
+--- a/lib/SWISS/TextFunc.pm
++++ b/lib/SWISS/TextFunc.pm
+@@ -193,7 +193,7 @@ sub wrapOn {
+                   # of length 1 ($sepLength = 1)
+                   my $sepLength = 1;
+                   my $w1 = $cutPos - $sepLength;
+-                  if ($postMatch =~ /^(\S{0,$w1}$separators[$j])/) {
++                  if ($w1 >= 0 and $postMatch =~ /^(\S{0,$w1}$separators[$j])/) {
+                     $cutPos = length($1);
+                     last;
+                   }


=====================================
debian/patches/series
=====================================
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+# perl_5.26.patch



View it on GitLab: https://salsa.debian.org/med-team/swissknife/compare/1040fed8530748a7697f90c341e769e89d34ecc5...984e5d1189d336aae495ca040b20392baf26b044

---
View it on GitLab: https://salsa.debian.org/med-team/swissknife/compare/1040fed8530748a7697f90c341e769e89d34ecc5...984e5d1189d336aae495ca040b20392baf26b044
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20180413/52b659ff/attachment-0001.html>