Hello community, here is the log from the commit of package hscolour for openSUSE:Factory checked in at 2013-08-01 15:36:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hscolour (Old) and /work/SRC/openSUSE:Factory/.hscolour.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hscolour" Changes: -------- --- /work/SRC/openSUSE:Factory/hscolour/hscolour.changes 2012-12-28 15:01:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.hscolour.new/hscolour.changes 2013-08-01 15:36:37.000000000 +0200 @@ -1,0 +2,7 @@ +Mon May 6 07:36:37 UTC 2013 - peter.tromm...@ohm-hochschule.de + +- update to 1.20.3 from upstream +* compiles with ghc 7.6 +- new simplified packaging + +------------------------------------------------------------------- Old: ---- hscolour-1.19.tar.gz New: ---- hscolour-1.20.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hscolour.spec ++++++ --- /var/tmp/diff_new_pack.uffmmt/_old 2013-08-01 15:36:37.000000000 +0200 +++ /var/tmp/diff_new_pack.uffmmt/_new 2013-08-01 15:36:37.000000000 +0200 @@ -1,8 +1,7 @@ # # spec file for package hscolour # - -# Copyright (c) 2012 Peter Trommler peter.tromm...@ohm-hochschule.de +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,61 +15,65 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %global pkg_name hscolour %global common_summary Colorise Haskell code %global common_description A small Haskell script to colorise Haskell code. It currently has six output formats: ANSI terminal codes (optionally XTerm-256colour codes), HTML 3.2 with font tags, HTML 4.01 with CSS, HTML 4.01 with CSS and mouseover annotations, XHTML 1.0 with inline CSS styling, LaTeX, and mIRC chat codes. -%global without_hscolour 1 - Name: hscolour -Version: 1.19 -Release: 1 +Version: 1.20.3 +Release: 0 Summary: Haskell %{pkg_name} - -Group: Development/Languages/Other License: GPL-2.0 +Group: Development/Languages/Other + BuildRoot: %{_tmppath}/%{name}-%{version}-build # BEGIN cabal2spec -URL: http://hackage.haskell.org/package/%{name} +Url: http://hackage.haskell.org/package/%{name} Source0: http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz ExclusiveArch: %{ix86} x86_64 %{ghc_arches} BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} BuildRequires: ghc-containers-devel +BuildRequires: ghc-rpm-macros # END cabal2spec %description %{common_description} +%package -n ghc-%{pkg_name} +Summary: Haskell %{pkg_name} library +Group: Development/Languages/Other + +%description -n ghc-%{pkg_name} +%{common_description} + +%package -n ghc-%{pkg_name}-devel +Summary: Haskell %{pkg_name} library development files +Group: Development/Languages/Other +Requires: ghc-compiler +Requires(post): ghc-compiler +Requires(postun): ghc-compiler +Requires: ghc-%{pkg_name} = %{version}-%{release} + +%description -n ghc-%{pkg_name}-devel +%{common_description} %prep %setup -q - %build %ghc_lib_build - %install %ghc_lib_install +%post -n ghc-%{pkg_name}-devel +%ghc_pkg_recache -# library subpackage -%ghc_package - -%ghc_description - - -# devel subpackage -%ghc_devel_package - -%ghc_devel_description - - -%ghc_devel_post_postun - +%postun -n ghc-%{pkg_name}-devel +%ghc_pkg_recache %files %defattr(-,root,root,-) @@ -78,8 +81,8 @@ %attr(755,root,root) %{_bindir}/HsColour %{_datadir}/%{name}-%{version} +%files -n ghc-%{pkg_name} -f ghc-%{pkg_name}.files -%ghc_files - +%files -n ghc-%{pkg_name}-devel -f ghc-%{pkg_name}-devel.files %changelog ++++++ hscolour-1.19.tar.gz -> hscolour-1.20.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hscolour-1.19/HsColour.hs new/hscolour-1.20.3/HsColour.hs --- old/hscolour-1.19/HsColour.hs 2011-06-05 19:05:04.000000000 +0200 +++ new/hscolour-1.20.3/HsColour.hs 2012-09-08 16:51:23.000000000 +0200 @@ -20,7 +20,8 @@ import System.IO (hSetEncoding, utf8) #endif -version = "1.19" +version :: String +version = show MAJOR ++"."++show MINOR optionTable :: [(String,Option)] optionTable = [ ("help", Help) @@ -84,7 +85,7 @@ ioWrapper (HSColour.hscolour output pref anchors partial title) where - writeResult outF s = do if null outF then putStr s + writeResult outF s = do if null outF then putStrLn s else writeUTF8File (last outF) s exitSuccess fileInteract out ann inFs u diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hscolour-1.19/LICENCE-GPL new/hscolour-1.20.3/LICENCE-GPL --- old/hscolour-1.19/LICENCE-GPL 2011-06-05 19:05:04.000000000 +0200 +++ new/hscolour-1.20.3/LICENCE-GPL 2012-09-08 16:51:23.000000000 +0200 @@ -2,7 +2,8 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hscolour-1.19/Language/Haskell/HsColour/Anchors.hs new/hscolour-1.20.3/Language/Haskell/HsColour/Anchors.hs --- old/hscolour-1.19/Language/Haskell/HsColour/Anchors.hs 2011-06-05 19:05:04.000000000 +0200 +++ new/hscolour-1.20.3/Language/Haskell/HsColour/Anchors.hs 2012-09-08 16:51:23.000000000 +0200 @@ -42,6 +42,7 @@ || isURIFragmentValid x || isLower x || isUpper x = [x] + | ord x >= 256 = [x] -- not correct, but better than nothing | otherwise = ['%',hexHi (ord x), hexLo (ord x)] hexHi d = intToDigit (d`div`16) hexLo d = intToDigit (d`mod`16) @@ -79,6 +80,7 @@ identifier st t@((Keyword,"newtype"):stream) = getConid stream identifier st t@((Keyword,"type"):stream) = getConid stream identifier st t@((Keyword,"class"):stream) = getConid stream +identifier st t@((Keyword,"instance"):stream)= getInstance stream identifier st t@((Comment,_):(Space,"\n"):stream) = identifier st stream identifier st stream = Nothing @@ -139,9 +141,21 @@ context :: [(TokenType, String)] -> [(TokenType, String)] context stream@((Keyglyph,"="):_) = stream context stream@((Keyglyph,"=>"):_) = stream +context stream@((Keyglyph,"⇒"):_) = stream context (_:stream) = context stream context [] = [] +-- the anchor name for an instance is just the entire instance head, minus +-- any extra context clause +getInstance = Just . unwords . ("instance":) . words . concat . map snd + . trimContext . takeWhile (/=(Keyword,"where")) + where + trimContext ts = if (Keyglyph,"=>") `elem` ts + || (Keyglyph,"⇒") `elem` ts + then tail . dropWhile (`notElem`[(Keyglyph,"=>") + ,(Keyglyph,"⇒")]) $ ts + else ts + -- simple implementation of a string lookup table. -- replace this with something more sophisticated if needed. type ST = [String] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hscolour-1.19/Language/Haskell/HsColour/Colourise.hs new/hscolour-1.20.3/Language/Haskell/HsColour/Colourise.hs --- old/hscolour-1.19/Language/Haskell/HsColour/Colourise.hs 2011-06-05 19:05:04.000000000 +0200 +++ new/hscolour-1.20.3/Language/Haskell/HsColour/Colourise.hs 2012-09-08 16:51:23.000000000 +0200 @@ -1,3 +1,4 @@ +{-# LANGUAGE ScopedTypeVariables #-} module Language.Haskell.HsColour.Colourise ( module Language.Haskell.HsColour.ColourHighlight , ColourPrefs(..) @@ -12,6 +13,8 @@ import System.IO (hPutStrLn,stderr) import System.Environment (getEnv) import Data.List +import Prelude hiding (catch) +import Control.Exception.Base (catch) -- | Colour preferences. data ColourPrefs = ColourPrefs @@ -54,11 +57,11 @@ readColourPrefs = catch (do val <- readFile ".hscolour" parseColourPrefs ".hscolour" val) - (\_-> catch + (\ (_::IOError)-> catch (do home <- getEnv "HOME" val <- readFile (home++"/.hscolour") parseColourPrefs (home++"/.hscolour") val) - (\_-> return defaultColourPrefs)) + (\ (_::IOError)-> return defaultColourPrefs)) -- | Convert token classification to colour highlights. colourise :: ColourPrefs -> TokenType -> [Highlight] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hscolour-1.19/hscolour.cabal new/hscolour-1.20.3/hscolour.cabal --- old/hscolour-1.19/hscolour.cabal 2011-06-05 19:05:04.000000000 +0200 +++ new/hscolour-1.20.3/hscolour.cabal 2012-09-08 16:51:23.000000000 +0200 @@ -1,6 +1,6 @@ Name: hscolour -Version: 1.19 -Copyright: 2003-2011 Malcolm Wallace, University of York; 2006 Bjorn Bringert +Version: 1.20.3 +Copyright: 2003-2012 Malcolm Wallace; 2006 Bjorn Bringert Maintainer: Malcolm Wallace Author: Malcolm Wallace Homepage: http://code.haskell.org/~malcolm/hscolour/ @@ -50,7 +50,9 @@ Build-depends: base < 10, containers Main-is: HsColour.hs --ghc-options: -O -W - Extensions: + Extensions: CPP + cpp-options: -DMAJOR=1 -DMINOR=20 + Source-repository head -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
