[Pkg-mc-commits] [Git][debian/mc][master] 5 commits: renamed-tag debian-watch-may-check-gpg-signature => debian-watch-does-not-check-gpg-signature

Dmitry Smirnov gitlab at salsa.debian.org
Sun Mar 4 06:01:37 UTC 2018


Dmitry Smirnov pushed to branch master at Debian / mc


Commits:
00238bf8 by Dmitry Smirnov at 2018-03-04T16:11:13+11:00
renamed-tag debian-watch-may-check-gpg-signature => debian-watch-does-not-check-gpg-signature

- - - - -
fe19469f by Dmitry Smirnov at 2018-03-04T16:12:42+11:00
Standards-Version: 4.1.3

- - - - -
dc6a4599 by Dmitry Smirnov at 2018-03-04T16:18:08+11:00
Debhelper & compat to version 11.

- - - - -
b170c065 by Dmitry Smirnov at 2018-03-04T16:30:22+11:00
rules: removed call to dpkg-parsechangelog.

- - - - -
1317fee7 by Dmitry Smirnov at 2018-03-04T16:42:20+11:00
New upstream release [4.8.20] + changelog summary.

- - - - -


11 changed files:

- debian/changelog
- debian/compat
- debian/control
- debian/copyright
- debian/patches/2987.patch
- − debian/patches/863984.diff
- debian/patches/alt_editor.patch
- debian/patches/series
- − debian/patches/spelling-error-in-manpage.diff
- debian/rules
- debian/source/lintian-overrides


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,19 @@
+mc (3:4.8.20-1) unstable; urgency=medium
+
+  * New upstream release.
+    + fixed random crash at startup (Closes: #870728).
+  * rules: removed call to dpkg-parsechangelog.
+  * Debhelper & compat to version 11.
+  * Standards-Version: 4.1.3.
+
+ -- Dmitry Smirnov <onlyjob at debian.org>  Sun, 04 Mar 2018 16:40:01 +1100
+
 mc (3:4.8.19-1) unstable; urgency=low
 
   * new upstream release
-    + Closes: #866019
-    + Closes: #808303
-    + Closes: #825974
+    + Closes: #866019 (crash On SFTP Upload).
+    + Closes: #808303 (filtered view does not work).
+    + Closes: #825974 (subshell no longer sees correct terminal size).
 
   * remove merged patches:
     + uzip_528239.patch


=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+11


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Yury V. Zaytsev <yury at shurup.com>
           ,Andreas Tille <tille at debian.org>
           ,Dmitry Smirnov <onlyjob at debian.org>
           ,Denis Briand <debian at denis-briand.fr>
-Build-Depends: debhelper (>= 9.20160403~), dh-autoreconf, autopoint, intltool, bison
+Build-Depends: debhelper (>= 11~), autopoint, intltool, bison
  ,check
  ,e2fslibs-dev
  ,gettext
@@ -19,7 +19,7 @@ Build-Depends: debhelper (>= 9.20160403~), dh-autoreconf, autopoint, intltool, b
 # mc determine zip mode from zip alternatives available at build-time(!)
 # hence 'unzip' needed to set proper zip mode, see #661467
  ,unzip
-Standards-Version: 4.0.0
+Standards-Version: 4.1.3
 Homepage: https://www.midnight-commander.org
 Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/mc.git
 Vcs-Git: https://anonscm.debian.org/git/collab-maint/mc.git


=====================================
debian/copyright
=====================================
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,7 +8,7 @@ Comment:
  Paul Seelig <pseelig at mail.uni-mainz.de>.
 
 Files: *
-Copyright: 1991-1992,1994-2016 Free Software Foundation
+Copyright: 1991-1992,1994-2017 Free Software Foundation
     1996      andrey joukov <2:5020/337.13 at fidonet.org>
     2002      ARJ Software Russia
     2003      Alexander Serkov <serkov at ukrpost.net>
@@ -52,7 +52,7 @@ Copyright:
     2011       Andreas Tille <tille at debian.org>
     2002       Colin Watson <cjwatson at debian.org>
     2008-2015  Denis Briand <debian at denis-briand.fr>
-    2012-2016  Dmitry Smirnov <onlyjob at debian.org>
+    2012-2018  Dmitry Smirnov <onlyjob at debian.org>
     1997       Fernando Alegre <alegre at debian.org>
     2004-2007  Ludovic Drolez <ldrolez at debian.org>
     1999-2001  Martin Bialasinski <martinb at debian.org>


=====================================
debian/patches/2987.patch
=====================================
--- a/debian/patches/2987.patch
+++ b/debian/patches/2987.patch
@@ -12,7 +12,8 @@ Description: clear unfinished text before 'cd' to avoid accidental execution
 
 --- a/src/subshell/common.c
 +++ b/src/subshell/common.c
-@@ -1286,7 +1286,7 @@
+@@ -1287,9 +1287,9 @@
+     }
  
      /* The initial space keeps this out of the command history (in bash
         because we set "HISTCONTROL=ignorespace") */
