[Git][haskell-team/DHG_packages][master] 5 commits: ShellCheck: Upgrading from 0.6.0 to 0.7.0
Samuel Henrique
gitlab at salsa.debian.org
Tue Nov 19 21:00:21 GMT 2019
Samuel Henrique pushed to branch master at Debian Haskell Group / DHG_packages
Commits:
50db78e0 by Samuel Henrique at 2019-11-19T20:40:17Z
ShellCheck: Upgrading from 0.6.0 to 0.7.0
- - - - -
f8a93a91 by Samuel Henrique at 2019-11-19T20:40:48Z
ShellCheck: Add myself as an uploader
- - - - -
344413fc by Samuel Henrique at 2019-11-19T20:44:34Z
ShellCheck: Remove cruft folder debian/patches
- - - - -
7a33a938 by Samuel Henrique at 2019-11-19T20:46:08Z
ShellCheck: Remove unused lintian override
- - - - -
5cbc2c79 by Samuel Henrique at 2019-11-19T20:51:32Z
ShellCheck: Update changelog
- - - - -
5 changed files:
- p/shellcheck/debian/changelog
- p/shellcheck/debian/control
- − p/shellcheck/debian/patches/make_testsuite_optional.patch
- − p/shellcheck/debian/patches/series
- − p/shellcheck/debian/shellcheck.lintian-overrides
Changes:
=====================================
p/shellcheck/debian/changelog
=====================================
@@ -1,3 +1,12 @@
+shellcheck (0.7.0-1) unstable; urgency=medium
+
+ * New upstream release
+ * Bump to Standards-Version 4.4.1
+ * Add myself as an uploaded
+ * Remove unused lintian override
+
+ -- Samuel Henrique <samueloph at debian.org> Tue, 19 Nov 2019 20:18:55 +0000
+
shellcheck (0.6.0-1) unstable; urgency=medium
* New upstream release
=====================================
p/shellcheck/debian/control
=====================================
@@ -1,6 +1,7 @@
Source: shellcheck
Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
-Uploaders: Helmut Grohne <helmut at subdivi.de>
+Uploaders: Helmut Grohne <helmut at subdivi.de>,
+ Samuel Henrique <samueloph at debian.org>
Priority: optional
Section: devel
Rules-Requires-Root: no
@@ -8,11 +9,15 @@ Build-Depends: debhelper (>= 10),
cdbs,
haskell-devscripts (>= 0.13),
ghc (>= 8.4.3),
+ ghc-prof,
+ libghc-diff-dev (>= 0.2.0),
+ libghc-diff-prof,
libghc-quickcheck2-dev (>= 2.7.4),
libghc-aeson-dev,
libghc-regex-tdfa-dev,
+ libghc-regex-tdfa-prof,
pandoc,
-Standards-Version: 4.1.4
+Standards-Version: 4.4.1
Homepage: https://www.shellcheck.net/
Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/shellcheck
Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/shellcheck]
=====================================
p/shellcheck/debian/patches/make_testsuite_optional.patch deleted
=====================================
@@ -1,159 +0,0 @@
-From: Helmut Grohne <helmut at subdivi.de>
-Subject: make TemplateHaskell usage optional
-Last-Update: 2016-08-13
-
-The only use of TemplateHaskell in ShellCheck is for collecting QuickCheck
-properties. Unfortunately this means that the main ShellCheck modules do not
-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).
-
---- 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/>.
- -}
--{-# LANGUAGE TemplateHaskell, FlexibleContexts #-}
--module ShellCheck.Analytics (runAnalytics, ShellCheck.Analytics.runTests) where
-+{-# LANGUAGE CPP #-}
-+{-# LANGUAGE FlexibleContexts #-}
-+#ifndef DEBIAN_NO_GHCI
-+{-# LANGUAGE TemplateHaskell #-}
-+#endif
-+module ShellCheck.Analytics (runAnalytics
-+#ifndef DEBIAN_NO_GHCI
-+ , ShellCheck.Analytics.runTests
-+#endif
-+ ) where
-
- import ShellCheck.AST
- import ShellCheck.ASTLib
-@@ -42,7 +50,9 @@
- import Data.Ord
- import Debug.Trace
- import qualified Data.Map.Strict as Map
-+#ifndef DEBIAN_NO_GHCI
- import Test.QuickCheck.All (forAllProperties)
-+#endif
- import Test.QuickCheck.Test (quickCheckWithResult, stdArgs, maxSuccess)
-
- -- Checks that are run on the AST root
-@@ -2891,5 +2901,7 @@
- then [x]
- else concatMap recursiveSequences list
-
-+#ifndef DEBIAN_NO_GHCI
- return []
- runTests = $( [| $(forAllProperties) (quickCheckWithResult (stdArgs { maxSuccess = 1 }) ) |])
-+#endif
---- 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/>.
- -}
--{-# LANGUAGE NoMonomorphismRestriction, TemplateHaskell, FlexibleContexts #-}
--module ShellCheck.Parser (parseScript, runTests) where
-+{-# LANGUAGE CPP, NoMonomorphismRestriction, FlexibleContexts #-}
-+#ifndef DEBIAN_NO_GHCI
-+{-# LANGUAGE TemplateHaskell #-}
-+#endif
-+module ShellCheck.Parser (parseScript
-+#ifndef DEBIAN_NO_GHCI
-+ , runTests
-+#endif
-+ ) where
-
- import ShellCheck.AST
- import ShellCheck.ASTLib
-@@ -45,7 +52,9 @@
- import qualified Control.Monad.State as Ms
- import qualified Data.Map as Map
-
-+#ifndef DEBIAN_NO_GHCI
- import Test.QuickCheck.All (quickCheckAll)
-+#endif
-
- type SCBase m = Mr.ReaderT (Environment m) (Ms.StateT SystemState m)
- type SCParser m v = ParsecT String UserState (SCBase m) v
-@@ -2987,6 +2996,8 @@
- }
-
-
-+#ifndef DEBIAN_NO_GHCI
- return []
- runTests = $quickCheckAll
-+#endif
-
---- 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/>.
- -}
-+{-# LANGUAGE CPP #-}
-+#ifndef DEBIAN_NO_GHCI
- {-# LANGUAGE TemplateHaskell #-}
-+#endif
- {-# LANGUAGE FlexibleContexts #-}
- module ShellCheck.AnalyzerLib where
- import ShellCheck.AST
---- 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/>.
- -}
-+{-# LANGUAGE CPP #-}
-+#ifndef DEBIAN_NO_GHCI
- {-# LANGUAGE TemplateHaskell #-}
--module ShellCheck.Checker (checkScript, ShellCheck.Checker.runTests) where
-+#endif
-+module ShellCheck.Checker (checkScript
-+#ifndef DEBIAN_NO_GHCI
-+ , ShellCheck.Checker.runTests
-+#endif
-+ ) where
-
- import ShellCheck.Interface
- import ShellCheck.Parser
-@@ -35,7 +42,9 @@
- import Prelude hiding (readFile)
- import Control.Monad
-
-+#ifndef DEBIAN_NO_GHCI
- import Test.QuickCheck.All
-+#endif
-
- tokenToPosition map (TokenComment id c) = fromMaybe fail $ do
- position <- Map.lookup id map
-@@ -194,5 +203,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
---- 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/>.
- -}
-+{-# LANGUAGE CPP #-}
-+#ifndef DEBIAN_NO_GHCI
- {-# LANGUAGE TemplateHaskell #-}
-+#endif
- {-# LANGUAGE FlexibleContexts #-}
-
- -- This module contains checks that examine specific commands by name.
-@@ -850,5 +853,7 @@
- f t = whenShell [Bash,Ksh] $ do
- style (getId t) 2219 $ "Instead of 'let expr', prefer (( expr )) ."
-
-+#ifndef DEBIAN_NO_GHCI
- return []
- runTests = $( [| $(forAllProperties) (quickCheckWithResult (stdArgs { maxSuccess = 1 }) ) |])
-+#endif
=====================================
p/shellcheck/debian/patches/series deleted
=====================================
=====================================
p/shellcheck/debian/shellcheck.lintian-overrides deleted
=====================================
@@ -1 +0,0 @@
-binary-or-shlib-defines-rpath
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/compare/d2bf958799bc5368356cd8d6c27c1a130c424fa7...5cbc2c79f7d4ce35fd16034e8cc308e59971adf9
--
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/compare/d2bf958799bc5368356cd8d6c27c1a130c424fa7...5cbc2c79f7d4ce35fd16034e8cc308e59971adf9
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/pkg-haskell-commits/attachments/20191119/7a4bda96/attachment-0001.html>
More information about the Pkg-haskell-commits
mailing list