r31821 - in /desktop/unstable/aisleriot/debian: changelog control control.in copyright

jordi at users.alioth.debian.org jordi at users.alioth.debian.org
Thu Nov 24 18:33:36 UTC 2011


Author: jordi
Date: Thu Nov 24 18:33:35 2011
New Revision: 31821

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31821
Log:
* debian/control: Build-depends on yelp-tools
* debian/copyright: Fixed a few lintian warnings
* Fix FTBFS with -Werror=format-security. (LP: #890889)
  - Add 03_format-security.patch.
* Sync from Ubuntu.
* Watch for .xz tarballs.
* Bump to debhelper 8.
* Strip debian/tmp prefix from install paths.
* Don't autoreconf, we don't need it.
* Remove Conflicts/Replaces on self-package.
* Replace versioned Conflicts with Breaks.
* Drop obsolete 03_format-security.patch in favour of upstream fix.
* Use versioned copyright Format URL.

Modified:
    desktop/unstable/aisleriot/debian/changelog
    desktop/unstable/aisleriot/debian/control
    desktop/unstable/aisleriot/debian/control.in
    desktop/unstable/aisleriot/debian/copyright

Modified: desktop/unstable/aisleriot/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/aisleriot/debian/changelog?rev=31821&op=diff
==============================================================================
--- desktop/unstable/aisleriot/debian/changelog [utf-8] (original)
+++ desktop/unstable/aisleriot/debian/changelog [utf-8] Thu Nov 24 18:33:35 2011
@@ -1,56 +1,26 @@
 aisleriot (1:3.2.2-1) UNRELEASED; urgency=low
 
-  * Sync from Ubuntu.
-  * Watch for .xz tarballs.
-  * Bump to debhelper 8.
-  * Don't autoreconf, we don't need it.
-  * Replace versioned conflicts with breaks.
-
- -- Jordi Mallach <jordi at debian.org>  Tue, 22 Nov 2011 13:07:11 +0100
-
-aisleriot (1:3.2.2-0ubuntu1) precise; urgency=low
+  [ Jeremy Bicha ]
+  * Initial release (LP: #813428)
+    - Aisleriot is no longer shipped as part of gnome-games
+    - Re-enabled "Aunt Mary", a frustratingly difficult Klondike variation
+      (LP: #478558)
+  * debian/control: Build-depends on yelp-tools
+  * debian/copyright: Fixed a few lintian warnings
 
   [ Felix Geyer ]
   * Fix FTBFS with -Werror=format-security. (LP: #890889)
     - Add 03_format-security.patch.
 
-  [ Jeremy Bicha ]
-  * New upstream release
-    - Fix missing sound effects
+  [ Jordi Mallach ]
+  * Sync from Ubuntu.
+  * Watch for .xz tarballs.
+  * Bump to debhelper 8.
+  * Strip debian/tmp prefix from install paths.
+  * Don't autoreconf, we don't need it.
+  * Remove Conflicts/Replaces on self-package.
+  * Replace versioned Conflicts with Breaks.
+  * Drop obsolete 03_format-security.patch in favour of upstream fix.
+  * Use versioned copyright Format URL.
 
- -- Jeremy Bicha <jbicha at ubuntu.com>  Tue, 15 Nov 2011 21:50:30 -0500
-
-aisleriot (1:3.2.1-0ubuntu1) oneiric-proposed; urgency=low
-
-  * New upstream bugfix & translations release.
-    - Fix modality when Statistics & Congratulations dialogs are both
-      open (LP: #808291) 
-  * debian/click.ogg
-  * debian/splat.ogg
-  * debian/aisleriot.install
-    - Add missing sound effects (LP: #876365)
-
- -- Jeremy Bicha <jbicha at ubuntu.com>  Mon, 17 Oct 2011 14:56:50 -0400
-
-aisleriot (1:3.2.0-0ubuntu1) oneiric; urgency=low
-
-  * New upstream stable release.
-    - Distribute a copy of the LGPL
-    - Update card theme install info for Debian, Ubuntu & OpenSUSE
-    - Build help with yelp-tools instead of gnome-doc-utils
-    - Fix game restart
-    - Translation updates
-  * debian/control: Build-depends on yelp-tools
-  * debian/copyright: Fixed a few lintian warnings
-  * 03_update_theme_install_data.patch: Dropped, applied upstream
-
- -- Jeremy Bicha <jbicha at ubuntu.com>  Mon, 26 Sep 2011 12:54:22 -0400
-
-aisleriot (1:3.1.1-0ubuntu1) oneiric; urgency=low
-
-  * Initial release (LP: #813428)
-    - Aisleriot is no longer shipped as part of gnome-games
-    - Re-enabled "Aunt Mary", a frustratingly difficult Klondike variation
-      (LP: #478558)
-
- -- Jeremy Bicha <jbicha at ubuntu.com>  Tue, 16 Aug 2011 17:54:28 -0400
+ -- Jordi Mallach <jordi at debian.org>  Tue, 22 Nov 2011 13:07:11 +0100

Modified: desktop/unstable/aisleriot/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/aisleriot/debian/control?rev=31821&op=diff
==============================================================================
--- desktop/unstable/aisleriot/debian/control [utf-8] (original)
+++ desktop/unstable/aisleriot/debian/control [utf-8] Thu Nov 24 18:33:35 2011
@@ -35,7 +35,7 @@
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: gnome-cards-data
-Conflicts: gnome-games (<< 1:3.1.0), gnome-games-data (<< 1:3.1.0)
+Breaks: gnome-games (<< 1:3.1.0), gnome-games-data (<< 1:3.1.0)
 Replaces: gnome-games (<< 1:3.1.0), gnome-games-data (<< 1:3.1.0)
 Description: GNOME solitaire card game collection
  This is a collection of over eighty different solitaire card games, including
@@ -48,10 +48,8 @@
 Breaks: gnome-games-data (<< 1:3.1.0),
         gnome-games (<< 1:3.1.0),
         gnome-games-extra-data (<< 3.0),
-        gnome-cards-data (<< 1:3.1.0),
         gnome-hearts (<< 0.1.3-4)
-Replaces: gnome-games-extra-data (<< 3.0),
-          gnome-cards-data (<< 1:3.1.0)
+Replaces: gnome-games-extra-data (<< 3.0)
 Description: data files for the GNOME card games
  This package contains pictures of card decks used by the card-based 
  GNOME games. Different themes are provided.

Modified: desktop/unstable/aisleriot/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/aisleriot/debian/control.in?rev=31821&op=diff
==============================================================================
--- desktop/unstable/aisleriot/debian/control.in [utf-8] (original)
+++ desktop/unstable/aisleriot/debian/control.in [utf-8] Thu Nov 24 18:33:35 2011
@@ -30,7 +30,7 @@
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: gnome-cards-data
-Conflicts: gnome-games (<< 1:3.1.0), gnome-games-data (<< 1:3.1.0)
+Breaks: gnome-games (<< 1:3.1.0), gnome-games-data (<< 1:3.1.0)
 Replaces: gnome-games (<< 1:3.1.0), gnome-games-data (<< 1:3.1.0)
 Description: GNOME solitaire card game collection
  This is a collection of over eighty different solitaire card games, including
@@ -43,10 +43,8 @@
 Breaks: gnome-games-data (<< 1:3.1.0),
         gnome-games (<< 1:3.1.0),
         gnome-games-extra-data (<< 3.0),
-        gnome-cards-data (<< 1:3.1.0),
         gnome-hearts (<< 0.1.3-4)
-Replaces: gnome-games-extra-data (<< 3.0),
-          gnome-cards-data (<< 1:3.1.0)
+Replaces: gnome-games-extra-data (<< 3.0)
 Description: data files for the GNOME card games
  This package contains pictures of card decks used by the card-based 
  GNOME games. Different themes are provided.

Modified: desktop/unstable/aisleriot/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/aisleriot/debian/copyright?rev=31821&op=diff
==============================================================================
--- desktop/unstable/aisleriot/debian/copyright [utf-8] (original)
+++ desktop/unstable/aisleriot/debian/copyright [utf-8] Thu Nov 24 18:33:35 2011
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=207
 Upstream-Name: aisleriot
 Source: http://ftp.gnome.org/pub/GNOME/sources/aisleriot/
 




More information about the pkg-gnome-commits mailing list