@@ -21,3 +22,4 @@ Description: clear unfinished text before 'cd' to avoid accidental execution
  
      if (vpath != NULL)
      {
+         const char *translate;


=====================================
debian/patches/863984.diff deleted
=====================================
--- a/debian/patches/863984.diff
+++ /dev/null
@@ -1,47 +0,0 @@
-Author: Yuriy M. Kaminskiy <yumkam+debian at gmail.com>
-Bug-Debian: https://bugs.debian.org/863984
-Forwarded: https://midnight-commander.org/ticket/3840
-Reviewed-by: Denis Briand <debian at denis-briand.fr>
-Description: fix error message when you gzip or bzip files from user menu
-
---- a/misc/mc.menu.in
-+++ b/misc/mc.menu.in
-@@ -241,7 +241,8 @@ y       Gzip or gunzip current file
-         case %f in
-             *.gz|*.[zZ]) DECOMP=-d;;
-         esac
--        gzip "$DECOMP" -v %f
-+        # do *not* add quotes around $DECOMP!
-+        gzip $DECOMP -v %f
- 
- + t t
- Y       Gzip or gunzip tagged files
-@@ -250,7 +251,7 @@ Y       Gzip or gunzip tagged files
-             case "$i" in
-                 *.gz|*.[zZ]) DECOMP=-d;;
-             esac
--            gzip "$DECOMP" -v "$i"
-+            gzip $DECOMP -v "$i"
-         done
- 
- + ! t t
-@@ -259,7 +260,7 @@ b       Bzip2 or bunzip2 current file
-         case %f in
-             *.bz2) DECOMP=-d;;
-         esac
--        bzip2 "$DECOMP" -v %f
-+        bzip2 $DECOMP -v %f
- 
- + t t
- B       Bzip2 or bunzip2 tagged files
-@@ -268,7 +269,7 @@ B       Bzip2 or bunzip2 tagged files
-             case "$i" in
-                 *.bz2) DECOMP=-d;;
-             esac
--            bzip2 "$DECOMP" -v "$i"
-+            bzip2 $DECOMP -v "$i"
-         done
- 
- + f \.tar.gz$ | f \.tgz$ | f \.tpz$ | f \.tar.Z$ | f \.tar.z$ | f \.tar.bz2$ | f \.tar.F$ & t r & ! t t
-
-


=====================================
debian/patches/alt_editor.patch
=====================================
--- a/debian/patches/alt_editor.patch
+++ b/debian/patches/alt_editor.patch
@@ -14,12 +14,14 @@ Description: Detect that mc was launched from alternatives symlink
 
 --- a/src/args.c
 +++ b/src/args.c
-@@ -767,7 +767,7 @@ mc_setup_by_args (int argc, char **argv,
+@@ -635,9 +635,9 @@
+     const char *base;
+ 
      base = x_basename (argv[0]);
-     tmp = (argc > 0) ? argv[1] : NULL;
  
 -    if (strncmp (base, "mce", 3) == 0 || strcmp (base, "vi") == 0)
 +    if (strncmp (base, "mce", 3) == 0 || strcmp (base, "vi") == 0 || strcmp (base, "editor") == 0)
      {
          /* mce* or vi is link to mc */
          mc_global.mc_run_mode = MC_RUN_EDITOR;
+     }


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
 ## UPSTREAM / FORWARDED:
-863984.diff
-spelling-error-in-manpage.diff
 
 ## DEBIAN FIXES AND ENHANCEMENTS:
 2987.patch


=====================================
debian/patches/spelling-error-in-manpage.diff deleted
=====================================
--- a/debian/patches/spelling-error-in-manpage.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-Author: Denis Briand <debian at denis-briand.fr>
-Forwarded: https://midnight-commander.org/ticket/3839
-Description: fix some spelling errors in manpage.
-
---- a/doc/man/mc.1.in.orig	2017-07-09 16:43:05.624760216 +0200
-+++ b/doc/man/mc.1.in	2017-07-09 16:43:46.028758517 +0200
-@@ -1440,7 +1440,7 @@
- to "..".
- .PP
- The 'Enable ignore directories' checkbox and input field below it
--allow to set up the list of directories that should be skip during the search
-+allow one to set up the list of directories that should be skip during the search
- files (for example, you may want to avoid searches on a CD\-ROM or on a NFS
- directory that is mounted across a slow link). List components must be separated
- with a colon, here is an example:
-@@ -2003,10 +2003,10 @@
- of screen above panels. Enabled by default.
- .PP
- .I Command prompt.
--If enabled, command line is avalable. Enabled by default.
-+If enabled, command line is available. Enabled by default.
- .PP
- .I Keybar visible.
--If enabled, 10 lables associated with F1\-F10 keys are located at the bottom
-+If enabled, 10 labels associated with F1\-F10 keys are located at the bottom
- row of screen. Enabled by default.
- .PP
- .I Hintbar visible.


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -65,7 +65,7 @@ override_dh_strip:
 
 .PHONY: get-orig-source
 ## http://wiki.debian.org/onlyjob/get-orig-source
+include /usr/share/dpkg/pkg-info.mk
 PKD  = $(abspath $(dir $(MAKEFILE_LIST)))
-VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s+(?:\d+:)?(\d.*)(?:\-\d+.*)};')
 get-orig-source:
-	uscan --noconf --verbose --rename --destdir=$(CURDIR) --check-dirname-level=0 --force-download --download-version $(VER) $(PKD)
+	uscan --noconf --verbose --rename --destdir=$(CURDIR) --check-dirname-level=0 --force-download --download-version $(DEB_VERSION_UPSTREAM) $(PKD)


=====================================
debian/source/lintian-overrides
=====================================
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,2 +1,2 @@
 #Upstream doesn't provide GPG signature
-debian-watch-may-check-gpg-signature
+debian-watch-does-not-check-gpg-signature



View it on GitLab: https://salsa.debian.org/debian/mc/compare/36995e505b04c3701b1936dc4b8ef4b60684ad99...1317fee72e24965ea45f9514c0b438e94657ecf2

---
View it on GitLab: https://salsa.debian.org/debian/mc/compare/36995e505b04c3701b1936dc4b8ef4b60684ad99...1317fee72e24965ea45f9514c0b438e94657ecf2
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-mc-commits/attachments/20180304/332602b3/attachment-0001.html>


More information about the Pkg-mc-commits mailing list