xmonad: convert 'debian/copyright' to dep5 format

5 files changed, 126 insertions, 101 deletions

diff --git a/p/xmonad/debian/changelog b/p/xmonad/debian/changelog
index 97dfa4b86..c53e2d149 100644
--- a/p/xmonad/debian/changelog
+++ b/p/xmonad/debian/changelog
@@ -1,3 +1,9 @@
+xmonad (0.12-3) UNRELEASED; urgency=medium
+
+  * Convert 'debian/copyright' to dep5 format
+
+ -- Dmitry Bogatov <KAction@gnu.org>  Mon, 09 May 2016 12:38:29 +0300
+
 xmonad (0.12-2) unstable; urgency=medium
 
   * Make sure it builds with dpkg-buildpackage -A
diff --git a/p/xmonad/debian/control b/p/xmonad/debian/control
index 939a1a524..6dbaba144 100644
--- a/p/xmonad/debian/control
+++ b/p/xmonad/debian/control
@@ -1,40 +1,44 @@
 Source: xmonad
 Maintainer: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
-Uploaders: Joachim Breitner <nomeata@debian.org>, Ryan Kavanagh <rak@debian.org>, Louis Bettens <louis@bettens.info>, Per Olofsson <pelle@debian.org>
+Uploaders: Joachim Breitner <nomeata@debian.org>,
+           Ryan Kavanagh <rak@debian.org>,
+           Louis Bettens <louis@bettens.info>,
+           Per Olofsson <pelle@debian.org>,
+           Dmitry Bogatov <KAction@gnu.org>
 Priority: extra
 Section: haskell
-Build-Depends: debhelper (>= 9),
- haskell-devscripts (>= 0.10),
- cdbs,
- ghc,
- ghc-prof,
- libx11-dev,
- libxinerama-dev,
- 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: cdbs,
+               debhelper (>= 9),
+               ghc,
+               ghc-prof,
+               haskell-devscripts (>= 0.10),
+               libghc-data-default-dev,
+               libghc-data-default-prof,
+               libghc-extensible-exceptions-dev,
+               libghc-extensible-exceptions-prof,
+               libghc-mtl-dev,
+               libghc-mtl-prof,
+               libghc-pandoc-dev (>= 1.10),
+               libghc-regex-posix-dev,
+               libghc-setlocale-dev,
+               libghc-setlocale-prof,
+               libghc-utf8-string-dev (<< 1.1),
+               libghc-utf8-string-dev (>= 0.3),
+               libghc-utf8-string-prof,
+               libghc-x11-dev,
+               libghc-x11-dev (<< 1.7),
+               libghc-x11-dev (>= 1.5),
+               libghc-x11-prof,
+               libx11-dev,
+               libxinerama-dev,
+               pandoc-data
 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,
+                     libghc-data-default-doc,
+                     libghc-extensible-exceptions-doc,
+                     libghc-mtl-doc,
+                     libghc-setlocale-doc,
+                     libghc-utf8-string-doc,
+                     libghc-x11-doc
 Standards-Version: 3.9.6
 Homepage: http://xmonad.org
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git/
@@ -43,17 +47,12 @@ Vcs-Git: git://git.debian.org/git/pkg-haskell/DHG_packages.git
 Package: xmonad
 Architecture: any
 Section: x11
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- x11-utils,
-Recommends: libghc-xmonad-dev,
- libghc-xmonad-doc,
- xfonts-base,
-Suggests: dmenu,
- gnome-session-flashback,
-Conflicts: xmonad-rebuild,
-Provides: x-window-manager,
-Replaces: xmonad-rebuild,
+Depends: x11-utils, ${misc:Depends}, ${shlibs:Depends}
+Recommends: libghc-xmonad-dev, libghc-xmonad-doc, xfonts-base
+Suggests: dmenu, gnome-session-flashback
+Conflicts: xmonad-rebuild
+Provides: x-window-manager
+Replaces: xmonad-rebuild
 Description: Lightweight X11 window manager written in Haskell
  Xmonad is a minimalist tiling window manager for X, written in
  Haskell.  Windows are managed using automatic layout algorithms,
@@ -73,15 +72,14 @@ Description: Lightweight X11 window manager written in Haskell
 
 Package: libghc-xmonad-dev
 Architecture: any
-Depends: ${haskell:Depends},
- ${shlibs:Depends},
- ${misc:Depends},
- libx11-dev,
- libxinerama-dev,
-Recommends: ${haskell:Recommends},
- libghc-xmonad-contrib-dev,
-Suggests: ${haskell:Suggests},
-Provides: ${haskell:Provides},
+Depends: libx11-dev,
+         libxinerama-dev,
+         ${haskell:Depends},
+         ${misc:Depends},
+         ${shlibs:Depends}
+Recommends: libghc-xmonad-contrib-dev, ${haskell:Recommends}
+Suggests: ${haskell:Suggests}
+Provides: ${haskell:Provides}
 Description: Lightweight X11 window manager${haskell:ShortBlurb}
  Xmonad is a minimalist tiling window manager for X, written in
  Haskell.  Windows are managed using automatic layout algorithms,
