gnome3-team team mailing list archive
-
gnome3-team team
-
Mailing list archive
-
Message #00297
[Merge] lp:~jbicha/gnome-games/gnome-games-3 into lp:~gnome3-team/gnome-games/ubuntu
Jeremy Bicha has proposed merging lp:~jbicha/gnome-games/gnome-games-3 into lp:~gnome3-team/gnome-games/ubuntu.
Requested reviews:
GNOME3 Team (gnome3-team)
For more details, see:
https://code.launchpad.net/~jbicha/gnome-games/gnome-games-3/+merge/61512
--
https://code.launchpad.net/~jbicha/gnome-games/gnome-games-3/+merge/61512
Your team GNOME3 Team is requested to review the proposed merge of lp:~jbicha/gnome-games/gnome-games-3 into lp:~gnome3-team/gnome-games/ubuntu.
=== modified file 'debian/changelog'
--- debian/changelog 2011-04-06 11:20:40 +0000
+++ debian/changelog 2011-05-19 07:41:24 +0000
@@ -1,3 +1,20 @@
+gnome-games (1:3.0.1.1-1ubuntu1~build1) natty; urgency=low
+
+ * New upstream release, merged in some Debian experimental packaging
+ - Re-enabled swell-foop & lightsoff, but not sudoku
+ - Updated build-dependencies
+ * debian/control
+ - Switch to dh_python2
+ - Dropped python-gtk2, dpkg-dev dependencies
+ * debian/rules
+ - Removed obsolete TLS configure flag
+ * debian/patches/00git_private_typelib.patch
+ - Dropped, applied upstream
+ * debian/patches/80_change_tetris_theme.patch
+ - Dropped, Tetris has a new default theme anyway
+
+ -- Jeremy Bicha <jeremy@xxxxxxxxx> Thu, 19 May 2011 00:01:15 -0400
+
gnome-games (1:3.0.0-0ubuntu1~build1) natty; urgency=low
* New upstream release
=== modified file 'debian/control'
--- debian/control 2011-02-24 03:26:28 +0000
+++ debian/control 2011-05-19 07:41:24 +0000
@@ -9,41 +9,40 @@
Maintainer: Ubuntu Desktop Team <ubuntu-desktop@xxxxxxxxxxxxxxxx>
XSBC-Original-Maintainer: Josselin Mouette <joss@xxxxxxxxxx>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@xxxxxxxxxxxxxxxxxxxxxxx>
-Build-Depends: cdbs,
+Build-Depends: cdbs (>= 0.4.90~),
debhelper (>= 5),
gnome-pkg-tools (>= 0.6),
- dpkg-dev (>= 1.13.19),
- dh-autoreconf,
- gnome-common,
- python-support (>= 0.3),
- valac (>= 0.11.6),
- pkg-config (>= 0.15),
gnome-doc-utils (>= 0.10.0),
gconf2,
- rarian-compat,
- python (>= 2.5),
- python-gtk2-dev (>= 2.14.0),
+ guile-1.8-dev,
+ intltool (>= 0.35.0),
+ libcairo2-dev (>= 1.0),
libcanberra-gtk3-dev (>= 0.26),
- libglib2.0-dev (>= 2.14.0),
- libgtk-3-dev (>= 2.91.1),
- libgconf2-dev (>= 2.31.1),
- libcairo2-dev (>= 1.0),
- librsvg2-dev (>= 2.32.0),
libclutter-1.0-dev (>= 1.0.0),
libclutter-gtk-1.0-dev (>= 0.91.6),
+ gobject-introspection (>= 0.6.3),
+ libgirepository1.0-dev (>= 0.6.3),
+ libgconf2-dev,
+ libglib2.0-dev (>= 2.25.7),
+ libgtk-3-dev (>= 3.0.0),
+ libglu1-mesa-dev,
+ libgstreamer0.10-dev (>= 0.10.11),
+ librsvg2-dev (>= 2.32.0),
+ libice-dev,
libsm-dev,
- libgl1-mesa-dev,
- libglu1-mesa-dev,
libsqlite3-dev,
- gobject-introspection (>= 0.6.3),
- libgirepository1.0-dev (>= 0.6.3),
+ pkg-config (>= 0.15),
+ valac-0.12,
+ dh-autoreconf,
+ gnome-common,
+ python (>= 2.6.6-3~),
check,
intltool (>= 0.35.0),
guile-1.8-dev,
liblaunchpad-integration-3.0-dev (>= 0.1.51)
Vcs-Bzr: https://code.launchpad.net/~gnome3-team/gnome-games/ubuntu
-Standards-Version: 3.9.1
-Homepage: http://www.gnome.org/projects/gnome-games/
+Standards-Version: 3.9.2
+Homepage: http://live.gnome.org/GnomeGames
Package: gnome-games
Architecture: all
@@ -61,9 +60,9 @@
gnotski,
gtali,
iagno,
-# lightsoff,
- quadrapassel
-# swell-foop
+ lightsoff,
+ quadrapassel,
+ swell-foop
Suggests: gnome-hearts
Description: games for the GNOME desktop
These are the games from the official GNOME release. They have the look and
@@ -165,7 +164,6 @@
#Depends: ${misc:Depends}, ${shlibs:Depends},
# ${python:Depends},
# gnome-games-common (>= ${source:Version}),
-# python-gtk2 (>= 2.10.0),
# python-launchpad-integration
#Conflicts: gnome-games (<< 1:2.27.5-0ubuntu2), gnome-games-data (<< 1:2.27.5-0ubuntu2)
#Replaces: gnome-games (<< 1:2.27.5-0ubuntu2), gnome-games-data (<< 1:2.27.5-0ubuntu2)
@@ -220,33 +218,33 @@
Description: Tile flipping strategy game
Flip over your opponents tiles and control the board.
-#Package: lightsoff
-#Architecture: any
-#Depends: ${misc:Depends}, ${shlibs:Depends},
-# gnome-games-common (>= ${source:Version}),
-# seed,
-# gir1.0-glib-2.0 (>= 0.6.3),
-# gir1.0-gtk-2.0 (>= 0.6.3),
-# gir1.0-gconf-2.0 (>= 0.6.3),
-# gir1.0-clutter-1.0,
-# gir1.0-clutter-gtk-1.0
-#Description: Light puzzle game
-# Puzzle where all lights have to be switched off.
+Package: lightsoff
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends},
+ gnome-games-common (>= ${source:Version}),
+ seed,
+ gir1.2-glib-2.0 (>= 0.6.3),
+ gir1.2-gtk-3.0 (>= 0.6.3),
+ gir1.2-gconf-2.0 (>= 0.6.3),
+ gir1.2-clutter-1.0,
+ gir1.2-gtkclutter-1.0
+Description: Light puzzle game
+ Puzzle where all lights have to be switched off.
-#Package: swell-foop
-#Architecture: any
-#Depends: ${misc:Depends}, ${shlibs:Depends},
-# gnome-games-common (>= ${source:Version}),
-# seed,
-# gir1.0-glib-2.0 (>= 0.6.3),
-# gir1.0-gtk-2.0 (>= 0.6.3),
-# gir1.0-clutter-1.0,
-# gir1.0-clutter-gtk-1.0
-#Conflicts: gnome-games (<< 1:2.27.5-0ubuntu2), gnome-games-data (<< 1:2.27.5-0ubuntu2), same-gnome
-#Replaces: gnome-games (<< 1:2.27.5-0ubuntu2), gnome-games-data (<< 1:2.27.5-0ubuntu2), same-gnome
-#Description: Colored ball puzzle game
-# Remove blocks of balls of the same color in as few moves as possible. Try to
-# remove all balls for a bonus.
+Package: swell-foop
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends},
+ gnome-games-common (>= ${source:Version}),
+ seed,
+ gir1.2-glib-2.0 (>= 0.6.3),
+ gir1.2-gtk-2.0 (>= 0.6.3),
+ gir1.2-clutter-1.0,
+ gir1.2-gtkclutter-1.0
+Conflicts: gnome-games (<< 1:2.27.5-0ubuntu2), gnome-games-data (<< 1:2.27.5-0ubuntu2), same-gnome
+Replaces: gnome-games (<< 1:2.27.5-0ubuntu2), gnome-games-data (<< 1:2.27.5-0ubuntu2), same-gnome
+Description: Colored ball puzzle game
+ Remove blocks of balls of the same color in as few moves as possible. Try to
+ remove all balls for a bonus.
Package: quadrapassel
Architecture: any
=== modified file 'debian/control.in'
--- debian/control.in 2011-02-24 03:26:28 +0000
+++ debian/control.in 2011-05-19 07:41:24 +0000
@@ -4,41 +4,40 @@
Maintainer: Ubuntu Desktop Team <ubuntu-desktop@xxxxxxxxxxxxxxxx>
XSBC-Original-Maintainer: Josselin Mouette <joss@xxxxxxxxxx>
Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs,
+Build-Depends: cdbs (>= 0.4.90~),
debhelper (>= 5),
gnome-pkg-tools (>= 0.6),
- dpkg-dev (>= 1.13.19),
- dh-autoreconf,
- gnome-common,
- python-support (>= 0.3),
- valac (>= 0.11.6),
- pkg-config (>= 0.15),
gnome-doc-utils (>= 0.10.0),
gconf2,
- rarian-compat,
- python (>= 2.5),
- python-gtk2-dev (>= 2.14.0),
+ guile-1.8-dev,
+ intltool (>= 0.35.0),
+ libcairo2-dev (>= 1.0),
libcanberra-gtk3-dev (>= 0.26),
- libglib2.0-dev (>= 2.14.0),
- libgtk-3-dev (>= 2.91.1),
- libgconf2-dev (>= 2.31.1),
- libcairo2-dev (>= 1.0),
- librsvg2-dev (>= 2.32.0),
libclutter-1.0-dev (>= 1.0.0),
libclutter-gtk-1.0-dev (>= 0.91.6),
+ gobject-introspection (>= 0.6.3),
+ libgirepository1.0-dev (>= 0.6.3),
+ libgconf2-dev,
+ libglib2.0-dev (>= 2.25.7),
+ libgtk-3-dev (>= 3.0.0),
+ libglu1-mesa-dev,
+ libgstreamer0.10-dev (>= 0.10.11),
+ librsvg2-dev (>= 2.32.0),
+ libice-dev,
libsm-dev,
- libgl1-mesa-dev,
- libglu1-mesa-dev,
libsqlite3-dev,
- gobject-introspection (>= 0.6.3),
- libgirepository1.0-dev (>= 0.6.3),
+ pkg-config (>= 0.15),
+ valac-0.12,
+ dh-autoreconf,
+ gnome-common,
+ python (>= 2.6.6-3~),
check,
intltool (>= 0.35.0),
guile-1.8-dev,
liblaunchpad-integration-3.0-dev (>= 0.1.51)
Vcs-Bzr: https://code.launchpad.net/~gnome3-team/gnome-games/ubuntu
-Standards-Version: 3.9.1
-Homepage: http://www.gnome.org/projects/gnome-games/
+Standards-Version: 3.9.2
+Homepage: http://live.gnome.org/GnomeGames
Package: gnome-games
Architecture: all
@@ -56,9 +55,9 @@
gnotski,
gtali,
iagno,
-# lightsoff,
- quadrapassel
-# swell-foop
+ lightsoff,
+ quadrapassel,
+ swell-foop
Suggests: gnome-hearts
Description: games for the GNOME desktop
These are the games from the official GNOME release. They have the look and
@@ -160,7 +159,6 @@
#Depends: ${misc:Depends}, ${shlibs:Depends},
# ${python:Depends},
# gnome-games-common (>= ${source:Version}),
-# python-gtk2 (>= 2.10.0),
# python-launchpad-integration
#Conflicts: gnome-games (<< 1:2.27.5-0ubuntu2), gnome-games-data (<< 1:2.27.5-0ubuntu2)
#Replaces: gnome-games (<< 1:2.27.5-0ubuntu2), gnome-games-data (<< 1:2.27.5-0ubuntu2)
@@ -215,33 +213,33 @@
Description: Tile flipping strategy game
Flip over your opponents tiles and control the board.
-#Package: lightsoff
-#Architecture: any
-#Depends: ${misc:Depends}, ${shlibs:Depends},
-# gnome-games-common (>= ${source:Version}),
-# seed,
-# gir1.0-glib-2.0 (>= 0.6.3),
-# gir1.0-gtk-2.0 (>= 0.6.3),
-# gir1.0-gconf-2.0 (>= 0.6.3),
-# gir1.0-clutter-1.0,
-# gir1.0-clutter-gtk-1.0
-#Description: Light puzzle game
-# Puzzle where all lights have to be switched off.
+Package: lightsoff
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends},
+ gnome-games-common (>= ${source:Version}),
+ seed,
+ gir1.2-glib-2.0 (>= 0.6.3),
+ gir1.2-gtk-3.0 (>= 0.6.3),
+ gir1.2-gconf-2.0 (>= 0.6.3),
+ gir1.2-clutter-1.0,
+ gir1.2-gtkclutter-1.0
+Description: Light puzzle game
+ Puzzle where all lights have to be switched off.
-#Package: swell-foop
-#Architecture: any
-#Depends: ${misc:Depends}, ${shlibs:Depends},
-# gnome-games-common (>= ${source:Version}),
-# seed,
-# gir1.0-glib-2.0 (>= 0.6.3),
-# gir1.0-gtk-2.0 (>= 0.6.3),
-# gir1.0-clutter-1.0,
-# gir1.0-clutter-gtk-1.0
-#Conflicts: gnome-games (<< 1:2.27.5-0ubuntu2), gnome-games-data (<< 1:2.27.5-0ubuntu2), same-gnome
-#Replaces: gnome-games (<< 1:2.27.5-0ubuntu2), gnome-games-data (<< 1:2.27.5-0ubuntu2), same-gnome
-#Description: Colored ball puzzle game
-# Remove blocks of balls of the same color in as few moves as possible. Try to
-# remove all balls for a bonus.
+Package: swell-foop
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends},
+ gnome-games-common (>= ${source:Version}),
+ seed,
+ gir1.2-glib-2.0 (>= 0.6.3),
+ gir1.2-gtk-2.0 (>= 0.6.3),
+ gir1.2-clutter-1.0,
+ gir1.2-gtkclutter-1.0
+Conflicts: gnome-games (<< 1:2.27.5-0ubuntu2), gnome-games-data (<< 1:2.27.5-0ubuntu2), same-gnome
+Replaces: gnome-games (<< 1:2.27.5-0ubuntu2), gnome-games-data (<< 1:2.27.5-0ubuntu2), same-gnome
+Description: Colored ball puzzle game
+ Remove blocks of balls of the same color in as few moves as possible. Try to
+ remove all balls for a bonus.
Package: quadrapassel
Architecture: any
=== removed file 'debian/patches/00git_private_typelib.patch'
--- debian/patches/00git_private_typelib.patch 2011-03-30 07:55:17 +0000
+++ debian/patches/00git_private_typelib.patch 1970-01-01 00:00:00 +0000
@@ -1,63 +0,0 @@
-From 9f54cae637585a50700721943c3a19f7c79bc381 Mon Sep 17 00:00:00 2001
-From: Robert Ancell <robert.ancell@xxxxxxxxxxxxx>
-Date: Wed, 30 Mar 2011 16:49:18 +1100
-Subject: [PATCH 3/3] libgames-support: Install typelib into a private location, don't bother installing the .gir since the library is private and is not going to be extended by other libraries
-
----
- libgames-support/Makefile.am | 11 +----------
- lightsoff/src/lightsoff.in | 1 +
- swell-foop/swell-foop.in | 1 +
- 3 files changed, 3 insertions(+), 10 deletions(-)
-
-diff --git a/libgames-support/Makefile.am b/libgames-support/Makefile.am
-index fa96061..ec7744d 100644
---- a/libgames-support/Makefile.am
-+++ b/libgames-support/Makefile.am
-@@ -199,9 +199,6 @@ libgames_support_gi_la_LIBADD = $(libgames_support_la_LIBADD)
-
- BUILT_GIRSOURCES = GnomeGamesSupport-1.0.gir
-
--# FIXMEchpe: change GIR version for the gtk+-3.0 based one...
--# or just remove introspection support for the gtk+-2.0 build
--
- GnomeGamesSupport-1.0.gir: $(INTROSPECTION_SCANNER) libgames-support-gi.la $(libgames_support_gi_la_SOURCES)
- $(AM_V_GEN) $(INTROSPECTION_SCANNER) -v \
- --namespace GnomeGamesSupport --nsversion=1.0 \
-@@ -222,13 +219,7 @@ GnomeGamesSupport-1.0.gir: $(INTROSPECTION_SCANNER) libgames-support-gi.la $(lib
- -I$(top_builddir) \
- $(filter games%,$^)
-
--# FIXMEchpe: this looks bogus. If the introspection.m4 macro gets it wrong, fix it!
--# INTROSPECTION_GIRDIR/INTROSPECTION_TYPELIBDIR aren't the right place to
--# install anything - we need to install inside our prefix.
--girdir = $(datadir)/gir-1.0
--gir_DATA = $(BUILT_GIRSOURCES)
--
--typelibsdir = $(libdir)/girepository-1.0
-+typelibsdir = $(pkglibdir)
- typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
-
- %.typelib: %.gir $(INTROSPECTION_COMPILER)
-diff --git a/lightsoff/src/lightsoff.in b/lightsoff/src/lightsoff.in
-index daff9e5..976e1db 100644
---- a/lightsoff/src/lightsoff.in
-+++ b/lightsoff/src/lightsoff.in
-@@ -1,4 +1,5 @@
- #!/usr/bin/env sh
-
- export LD_LIBRARY_PATH="%pkglibdir%${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
-+export GI_TYPELIB_PATH="%pkglibdir%${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}"
- /usr/bin/env seed %pkgdatadir%/lightsoff/main.js
-diff --git a/swell-foop/swell-foop.in b/swell-foop/swell-foop.in
-index ccfca41..5129a5e 100644
---- a/swell-foop/swell-foop.in
-+++ b/swell-foop/swell-foop.in
-@@ -1,4 +1,5 @@
- #!/usr/bin/env sh
-
- export LD_LIBRARY_PATH="%pkglibdir%${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
-+export GI_TYPELIB_PATH="%pkglibdir%${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}"
- /usr/bin/env seed %pkgdatadir%/swell-foop/main.js
---
-1.7.4.1
-
=== removed file 'debian/patches/80_change_tetris_theme.patch'
--- debian/patches/80_change_tetris_theme.patch 2010-06-07 23:25:59 +0000
+++ debian/patches/80_change_tetris_theme.patch 1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-Description: Use plain tetris theme by default as tangoshaded runs slow
-Author: ?
-
-Index: gnome-games-2.27.2/quadrapassel/quadrapassel.schemas.in
-===================================================================
---- gnome-games-2.27.2.orig/quadrapassel/quadrapassel.schemas.in 2009-05-25 21:39:29.000000000 +0200
-+++ gnome-games-2.27.2/quadrapassel/quadrapassel.schemas.in 2009-05-26 10:27:29.000000000 +0200
-@@ -18,7 +18,7 @@
- <applyto>/apps/quadrapassel/options/theme</applyto>
- <owner>quadrapassel</owner>
- <type>string</type>
-- <default>tangoshaded</default>
-+ <default>plain</default>
- <locale name="C">
- <short>The theme used for rendering the blocks</short>
- <long>The name of the theme used for rendering the blocks and the background.</long>
=== modified file 'debian/patches/series'
--- debian/patches/series 2011-03-30 07:55:17 +0000
+++ debian/patches/series 2011-05-19 07:41:24 +0000
@@ -1,5 +1,3 @@
-00git_private_typelib.patch
01_lpi.patch
02_desktop-path.patch
-80_change_tetris_theme.patch
81_change_iagno_theme.patch
=== modified file 'debian/rules'
--- debian/rules 2011-03-30 07:55:17 +0000
+++ debian/rules 2011-05-19 07:41:24 +0000
@@ -1,19 +1,18 @@
#!/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/class/python-module.mk
include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-DEB_CONFIGURE_EXTRA_FLAGS := --bindir=\$${prefix}/games \
- --with-tls=GnuTLS \
- --disable-scrollkeeper \
- --disable-schemas-install
+DEB_CONFIGURE_EXTRA_FLAGS := \
+ --bindir=\$${prefix}/games \
+ --disable-scrollkeeper
DEB_DH_FIXPERMS_ARGS := -X/usr/games
DEB_DH_MAKESHLIBS_ARGS_gnome-games := --no-act
DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-z,defs -Wl,-O1 -Wl,--as-needed"
