[DHG_packages] 01/01: xmonad: Upgrading from 0.11.1 to 0.12
Clint Adams
clint at moszumanska.debian.org
Mon Jan 11 05:27:07 UTC 2016
This is an automated email from the git hooks/post-receive script.
clint pushed a commit to branch master
in repository DHG_packages.
commit a2329e7154b3d8c9e7deda40ef44c73c3305817c
Author: Clint Adams <clint at debian.org>
Date: Mon Jan 11 00:19:36 2016 -0500
xmonad: Upgrading from 0.11.1 to 0.12
---
p/xmonad/debian/changelog | 6 +++++
p/xmonad/debian/control | 7 ++++++
p/xmonad/debian/patches/fix-GenerateManpage | 29 ----------------------
p/xmonad/debian/patches/float-mplayer2.patch | 27 --------------------
p/xmonad/debian/patches/relax-utf8-string-dep | 13 ----------
p/xmonad/debian/patches/series | 3 ---
.../debian/patches/use_x-terminal-emulator.patch | 8 +++---
7 files changed, 16 insertions(+), 77 deletions(-)
diff --git a/p/xmonad/debian/changelog b/p/xmonad/debian/changelog
index 9c1767d..054b14f 100644
--- a/p/xmonad/debian/changelog
+++ b/p/xmonad/debian/changelog
@@ -1,3 +1,9 @@
+xmonad (0.12-1) unstable; urgency=medium
+
+ * New upstream release
+
+ -- Clint Adams <clint at debian.org> Mon, 11 Jan 2016 00:19:36 -0500
+
xmonad (0.11.1-4) unstable; urgency=medium
* Switch Vcs-Git/Vcs-Browser headers to new location.
diff --git a/p/xmonad/debian/control b/p/xmonad/debian/control
index e747f5b..939a1a5 100644
--- a/p/xmonad/debian/control
+++ b/p/xmonad/debian/control
@@ -13,20 +13,27 @@ Build-Depends: debhelper (>= 9),
libghc-x11-dev (>= 1.5),
libghc-x11-dev (<< 1.7),
libghc-x11-prof,
+ libghc-data-default-dev,
+ libghc-data-default-prof,
libghc-extensible-exceptions-dev,
libghc-extensible-exceptions-prof,
libghc-mtl-dev,
libghc-mtl-prof,
+ libghc-setlocale-dev,
+ libghc-setlocale-prof,
libghc-utf8-string-dev (>= 0.3),
libghc-utf8-string-dev (<< 1.1),
libghc-utf8-string-prof,
libghc-pandoc-dev (>= 1.10),
libghc-regex-posix-dev,
pandoc-data,
+ libghc-x11-dev,
Build-Depends-Indep: ghc-doc,
libghc-x11-doc,
+ libghc-data-default-doc,
libghc-extensible-exceptions-doc,
libghc-mtl-doc,
+ libghc-setlocale-doc,
libghc-utf8-string-doc,
Standards-Version: 3.9.6
Homepage: http://xmonad.org
diff --git a/p/xmonad/debian/patches/fix-GenerateManpage b/p/xmonad/debian/patches/fix-GenerateManpage
deleted file mode 100644
index 76690c0..0000000
--- a/p/xmonad/debian/patches/fix-GenerateManpage
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: xmonad/util/GenerateManpage.hs
-===================================================================
---- xmonad.orig/util/GenerateManpage.hs 2015-08-19 16:35:34.888424481 +0200
-+++ xmonad/util/GenerateManpage.hs 2015-08-19 16:36:29.285364470 +0200
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE FlexibleContexts #-}
- -- Unlike the rest of xmonad, this file is copyright under the terms of the
- -- GPL.
-
-@@ -26,6 +27,7 @@
- import Text.Regex.Posix
- import Data.Char
- import Data.List
-+import qualified Data.Set as Set
-
- import Distribution.PackageDescription.Parse
- import Distribution.Verbosity
-@@ -68,9 +70,9 @@
- `liftM` readFile "./XMonad/Config.hs"
-
- let manHeader = unwords [".TH xmonad 1","\""++releaseDate++"\"",releaseName,"\"xmonad manual\""]
-- writeOpts = defaultWriterOptions -- { writerLiterateHaskell = True }
-+ writeOpts = def -- { writerLiterateHaskell = True }
-
-- parsed <- readMarkdown defaultParserState { stateLiterateHaskell = True }
-+ Right parsed <- readMarkdown def { readerExtensions = Set.insert Ext_literate_haskell pandocExtensions }
- . unlines
- . replace "___KEYBINDINGS___" keybindings
- . lines
diff --git a/p/xmonad/debian/patches/float-mplayer2.patch b/p/xmonad/debian/patches/float-mplayer2.patch
deleted file mode 100644
index b561d23..0000000
--- a/p/xmonad/debian/patches/float-mplayer2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Author: Joey Hess <joeyh at debian.org>
-Debian-Bug: http://bugs.debian.org/753551
-Description:
- xmonad floats mplayer by default. However, Debian has switched to
- mplayer2, and so on upgrade, it will stop floating. This can be easily
- fixed in the user's config file, but here is a patch that avoids
- bothering the user with breakage on upgrade.
-
-Index: xmonad-0.11/XMonad/Config.hs
-===================================================================
---- xmonad-0.11.orig/XMonad/Config.hs 2013-01-01 02:31:47.000000000 +0100
-+++ xmonad-0.11/XMonad/Config.hs 2014-07-03 07:40:08.951940477 +0200
-@@ -90,6 +90,7 @@
- manageHook :: ManageHook
- manageHook = composeAll
- [ className =? "MPlayer" --> doFloat
-+ , className =? "mplayer2" --> doFloat
- , className =? "Gimp" --> doFloat ]
-
- ------------------------------------------------------------------------
-@@ -305,4 +306,4 @@
- "-- Mouse bindings: default actions bound to mouse events",
- "mod-button1 Set the window to floating mode and move by dragging",
- "mod-button2 Raise the window to the top of the stack",
-- "mod-button3 Set the window to floating mode and resize by dragging"]
-\ No newline at end of file
-+ "mod-button3 Set the window to floating mode and resize by dragging"]
diff --git a/p/xmonad/debian/patches/relax-utf8-string-dep b/p/xmonad/debian/patches/relax-utf8-string-dep
deleted file mode 100644
index 8a000a8..0000000
--- a/p/xmonad/debian/patches/relax-utf8-string-dep
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: xmonad-0.11.1/xmonad.cabal
-===================================================================
---- xmonad-0.11.1.orig/xmonad.cabal 2015-06-27 15:12:11.430371165 +0200
-+++ xmonad-0.11.1/xmonad.cabal 2015-06-27 15:12:56.963495179 +0200
-@@ -58,7 +58,7 @@
- else
- build-depends: base < 3
- build-depends: X11>=1.5 && < 1.7, mtl, unix,
-- utf8-string >= 0.3 && < 0.4
-+ utf8-string >= 0.3 && < 1.1
-
- if true
- ghc-options: -funbox-strict-fields -Wall
diff --git a/p/xmonad/debian/patches/series b/p/xmonad/debian/patches/series
index 1121c14..1863ecb 100644
--- a/p/xmonad/debian/patches/series
+++ b/p/xmonad/debian/patches/series
@@ -1,5 +1,2 @@
-fix-GenerateManpage
-float-mplayer2.patch
use_x-terminal-emulator.patch
#haddock-fixes.patch
-relax-utf8-string-dep
diff --git a/p/xmonad/debian/patches/use_x-terminal-emulator.patch b/p/xmonad/debian/patches/use_x-terminal-emulator.patch
index 2878350..288d578 100644
--- a/p/xmonad/debian/patches/use_x-terminal-emulator.patch
+++ b/p/xmonad/debian/patches/use_x-terminal-emulator.patch
@@ -5,11 +5,9 @@ Forwarded: not-needed
Last-Update: 2012-07-07
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: xmonad/XMonad/Config.hs
-===================================================================
---- xmonad.orig/XMonad/Config.hs 2015-08-15 14:43:32.443704478 +0200
-+++ xmonad/XMonad/Config.hs 2015-08-15 14:43:32.439704396 +0200
-@@ -152,7 +152,7 @@
+--- a/src/XMonad/Config.hs
++++ b/src/XMonad/Config.hs
+@@ -166,7 +166,7 @@
-- | The preferred terminal program, which is used in a binding below and by
-- certain contrib modules.
terminal :: String
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git
More information about the Pkg-haskell-commits
mailing list