@@ -101,10 +99,9 @@ Description: Lightweight X11 window manager${haskell:ShortBlurb}
 
 Package: libghc-xmonad-prof
 Architecture: any
-Depends: ${haskell:Depends},
- ${misc:Depends},
-Suggests: ${haskell:Suggests},
-Provides: ${haskell:Provides},
+Depends: ${haskell:Depends}, ${misc:Depends}
+Suggests: ${haskell:Suggests}
+Provides: ${haskell:Provides}
 Description: Lightweight X11 window manager${haskell:ShortBlurb}
  Xmonad is a minimalist tiling window manager for X, written in
  Haskell.  Windows are managed using automatic layout algorithms,
@@ -125,12 +122,9 @@ Description: Lightweight X11 window manager${haskell:ShortBlurb}
 Package: libghc-xmonad-doc
 Architecture: all
 Section: doc
-Depends: ${haskell:Depends},
- ${shlibs:Depends},
- ${misc:Depends},
-Recommends: ${haskell:Recommends},
- libghc-xmonad-contrib-doc,
-Suggests: ${haskell:Suggests},
+Depends: ${haskell:Depends}, ${misc:Depends}, ${shlibs:Depends}
+Recommends: libghc-xmonad-contrib-doc, ${haskell:Recommends}
+Suggests: ${haskell:Suggests}
 Description: Lightweight X11 window manager${haskell:ShortBlurb}
  Xmonad is a minimalist tiling window manager for X, written in
  Haskell.  Windows are managed using automatic layout algorithms,
diff --git a/p/xmonad/debian/copyright b/p/xmonad/debian/copyright
index 093c6aad1..53515e675 100644
--- a/p/xmonad/debian/copyright
+++ b/p/xmonad/debian/copyright
@@ -1,39 +1,64 @@
-This package was debianised by Joachim Breitner <nomeata@debian.org>
-10 Oct 2007. The packaging distributed under the same license as xmonad itself.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: xmonad
+Upstream-Contact: xmonad@haskell.org
+Source: https://hackage.haskell.org/package/xmonad
 
-Upstream Author: Spencer Janssen
+Files: *
+License: BSD3
+Copyright: 2007-2008 Spencer Janssen
+           2007-2008 Don Stewart
 
-Copyright (c) 2007,2008 Spencer Janssen
-Copyright (c) 2007,2008 Don Stewart
+Comment: File says vague 'GPL', GPL-2+ is guess. Upstream is mailed about it.
+Files: util/GenerateManpage.hs
+License: GPL-2+
+Copyright: 2007-2008 Spencer Janssen
+           2007-2008 Don Stewart
 
-All rights reserved.
+Files: debian/*
+Copyright: held by the contributors mentioned in debian/changelog
+License: BSD3
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+License: BSD3
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ .
+ 3. Neither the name of the author nor the names of his contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
 
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the author nor the names of his contributors
-   may be used to endorse or promote products derived from this software
-   without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-xmonad can be found on http://xmonad.org/ and
-http://hackage.haskell.org/cgi-bin/hackage-scripts/package/xmonad
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
diff --git a/p/xmonad/debian/xmonad.install b/p/xmonad/debian/xmonad.install
index e1317c1ca..4ede8c248 100644
--- a/p/xmonad/debian/xmonad.install
+++ b/p/xmonad/debian/xmonad.install
@@ -1,7 +1,7 @@
+debian/gnome-flashback-xmonad /usr/bin
+debian/gnome-flashback-xmonad.session /usr/share/gnome-session/sessions
 debian/xmonad-session /usr/bin
 debian/xmonad.desktop /usr/share/applications
 debian/xmonad.png /usr/share/icons
-debian/xsessions/xmonad.desktop /usr/share/xsessions
 debian/xsessions/gnome-flashback-xmonad.desktop /usr/share/xsessions
-debian/gnome-flashback-xmonad.session /usr/share/gnome-session/sessions
-debian/gnome-flashback-xmonad /usr/bin
+debian/xsessions/xmonad.desktop /usr/share/xsessions
diff --git a/p/xmonad/debian/xmonad.manpages b/p/xmonad/debian/xmonad.manpages
index 4a3d7be1e..3b0dac167 100644
--- a/p/xmonad/debian/xmonad.manpages
+++ b/p/xmonad/debian/xmonad.manpages
@@ -1,3 +1,3 @@
-man/xmonad.1
-debian/xmonad-session.1
 debian/gnome-flashback-xmonad.1
+debian/xmonad-session.1
+man/xmonad.1