r31823 - in /desktop/unstable/gnome-games/debian: changelog control control.in copyright

[jordi at users.alioth.debian.org]

Author: jordi
Date: Thu Nov 24 19:26:24 2011
New Revision: 31823

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31823
Log:
* Replace versioned conflicts with breaks.
* Remove aisleriot bits from copyright file.

Modified:
    desktop/unstable/gnome-games/debian/changelog
    desktop/unstable/gnome-games/debian/control
    desktop/unstable/gnome-games/debian/control.in
    desktop/unstable/gnome-games/debian/copyright

Modified: desktop/unstable/gnome-games/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-games/debian/changelog?rev=31823&op=diff
==============================================================================
--- desktop/unstable/gnome-games/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-games/debian/changelog [utf-8] Thu Nov 24 19:26:24 2011
@@ -1,4 +1,4 @@
-gnome-games (1:3.2.1-1) UNRELEASED; urgency=low
+gnome-games (1:3.2.1-1) unstable; urgency=low
 
   [ Jeremy Bicha ]
   * New upstream stable release.
@@ -19,6 +19,8 @@
     - debian/patches/90_fix-sudoku-borders.patch: Bugzilla patch to
       fix missing borders in Sudoku (LP: #844385).
   * Tighten aisleriot dependency to >= ${gnome:Version}.
+  * Replace versioned conflicts with breaks.
+  * Remove aisleriot bits from copyright file.
 
  -- Jordi Mallach <jordi at debian.org>  Thu, 24 Nov 2011 19:47:53 +0100
 

Modified: desktop/unstable/gnome-games/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-games/debian/control?rev=31823&op=diff
==============================================================================
--- desktop/unstable/gnome-games/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-games/debian/control [utf-8] Thu Nov 24 19:26:24 2011
@@ -256,7 +256,7 @@
 Architecture: all
 Depends: ${misc:Depends},
          librsvg2-common
-Conflicts: gnome-games (<= 1:2.10.1-2),
+Breaks: gnome-games (<= 1:2.10.1-2),
            gnome-icon-theme (<< 2.14)
 Replaces: gnome-card-games,
           gnome-games-locale

Modified: desktop/unstable/gnome-games/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-games/debian/control.in?rev=31823&op=diff
==============================================================================
--- desktop/unstable/gnome-games/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-games/debian/control.in [utf-8] Thu Nov 24 19:26:24 2011
@@ -251,7 +251,7 @@
 Architecture: all
 Depends: ${misc:Depends},
          librsvg2-common
-Conflicts: gnome-games (<= 1:2.10.1-2),
+Breaks: gnome-games (<= 1:2.10.1-2),
            gnome-icon-theme (<< 2.14)
 Replaces: gnome-card-games,
           gnome-games-locale

Modified: desktop/unstable/gnome-games/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-games/debian/copyright?rev=31823&op=diff
==============================================================================
--- desktop/unstable/gnome-games/debian/copyright [utf-8] (original)
+++ desktop/unstable/gnome-games/debian/copyright [utf-8] Thu Nov 24 19:26:24 2011
@@ -56,13 +56,6 @@
  Copyright 2008 Thomas H.P. Andersen
 License: LGPL-3+ | LGPL-2+ | GPL-2+
 
-Files: aisleriot/*
-Copyright: Copyright 1998, 2001, 2003, 2006 Jonathan Blandford
- Copyright 2002, 2004 Anders Carlsson
- Copyright 2007 Christian Persc
- Copyright 2008 Neil Roberts
-License: GPL-3+
-
 License: LGPL-2+
     This package is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public