[DHG_packages] 01/01: Merge branch 'master' into experimental

[Joachim Breitner]

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

nomeata pushed a commit to branch experimental
in repository DHG_packages.

commit dec0f866b256d85adc8a3bca42ba0fb7f9606d25
Merge: fe77638 a3cced0
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Thu Dec 3 18:59:32 2015 +0100

    Merge branch 'master' into experimental

 p/gitit/debian/changelog                           |  6 +++++
 p/haskell-xcb-types/debian/changelog               |  6 +++++
 p/xmonad-contrib/debian/changelog                  |  9 +++++++
 p/xmonad-contrib/debian/control                    |  2 +-
 .../debian/patches/gnome-dbus-send-fix.patch       | 23 ++++++++++++++++++
 p/xmonad-contrib/debian/patches/series             |  1 +
 p/xmonad/debian/README.Debian                      |  8 +++++++
 p/xmonad/debian/changelog                          | 17 +++++++++++++
 p/xmonad/debian/control                            |  3 ++-
 p/xmonad/debian/gnome-flashback-xmonad             |  6 +++++
 p/xmonad/debian/gnome-flashback-xmonad.1           | 17 +++++++++++++
 p/xmonad/debian/gnome-flashback-xmonad.session     |  3 +++
 p/xmonad/debian/xmonad.NEWS                        | 28 +++++++++++++++-------
 p/xmonad/debian/xmonad.install                     |  3 +++
 p/xmonad/debian/xmonad.lintian-overrides           |  3 +++
 p/xmonad/debian/xmonad.manpages                    |  1 +
 p/xmonad/debian/xmonad.postinst                    | 17 +++++++++++++
 p/xmonad/debian/xmonad.prerm                       |  9 +++++++
 .../xsessions/gnome-flashback-xmonad.desktop       |  9 +++++++
 19 files changed, 160 insertions(+), 11 deletions(-)

diff --cc p/gitit/debian/changelog
index 6e4d7b5,ac23cd9..95d1a05
--- a/p/gitit/debian/changelog
+++ b/p/gitit/debian/changelog
@@@ -1,17 -1,9 +1,23 @@@
 +gitit (0.11.1.1-2) experimental; urgency=medium
 +
 +  * Rebuild, to pick up newer libjs-jquery dependencies (Closes: #796809)
 +
 + -- Joachim Breitner <nomeata at debian.org>  Fri, 20 Nov 2015 09:09:17 +0100
 +
 +gitit (0.11.1.1-1) experimental; urgency=medium
 +
 +  * New upstream release
 +  * Depend on haskell-devscripts >= 0.10 to ensure that this package
 +    builds against GHC in experimental
 +
 + -- Joachim Breitner <nomeata at debian.org>  Thu, 20 Aug 2015 10:26:53 +0200
 +
+ gitit (0.10.7-4) unstable; urgency=medium
+ 
+   * Rebuild for sid due upgrade of libjs-jquery there (Closes: #796809)
+ 
+  -- Dmitry Bogatov <KAction at gnu.org>  Sat, 21 Nov 2015 10:45:15 +0300
+ 
  gitit (0.10.7-3) unstable; urgency=medium
  
    * Remove bogus dependency on libghc-cgi-*
diff --cc p/haskell-xcb-types/debian/changelog
index 8c9e73b,e5539cd..233d8e9
--- a/p/haskell-xcb-types/debian/changelog
+++ b/p/haskell-xcb-types/debian/changelog
@@@ -1,11 -1,9 +1,17 @@@
+ haskell-xcb-types (0.7.1-1) unstable; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Joachim Breitner <nomeata at debian.org>  Fri, 23 Oct 2015 16:36:17 +0200
+ 
 +haskell-xcb-types (0.7.0-4) experimental; urgency=medium
 +
 +  * Bump standards-version to 3.9.6
 +  * Depend on haskell-devscripts >= 0.10 to ensure that this package
 +    builds against GHC in experimental
 +
 + -- Joachim Breitner <nomeata at debian.org>  Thu, 20 Aug 2015 10:29:06 +0200
 +
  haskell-xcb-types (0.7.0-3) unstable; urgency=medium
  
    * Upload to unstable
diff --cc p/xmonad-contrib/debian/changelog
index 4dfeb96,ec44c34..a51108c
--- a/p/xmonad-contrib/debian/changelog
+++ b/p/xmonad-contrib/debian/changelog
@@@ -1,18 -1,12 +1,27 @@@
 +xmonad-contrib (0.11.4-2) experimental; urgency=medium
 +
 +  * Depend on old-{locale,time}
 +  * Bump standards-version to 3.9.6
 +  * Depend on haskell-devscripts >= 0.10 to ensure that this package
 +    builds against GHC in experimental
 +
 + -- Joachim Breitner <nomeata at debian.org>  Thu, 20 Aug 2015 10:29:15 +0200
 +
 +xmonad-contrib (0.11.4-1) unstable; urgency=medium
 +
 +  * New upstream release
 +
 + -- Joachim Breitner <nomeata at debian.org>  Sat, 15 Aug 2015 11:07:00 +0200
 +
+ xmonad-contrib (0.11.3-4) unstable; urgency=medium
+ 
+   * Add patch gnome-dbus-send-fix.patch: Fix invalid syntax when calling
+     dbus-send in XMonad.Config.Gnome. Closes: #780463.
+   * Add myself to uploaders.
+   * Bump Standards-Version to 3.9.6 (no changes).
+ 
+  -- Per Olofsson <pelle at debian.org>  Sat, 05 Sep 2015 11:39:38 +0200
+ 
  xmonad-contrib (0.11.3-3) unstable; urgency=medium
  
    * Upload to unstable
diff --cc p/xmonad/debian/changelog
index 681d18e,97564f4..c2842a4
--- a/p/xmonad/debian/changelog
+++ b/p/xmonad/debian/changelog
@@@ -1,11 -1,20 +1,28 @@@
 +xmonad (0.11.1-3) experimental; urgency=medium
 +
 +  * Bump standards-version to 3.9.6
 +  * Depend on haskell-devscripts >= 0.10 to ensure that this package
 +    builds against GHC in experimental
 +
 + -- Joachim Breitner <nomeata at debian.org>  Thu, 20 Aug 2015 10:29:15 +0200
 +
+ xmonad (0.11.1-3~1) unstable; urgency=medium
+ 
+   * Add X session "GNOME Flashback (Xmonad)". Closes: #772179.
+     - Add NEWS.Debian entry describing the change.
+     - Add instructions to README.Debian.
+     - Add lintian override for DesktopNames key in session desktop file.
+   * Add alternatives xmonad-session and gnome-flashback-xmonad to
+     x-session-manager. Closes: #681153.
+   * Bump Standards-Version to 3.9.6 (no changes).
+   * Add myself to Uploaders.
+   * Change distribution from UNRELEASED to unstable in old NEWS.Debian
+     entry.
+   * Reformat old NEWS.Debian entry to make it compliant and parsable.
+   * Suggest gnome-session-flashback
+ 
+  -- Per Olofsson <pelle at debian.org>  Sun, 06 Sep 2015 21:46:31 +0200
+ 
  xmonad (0.11.1-2) unstable; urgency=medium
  
    * New patch: Allow utf8-string-1

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