r35831 - in /desktop/experimental/gnome-games/debian: ./ patches/

jbicha-guest at users.alioth.debian.org jbicha-guest at users.alioth.debian.org
Fri Sep 28 04:15:46 UTC 2012 

Author: jbicha-guest
Date: Fri Sep 28 04:15:45 2012
New Revision: 35831

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35831
Log:
* New upstream release
* Merge with Ubuntu
* Rename mahjongg to gnome-mahjongg to match upstream change
* debian/control.in:
  - Recommend yelp
  - Don't build-depend on dh-autoreconf, gnome-common, or 
    gobject-introspection
* debian/rules:
  - Don't run autoreconf
  - Use multiarch location for libraries
* Drop all patches, applied in new version

Added:
    desktop/experimental/gnome-games/debian/gnome-mahjongg.install
      - copied, changed from r35830, desktop/experimental/gnome-games/debian/mahjongg.install
Removed:
    desktop/experimental/gnome-games/debian/mahjongg.install
    desktop/experimental/gnome-games/debian/patches/01_swell-foop-setgid.patch
    desktop/experimental/gnome-games/debian/patches/02_swell-foop-datadir.patch
    desktop/experimental/gnome-games/debian/patches/91_fix-gnuchess6-compatibility.patch
    desktop/experimental/gnome-games/debian/patches/91_glchess_engine.patch
Modified:
    desktop/experimental/gnome-games/debian/changelog
    desktop/experimental/gnome-games/debian/control
    desktop/experimental/gnome-games/debian/control.in
    desktop/experimental/gnome-games/debian/gnotravex.install
    desktop/experimental/gnome-games/debian/patches/series
    desktop/experimental/gnome-games/debian/rules

