[DHG_packages] 03/03: ShellCheck: Upgrading from 0.4.4 to 0.4.6

[Clint Adams]

This is an automated email from the git hooks/post-receive script.

clint pushed a commit to branch master
in repository DHG_packages.

commit e78b6b38417ada95dacf49e7605922285d7fe500
Author: Clint Adams <clint at debian.org>
Date:   Thu Jul 6 22:13:17 2017 -0400

    ShellCheck: Upgrading from 0.4.4 to 0.4.6
---
 p/shellcheck/debian/changelog                      |  6 ++
 .../debian/patches/make_testsuite_optional.patch   | 67 +++++++---------------
 2 files changed, 27 insertions(+), 46 deletions(-)

diff --git a/p/shellcheck/debian/changelog b/p/shellcheck/debian/changelog
index a9304b3..2bf8037 100644
--- a/p/shellcheck/debian/changelog
+++ b/p/shellcheck/debian/changelog
@@ -1,3 +1,9 @@
+shellcheck (0.4.6-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Clint Adams <clint at debian.org>  Thu, 06 Jul 2017 22:13:17 -0400
+
 shellcheck (0.4.4-4) unstable; urgency=medium
 
   * Upload to unstable as part of GHC 8 transition.
diff --git a/p/shellcheck/debian/patches/make_testsuite_optional.patch b/p/shellcheck/debian/patches/make_testsuite_optional.patch
index b01d703..539b985 100644
--- a/p/shellcheck/debian/patches/make_testsuite_optional.patch
+++ b/p/shellcheck/debian/patches/make_testsuite_optional.patch
@@ -8,10 +8,8 @@ build on non-TH architectures. This patch removes the runTests symbol defined
 using TemplateHaskell on non-TH architectures by branching on the
 Debian-specific DEBIAN_NO_GHCI CPP macro (Thanks to Joachim Breitner).
 
-Index: shellcheck/ShellCheck/Analytics.hs
-===================================================================
---- shellcheck.orig/ShellCheck/Analytics.hs
-+++ shellcheck/ShellCheck/Analytics.hs
+--- a/ShellCheck/Analytics.hs
++++ b/ShellCheck/Analytics.hs
 @@ -17,8 +17,16 @@
      You should have received a copy of the GNU General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -41,18 +39,16 @@ Index: shellcheck/ShellCheck/Analytics.hs
  import Test.QuickCheck.Test (quickCheckWithResult, stdArgs, maxSuccess)
  
  -- Checks that are run on the AST root
-@@ -2790,5 +2800,7 @@
-             "]" -> "["
-             x -> x
+@@ -2737,5 +2747,7 @@
+             warn id 2205 "(..) is a subshell. Did you mean [ .. ], a test expression?"
+ 
  
 +#ifndef DEBIAN_NO_GHCI
  return []
  runTests =  $( [| $(forAllProperties) (quickCheckWithResult (stdArgs { maxSuccess = 1 }) ) |])
 +#endif
-Index: shellcheck/ShellCheck/Parser.hs
-===================================================================
---- shellcheck.orig/ShellCheck/Parser.hs
-+++ shellcheck/ShellCheck/Parser.hs
+--- a/ShellCheck/Parser.hs
++++ b/ShellCheck/Parser.hs
 @@ -17,8 +17,15 @@
      yOU should have received a copy of the GNU General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -81,7 +77,7 @@ Index: shellcheck/ShellCheck/Parser.hs
  
  type SCBase m = Mr.ReaderT (SystemInterface m) (Ms.StateT SystemState m)
  type SCParser m v = ParsecT String UserState (SCBase m) v
-@@ -2664,6 +2673,8 @@
+@@ -2835,6 +2844,8 @@
  lt x = trace (show x) x
  ltt t = trace (show t)
  
@@ -90,10 +86,8 @@ Index: shellcheck/ShellCheck/Parser.hs
  runTests = $quickCheckAll
 +#endif
  
-Index: shellcheck/ShellCheck/AnalyzerLib.hs
-===================================================================
---- shellcheck.orig/ShellCheck/AnalyzerLib.hs
-+++ shellcheck/ShellCheck/AnalyzerLib.hs
+--- a/ShellCheck/AnalyzerLib.hs
++++ b/ShellCheck/AnalyzerLib.hs
 @@ -17,7 +17,10 @@
      You should have received a copy of the GNU General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -105,18 +99,8 @@ Index: shellcheck/ShellCheck/AnalyzerLib.hs
  {-# LANGUAGE FlexibleContexts #-}
  module ShellCheck.AnalyzerLib where
  import ShellCheck.AST
-@@ -628,5 +631,7 @@
-     getCode (TokenComment _ (Comment _ c _)) = c
- 
- 
-+#ifndef DEBIAN_NO_GHCI
- return [] 
- runTests =  $( [| $(forAllProperties) (quickCheckWithResult (stdArgs { maxSuccess = 1 }) ) |])
-+#endif
-Index: shellcheck/ShellCheck/Checker.hs
-===================================================================
---- shellcheck.orig/ShellCheck/Checker.hs
-+++ shellcheck/ShellCheck/Checker.hs
+--- a/ShellCheck/Checker.hs
++++ b/ShellCheck/Checker.hs
 @@ -17,8 +17,15 @@
      You should have received a copy of the GNU General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -144,19 +128,17 @@ Index: shellcheck/ShellCheck/Checker.hs
  
  tokenToPosition map (TokenComment id c) = fromMaybe fail $ do
      position <- Map.lookup id map
-@@ -158,5 +167,7 @@
-                 [("foo", "source bar"), ("bar", "baz=3")]
-                 "#shellcheck source=foo\n. \"$1\"; echo \"$baz\""
+@@ -178,5 +187,7 @@
+ prop_filewideAnnotation8 = null $
+     check "# Disable $? warning\n#shellcheck disable=SC2181\n# Disable quoting warning\n#shellcheck disable=2086\ntrue\n[ $? == 0 ] && echo $1"
  
 +#ifndef DEBIAN_NO_GHCI
  return []
  runTests = $quickCheckAll
 +#endif
-Index: shellcheck/ShellCheck/Checks/Commands.hs
-===================================================================
---- shellcheck.orig/ShellCheck/Checks/Commands.hs
-+++ shellcheck/ShellCheck/Checks/Commands.hs
-@@ -17,12 +17,17 @@
+--- a/ShellCheck/Checks/Commands.hs
++++ b/ShellCheck/Checks/Commands.hs
+@@ -17,7 +17,10 @@
      You should have received a copy of the GNU General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -}
@@ -167,16 +149,9 @@ Index: shellcheck/ShellCheck/Checks/Commands.hs
  {-# LANGUAGE FlexibleContexts #-}
  
  -- This module contains checks that examine specific commands by name.
- module ShellCheck.Checks.Commands (runChecks
-+#ifndef DEBIAN_NO_GHCI
-     , ShellCheck.Checks.Commands.runTests
-+#endif
- ) where
- 
- import ShellCheck.AST
-@@ -556,5 +561,7 @@
-     checkArg _ = return ()
- 
+@@ -681,5 +684,7 @@
+ checkDeprecatedFgrep = CommandCheck (Basename "fgrep") $
+     \t -> info (getId t) 2197 "fgrep is non-standard and deprecated. Use grep -F instead."
  
 +#ifndef DEBIAN_NO_GHCI
  return []

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git