Modified: desktop/experimental/gnome-games/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-games/debian/changelog?rev=35831&op=diff
==============================================================================
--- desktop/experimental/gnome-games/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-games/debian/changelog [utf-8] Fri Sep 28 04:15:45 2012
@@ -1,8 +1,18 @@
-gnome-games (1:3.4.2-4) UNRELEASED; urgency=low
-
-  * debian/control.in: Recommend yelp
-
- -- Jeremy Bicha <jbicha at ubuntu.com>  05 Aug 2012 23:53:41 +0200
+gnome-games (1:3.6.0.2-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * Merge with Ubuntu
+  * Rename mahjongg to gnome-mahjongg to match upstream change
+  * debian/control.in:
+    - Recommend yelp
+    - Don't build-depend on dh-autoreconf, gnome-common, or 
+      gobject-introspection
+  * debian/rules:
+    - Don't run autoreconf
+    - Use multiarch location for libraries
+  * Drop all patches, applied in new version
+
+ -- Jeremy Bicha <jbicha at ubuntu.com>  Thu, 27 Sep 2012 23:54:52 -0400
 
 gnome-games (1:3.4.2-3) unstable; urgency=medium
 

Modified: desktop/experimental/gnome-games/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-games/debian/control?rev=35831&op=diff
==============================================================================
--- desktop/experimental/gnome-games/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-games/debian/control [utf-8] Fri Sep 28 04:15:45 2012
@@ -2,15 +2,13 @@
 # 
 # Modifications should be made to debian/control.in instead.
 # This file is regenerated automatically in the clean target.
-
 Source: gnome-games
 Section: gnome
 Priority: optional
 Maintainer: Josselin Mouette <joss at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Jordi Mallach <jordi at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Jeremy Bicha <jbicha at ubuntu.com>, Jordi Mallach <jordi at debian.org>, Michael Biebl <biebl at debian.org>
 Build-Depends: cdbs (>= 0.4.90~),
                debhelper (>= 8),
-               dh-autoreconf,
                gnome-pkg-tools (>= 0.6),
                pkg-config (>= 0.15),
                python (>= 2.6.6-3~),
@@ -30,8 +28,6 @@
                libclutter-gtk-1.0-dev (>= 0.91.6),
                libsm-dev,
                libice-dev,
-               gobject-introspection,
-               gnome-common,
                intltool (>= 0.35.0),
                docbook-xml,
                docbook-xsl
@@ -49,6 +45,7 @@
          gnect (>= ${source:Version}),
          gnibbles (>= ${source:Version}),
          gnobots2 (>= ${source:Version}),
+         gnome-mahjongg (>= ${source:Version}),
          gnome-sudoku (>= ${source:Version}),
          gnomine (>= ${source:Version}),
          gnotravex (>= ${source:Version}),
@@ -56,7 +53,6 @@
          gtali (>= ${source:Version}),
          iagno (>= ${source:Version}),
          lightsoff (>= ${source:Version}),
-         mahjongg (>= ${source:Version}),
          quadrapassel (>= ${source:Version}),
          swell-foop (>= ${source:Version})
 Recommends: aisleriot (>= ${gnome:Version})
@@ -137,6 +133,27 @@
  robots which are, for no adequately explained reason, trying to kill 
  you. It is based on the text-based robots game which can be found on a 
  number of UNIX systems.
+
+Package: gnome-mahjongg
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         gnome-games-data (= ${source:Version})
+Breaks: gnome-games (<< 1:3.0.2),
+        gnome-games-data (<< 1:3.0.2),
+        mahjongg (<< 1:3.6.0)
+Replaces: gnome-games (<< 1:3.0.2),
+          gnome-games-data (<< 1:3.0.2),
+          mahjongg (<< 1:3.6.0)
+Recommends: gnome-games-extra-data
+Description: classic Eastern tile game for GNOME
+ This is a solitaire (one player) version of the classic Eastern tile 
+ game, Mahjongg.
+ .
+ You start with five levels of tiles which are stacked so some are 
+ covered up by the tiles on top. The object of Mahjongg is to remove all 
+ the tiles from the game, by finding matching pairs which look alike.
 
 Package: gnome-sudoku
 Architecture: all
@@ -236,21 +253,15 @@
  Puzzle where all lights have to be switched off.
 
 Package: mahjongg
-Architecture: any
-Section: games
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         gnome-games-data (= ${source:Version})
-Breaks: gnome-games (<< 1:3.0.2), gnome-games-data (<< 1:3.0.2)
-Replaces: gnome-games (<< 1:3.0.2), gnome-games-data (<< 1:3.0.2)
-Recommends: gnome-games-extra-data
-Description: classic Eastern tile game for GNOME
- This is a solitaire (one player) version of the classic Eastern tile 
- game, Mahjongg.
- .
- You start with five levels of tiles which are stacked so some are 
- covered up by the tiles on top. The object of Mahjongg is to remove all 
- the tiles from the game, by finding matching pairs which look alike.
+Architecture: all
+Section: oldlibs
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         gnome-games-data (= ${source:Version}),
+         gnome-mahjongg
+Description: classic Eastern tile game for GNOME (transitional package)
+ This is a transitional package to ease upgrades to gnome-mahjongg. It can be
+ safely removed.
 
 Package: quadrapassel
 Architecture: any

Modified: desktop/experimental/gnome-games/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-games/debian/control.in?rev=35831&op=diff
==============================================================================
--- desktop/experimental/gnome-games/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-games/debian/control.in [utf-8] Fri Sep 28 04:15:45 2012
@@ -5,7 +5,6 @@
 Uploaders: @GNOME_TEAM@
 Build-Depends: cdbs (>= 0.4.90~),
                debhelper (>= 8),
-               dh-autoreconf,
                gnome-pkg-tools (>= 0.6),
                pkg-config (>= 0.15),
                python (>= 2.6.6-3~),
@@ -25,8 +24,6 @@
                libclutter-gtk-1.0-dev (>= 0.91.6),
                libsm-dev,
                libice-dev,
-               gobject-introspection,
-               gnome-common,
                intltool (>= 0.35.0),
                docbook-xml,
                docbook-xsl
@@ -44,6 +41,7 @@
          gnect (>= ${source:Version}),
          gnibbles (>= ${source:Version}),
          gnobots2 (>= ${source:Version}),
+         gnome-mahjongg (>= ${source:Version}),
          gnome-sudoku (>= ${source:Version}),
          gnomine (>= ${source:Version}),
          gnotravex (>= ${source:Version}),
@@ -51,7 +49,6 @@
          gtali (>= ${source:Version}),
          iagno (>= ${source:Version}),
          lightsoff (>= ${source:Version}),
-         mahjongg (>= ${source:Version}),
          quadrapassel (>= ${source:Version}),
          swell-foop (>= ${source:Version})
 Recommends: aisleriot (>= ${gnome:Version})
@@ -132,6 +129,27 @@
  robots which are, for no adequately explained reason, trying to kill 
  you. It is based on the text-based robots game which can be found on a 
  number of UNIX systems.
+
+Package: gnome-mahjongg
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         gnome-games-data (= ${source:Version})
+Breaks: gnome-games (<< 1:3.0.2),
+        gnome-games-data (<< 1:3.0.2),
+        mahjongg (<< 1:3.6.0)
+Replaces: gnome-games (<< 1:3.0.2),
+          gnome-games-data (<< 1:3.0.2),
+          mahjongg (<< 1:3.6.0)
+Recommends: gnome-games-extra-data
+Description: classic Eastern tile game for GNOME
+ This is a solitaire (one player) version of the classic Eastern tile 
+ game, Mahjongg.
+ .
+ You start with five levels of tiles which are stacked so some are 
+ covered up by the tiles on top. The object of Mahjongg is to remove all 
+ the tiles from the game, by finding matching pairs which look alike.
 
 Package: gnome-sudoku
 Architecture: all
@@ -231,21 +249,15 @@
  Puzzle where all lights have to be switched off.
 
 Package: mahjongg
-Architecture: any
-Section: games
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         gnome-games-data (= ${source:Version})
-Breaks: gnome-games (<< 1:3.0.2), gnome-games-data (<< 1:3.0.2)
-Replaces: gnome-games (<< 1:3.0.2), gnome-games-data (<< 1:3.0.2)
-Recommends: gnome-games-extra-data
-Description: classic Eastern tile game for GNOME
- This is a solitaire (one player) version of the classic Eastern tile 
- game, Mahjongg.
- .
- You start with five levels of tiles which are stacked so some are 
- covered up by the tiles on top. The object of Mahjongg is to remove all 
- the tiles from the game, by finding matching pairs which look alike.
+Architecture: all
+Section: oldlibs
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         gnome-games-data (= ${source:Version}),
+         gnome-mahjongg
+Description: classic Eastern tile game for GNOME (transitional package)
+ This is a transitional package to ease upgrades to gnome-mahjongg. It can be
+ safely removed.
 
 Package: quadrapassel
 Architecture: any

Copied: desktop/experimental/gnome-games/debian/gnome-mahjongg.install (from r35830, desktop/experimental/gnome-games/debian/mahjongg.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-games/debian/gnome-mahjongg.install?rev=35831&op=diff
==============================================================================
--- desktop/experimental/gnome-games/debian/mahjongg.install [utf-8] (original)
+++ desktop/experimental/gnome-games/debian/gnome-mahjongg.install [utf-8] Fri Sep 28 04:15:45 2012
@@ -1,7 +1,7 @@
-usr/games/mahjongg
-usr/share/mahjongg
-usr/share/applications/mahjongg.desktop
-usr/share/help/*/mahjongg
-usr/share/icons/hicolor/*/*/mahjongg.*
-usr/share/man/man6/mahjongg.6
-usr/share/glib-2.0/schemas/org.gnome.mahjongg.gschema.xml
+usr/games/gnome-mahjongg
+usr/share/applications/gnome-mahjongg.desktop
+usr/share/gnome-mahjongg
+usr/share/help/*/gnome-mahjongg
+usr/share/icons/hicolor/*/*/gnome-mahjongg.*
+usr/share/man/man6/gnome-mahjongg.6
+usr/share/glib-2.0/schemas/org.gnome.gnome-mahjongg.gschema.xml

Modified: desktop/experimental/gnome-games/debian/gnotravex.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-games/debian/gnotravex.install?rev=35831&op=diff
==============================================================================
--- desktop/experimental/gnome-games/debian/gnotravex.install [utf-8] (original)
+++ desktop/experimental/gnome-games/debian/gnotravex.install [utf-8] Fri Sep 28 04:15:45 2012
@@ -1,6 +1,6 @@
 usr/games/gnotravex
+usr/share/applications/gnotravex.desktop
 usr/share/gnotravex
-usr/share/applications/gnotravex.desktop
 usr/share/help/*/gnotravex
 usr/share/icons/hicolor/*/*/gnotravex.*
 usr/share/man/man6/gnotravex.6

Modified: desktop/experimental/gnome-games/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-games/debian/patches/series?rev=35831&op=diff
==============================================================================
--- desktop/experimental/gnome-games/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-games/debian/patches/series [utf-8] Fri Sep 28 04:15:45 2012
@@ -1,4 +1,0 @@
-01_swell-foop-setgid.patch
-02_swell-foop-datadir.patch
-91_fix-gnuchess6-compatibility.patch
-91_glchess_engine.patch

Modified: desktop/experimental/gnome-games/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-games/debian/rules?rev=35831&op=diff
==============================================================================
--- desktop/experimental/gnome-games/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-games/debian/rules [utf-8] Fri Sep 28 04:15:45 2012
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 # -*- mode: makefile; coding: utf-8 -*-
 
-include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/utils.mk
@@ -11,6 +10,7 @@
 
 DEB_CONFIGURE_EXTRA_FLAGS := \
 		--bindir=\$${prefix}/games \
+		--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
 		--disable-scrollkeeper \
 		--disable-introspection

More information about the pkg-gnome-commits mailing list