r15220 - in /desktop/unstable/gnome-games/debian: ./ patches/

slomo at users.alioth.debian.org slomo at users.alioth.debian.org
Mon Mar 17 01:12:08 UTC 2008


Author: slomo
Date: Mon Mar 17 01:12:08 2008
New Revision: 15220

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15220
Log:
* New upstream stable release:
  + debian/control.in:
    - Update build dependencies.
  + debian/patches/01_ggz.patch,
    debian/patches/03_dont_build_ggz.patch,
    debian/patches/04_servers_usr_games.patch,
    debian/patches/06_arm_attribute-packed.patch:
    - Dropped, merged upstream.
  + debian/patches/05_maintainer_mode.patch
    debian/patches/99_reautoconf.patch:
    - Dropped, not needed anymore.
  + debian/gnome-games-servers.install,
    debian/gnome-games-data.install:
    - Adjust paths.
* debian/control.in:
  + Wrap build dependencies and dependencies.
  + Add ${misc:Depends} where it was missing.
  + Move homepage to the Homepage field.
* debian/rules:
  + Also link with -Wl,-z,defs to let the build fail if symbols are missing.

Removed:
    desktop/unstable/gnome-games/debian/patches/01_ggz.patch
    desktop/unstable/gnome-games/debian/patches/03_dont_build_ggz.patch
    desktop/unstable/gnome-games/debian/patches/04_servers_usr_games.patch
    desktop/unstable/gnome-games/debian/patches/05_maintainer_mode.patch
    desktop/unstable/gnome-games/debian/patches/06_arm_attribute-packed.patch
    desktop/unstable/gnome-games/debian/patches/99_reautoconf.patch
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/gnome-games-data.install
    desktop/unstable/gnome-games/debian/gnome-games-servers.install
    desktop/unstable/gnome-games/debian/patches/series
    desktop/unstable/gnome-games/debian/rules

Modified: desktop/unstable/gnome-games/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-games/debian/changelog?rev=15220&op=diff
==============================================================================
--- desktop/unstable/gnome-games/debian/changelog (original)
+++ desktop/unstable/gnome-games/debian/changelog Mon Mar 17 01:12:08 2008
@@ -1,3 +1,28 @@
+gnome-games (1:2.22.0-1) unstable; urgency=low
+
+  * New upstream stable release:
+    + debian/control.in:
+      - Update build dependencies.
+    + debian/patches/01_ggz.patch,
+      debian/patches/03_dont_build_ggz.patch,
+      debian/patches/04_servers_usr_games.patch,
+      debian/patches/06_arm_attribute-packed.patch:
+      - Dropped, merged upstream.
+    + debian/patches/05_maintainer_mode.patch
+      debian/patches/99_reautoconf.patch:
+      - Dropped, not needed anymore.
+    + debian/gnome-games-servers.install,
+      debian/gnome-games-data.install:
+      - Adjust paths.
+  * debian/control.in:
+    + Wrap build dependencies and dependencies.
+    + Add ${misc:Depends} where it was missing.
+    + Move homepage to the Homepage field.
+  * debian/rules:
+    + Also link with -Wl,-z,defs to let the build fail if symbols are missing.
+
+ -- Sebastian Dröge <slomo at debian.org>  Mon, 17 Mar 2008 01:19:51 +0100
+
 gnome-games (1:2.20.3-2) unstable; urgency=low
 
   * 06_arm_attribute-packed.patch: use __attribute__ ((packed)) to

Modified: desktop/unstable/gnome-games/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-games/debian/control?rev=15220&op=diff
==============================================================================
--- desktop/unstable/gnome-games/debian/control (original)
+++ desktop/unstable/gnome-games/debian/control Mon Mar 17 01:12:08 2008
@@ -4,47 +4,62 @@
 Maintainer: Josselin Mouette <joss at debian.org>
 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
 Build-Depends: cdbs,
-		debhelper (>= 5),
-		quilt,
-		intltool (>= 0.35.0), 
-		gnome-doc-utils (>= 0.10.0),
-		libgtk2.0-dev (>= 2.8.0),
-		libgnome2-dev (>= 2.16.0), 
-		libgnomeui-dev (>= 2.16.0),
-		libgconf2-dev (>= 2.10),
-		libgnomevfs2-dev (>= 2.10),
-		scrollkeeper (>= 0.3.8),
-		gettext, 
-		gnome-pkg-tools (>= 0.6),
-		dpkg-dev (>= 1.13.19),
-		guile-1.8-dev [!ia64],
-		guile-1.6-dev [ia64],
-		libxml-parser-perl,
-		librsvg2-dev (>= 2.14.0),
-		libesd0-dev,
-		libcairo2-dev,
-		python (>= 2.4),
-		python-gtk2-dev (>= 2.10.0), 
-		python-gnome2-desktop-dev (>= 2.17.3),
-		pkg-config,
-		python-support (>= 0.3),
-		libxml2-dev (>= 2.4.0),
-		libglade2-dev,
-		libggzmod-dev (>= 0.0.14),
-		libggzdmod-dev (>= 0.0.14),
-		libggzcore-dev (>= 0.0.14),
-		ggzcore-bin (>= 0.0.14),
-		libgstreamer0.10-dev (>= 0.10.11)		
+               debhelper (>= 5),
+               quilt,
+               intltool (>= 0.35.0), 
+               gnome-doc-utils (>= 0.10.0),
+               libgtk2.0-dev (>= 2.12.0),
+               libgnome2-dev (>= 2.16.0), 
+               libgnomeui-dev (>= 2.16.0),
+               libgconf2-dev (>= 2.10),
+               libgnomevfs2-dev (>= 2.10),
+               scrollkeeper,
+               gettext, 
+               gnome-pkg-tools (>= 0.6),
+               dpkg-dev (>= 1.13.19),
+               guile-1.8-dev [!ia64],
+               guile-1.6-dev [ia64],
+               libxml-parser-perl,
+               librsvg2-dev (>= 2.14.0),
+               libesd0-dev,
+               libcairo2-dev,
+               python (>= 2.4),
+               python-gtk2-dev (>= 2.10.0), 
+               python-gnome2-desktop-dev (>= 2.17.3),
+               pkg-config,
+               python-support (>= 0.3),
+               libxml2-dev (>= 2.4.0),
+               libglade2-dev,
+               libggzmod-dev (>= 0.0.14),
+               libggzdmod-dev (>= 0.0.14),
+               libggzcore-dev (>= 0.0.14),
+               ggzcore-bin (>= 0.0.14),
+               libgstreamer0.10-dev (>= 0.10.11)                
 Standards-Version: 3.7.3
+Homepage: http://www.gnome.org/projects/gnome-games/
 
 Package: gnome-games
 Architecture: any
-Depends: ${shlibs:Depends}, gnome-games-data (>= ${gnome:Version}), gnome-games-data (<< ${gnome:NextVersion}), librsvg2-common, ${python:Depends}, python-gtk2 (>= 2.10.0), python-gnome2, python-gnome2-desktop (>= 2.17.3), gnuchess | hoichess | bbchess | crafty | fruit
-Recommends: gnome-games-extra-data, python-gtkglext1, python-opengl
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         gnome-games-data (>= ${gnome:Version}),
+         gnome-games-data (<< ${gnome:NextVersion}),
+         librsvg2-common,
+         ${python:Depends},
+         python-gtk2 (>= 2.10.0),
+         python-gnome2,
+         python-gnome2-desktop (>= 2.17.3),
+         gnuchess | hoichess | bbchess | crafty | fruit
+Recommends: gnome-games-extra-data,
+            python-gtkglext1,
+            python-opengl
 Suggests: gnome-hearts
-Conflicts: gnome-sudoku, glchess
-Replaces: gnome-sudoku, glchess
-Provides: gnome-sudoku, glchess
+Conflicts: gnome-sudoku,
+           glchess
+Replaces: gnome-sudoku,
+          glchess
+Provides: gnome-sudoku,
+          glchess
 Description: games for the GNOME desktop
  These are the games from the official GNOME release. They have the look and
  feel of the GNOME desktop, but can be used without it.
@@ -66,32 +81,39 @@
   * iagno - the popular Othello game
   * mahjongg - classic Eastern tile game
   * same-gnome - remove as many balls in as few moves as possible
- .
- URL: http://www.gnome.org/projects/gnome-games/
 
 Package: gnome-games-data
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, gnome-cards-data (>= ${gnome:Version}), gnome-cards-data (<< ${gnome:NextVersion})
-Conflicts: gnome-games (<= 1:2.10.1-2), gnome-icon-theme (<< 2.14)
-Replaces: gnome-card-games, gnome-games-locale, glchess, gnome-sudoku
-Recommends: gnome-games, gnome-games-extra-data
+Depends: ${misc:Depends},
+         ${python:Depends},
+         gnome-cards-data (>= ${gnome:Version}),
+         gnome-cards-data (<< ${gnome:NextVersion})
+Conflicts: gnome-games (<= 1:2.10.1-2),
+           gnome-icon-theme (<< 2.14)
+Replaces: gnome-card-games,
+          gnome-games-locale,
+          glchess,
+          gnome-sudoku
+Recommends: gnome-games,
+            gnome-games-extra-data
 Description: data files for the GNOME games
  This package contains the data files, sound and pictures used by the
  GNOME games.
- .
- URL: http://www.gnome.org/projects/gnome-games/
 
 Package: gnome-cards-data
 Architecture: all
 Depends: ${misc:Depends}
-Conflicts: gnome-games-data (<< 1:2.14.2.1-1), gnome-games (<< 1:2.20), gnome-hearts (<< 0.1.3-4)
+Conflicts: gnome-games-data (<< 1:2.14.2.1-1),
+           gnome-games (<< 1:2.20),
+           gnome-hearts (<< 0.1.3-4)
 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.
 
 Package: gnome-games-servers
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
 Recommends: ggzd
 Description: GGZ gaming zone servers for the GNOME games
  This package is needed if you want to host a GGZ gaming zone for the 
@@ -99,3 +121,4 @@
   * gnect - four in a row game
   * gnibbles - snake game, up to four players
   * iagno - the popular Othello game
+

Modified: desktop/unstable/gnome-games/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-games/debian/control.in?rev=15220&op=diff
==============================================================================
--- desktop/unstable/gnome-games/debian/control.in (original)
+++ desktop/unstable/gnome-games/debian/control.in Mon Mar 17 01:12:08 2008
@@ -4,47 +4,62 @@
 Maintainer: Josselin Mouette <joss at debian.org>
 Uploaders: @GNOME_TEAM@
 Build-Depends: cdbs,
-		debhelper (>= 5),
-		quilt,
-		intltool (>= 0.35.0), 
-		gnome-doc-utils (>= 0.10.0),
-		libgtk2.0-dev (>= 2.8.0),
-		libgnome2-dev (>= 2.16.0), 
-		libgnomeui-dev (>= 2.16.0),
-		libgconf2-dev (>= 2.10),
-		libgnomevfs2-dev (>= 2.10),
-		scrollkeeper (>= 0.3.8),
-		gettext, 
-		gnome-pkg-tools (>= 0.6),
-		dpkg-dev (>= 1.13.19),
-		guile-1.8-dev [!ia64],
-		guile-1.6-dev [ia64],
-		libxml-parser-perl,
-		librsvg2-dev (>= 2.14.0),
-		libesd0-dev,
-		libcairo2-dev,
-		python (>= 2.4),
-		python-gtk2-dev (>= 2.10.0), 
-		python-gnome2-desktop-dev (>= 2.17.3),
-		pkg-config,
-		python-support (>= 0.3),
-		libxml2-dev (>= 2.4.0),
-		libglade2-dev,
-		libggzmod-dev (>= 0.0.14),
-		libggzdmod-dev (>= 0.0.14),
-		libggzcore-dev (>= 0.0.14),
-		ggzcore-bin (>= 0.0.14),
-		libgstreamer0.10-dev (>= 0.10.11)		
+               debhelper (>= 5),
+               quilt,
+               intltool (>= 0.35.0), 
+               gnome-doc-utils (>= 0.10.0),
+               libgtk2.0-dev (>= 2.12.0),
+               libgnome2-dev (>= 2.16.0), 
+               libgnomeui-dev (>= 2.16.0),
+               libgconf2-dev (>= 2.10),
+               libgnomevfs2-dev (>= 2.10),
+               scrollkeeper,
+               gettext, 
+               gnome-pkg-tools (>= 0.6),
+               dpkg-dev (>= 1.13.19),
+               guile-1.8-dev [!ia64],
+               guile-1.6-dev [ia64],
+               libxml-parser-perl,
+               librsvg2-dev (>= 2.14.0),
+               libesd0-dev,
+               libcairo2-dev,
+               python (>= 2.4),
+               python-gtk2-dev (>= 2.10.0), 
+               python-gnome2-desktop-dev (>= 2.17.3),
+               pkg-config,
+               python-support (>= 0.3),
+               libxml2-dev (>= 2.4.0),
+               libglade2-dev,
+               libggzmod-dev (>= 0.0.14),
+               libggzdmod-dev (>= 0.0.14),
+               libggzcore-dev (>= 0.0.14),
+               ggzcore-bin (>= 0.0.14),
+               libgstreamer0.10-dev (>= 0.10.11)                
 Standards-Version: 3.7.3
+Homepage: http://www.gnome.org/projects/gnome-games/
 
 Package: gnome-games
 Architecture: any
-Depends: ${shlibs:Depends}, gnome-games-data (>= ${gnome:Version}), gnome-games-data (<< ${gnome:NextVersion}), librsvg2-common, ${python:Depends}, python-gtk2 (>= 2.10.0), python-gnome2, python-gnome2-desktop (>= 2.17.3), gnuchess | hoichess | bbchess | crafty | fruit
-Recommends: gnome-games-extra-data, python-gtkglext1, python-opengl
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         gnome-games-data (>= ${gnome:Version}),
+         gnome-games-data (<< ${gnome:NextVersion}),
+         librsvg2-common,
+         ${python:Depends},
+         python-gtk2 (>= 2.10.0),
+         python-gnome2,
+         python-gnome2-desktop (>= 2.17.3),
+         gnuchess | hoichess | bbchess | crafty | fruit
+Recommends: gnome-games-extra-data,
+            python-gtkglext1,
+            python-opengl
 Suggests: gnome-hearts
-Conflicts: gnome-sudoku, glchess
-Replaces: gnome-sudoku, glchess
-Provides: gnome-sudoku, glchess
+Conflicts: gnome-sudoku,
+           glchess
+Replaces: gnome-sudoku,
+          glchess
+Provides: gnome-sudoku,
+          glchess
 Description: games for the GNOME desktop
  These are the games from the official GNOME release. They have the look and
  feel of the GNOME desktop, but can be used without it.
@@ -66,32 +81,39 @@
   * iagno - the popular Othello game
   * mahjongg - classic Eastern tile game
   * same-gnome - remove as many balls in as few moves as possible
- .
- URL: http://www.gnome.org/projects/gnome-games/
 
 Package: gnome-games-data
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, gnome-cards-data (>= ${gnome:Version}), gnome-cards-data (<< ${gnome:NextVersion})
-Conflicts: gnome-games (<= 1:2.10.1-2), gnome-icon-theme (<< 2.14)
-Replaces: gnome-card-games, gnome-games-locale, glchess, gnome-sudoku
-Recommends: gnome-games, gnome-games-extra-data
+Depends: ${misc:Depends},
+         ${python:Depends},
+         gnome-cards-data (>= ${gnome:Version}),
+         gnome-cards-data (<< ${gnome:NextVersion})
+Conflicts: gnome-games (<= 1:2.10.1-2),
+           gnome-icon-theme (<< 2.14)
+Replaces: gnome-card-games,
+          gnome-games-locale,
+          glchess,
+          gnome-sudoku
+Recommends: gnome-games,
+            gnome-games-extra-data
 Description: data files for the GNOME games
  This package contains the data files, sound and pictures used by the
  GNOME games.
- .
- URL: http://www.gnome.org/projects/gnome-games/
 
 Package: gnome-cards-data
 Architecture: all
 Depends: ${misc:Depends}
-Conflicts: gnome-games-data (<< 1:2.14.2.1-1), gnome-games (<< 1:2.20), gnome-hearts (<< 0.1.3-4)
+Conflicts: gnome-games-data (<< 1:2.14.2.1-1),
+           gnome-games (<< 1:2.20),
+           gnome-hearts (<< 0.1.3-4)
 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.
 
 Package: gnome-games-servers
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
 Recommends: ggzd
 Description: GGZ gaming zone servers for the GNOME games
  This package is needed if you want to host a GGZ gaming zone for the 
@@ -99,3 +121,4 @@
   * gnect - four in a row game
   * gnibbles - snake game, up to four players
   * iagno - the popular Othello game
+

Modified: desktop/unstable/gnome-games/debian/gnome-games-data.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-games/debian/gnome-games-data.install?rev=15220&op=diff
==============================================================================
--- desktop/unstable/gnome-games/debian/gnome-games-data.install (original)
+++ desktop/unstable/gnome-games/debian/gnome-games-data.install Mon Mar 17 01:12:08 2008
@@ -1,5 +1,5 @@
 debian/pixmaps/*.xpm /usr/share/pixmaps
 debian/tmp/usr/share/[!a]*[!n]
-debian/tmp/usr/share/gnome-games-common/icons
+debian/tmp/usr/share/gnome-games/icons
 debian/tmp/etc/gconf
 debian/tmp/usr/lib/python*

Modified: desktop/unstable/gnome-games/debian/gnome-games-servers.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-games/debian/gnome-games-servers.install?rev=15220&op=diff
==============================================================================
--- desktop/unstable/gnome-games/debian/gnome-games-servers.install (original)
+++ desktop/unstable/gnome-games/debian/gnome-games-servers.install Mon Mar 17 01:12:08 2008
@@ -1,2 +1,2 @@
 debian/tmp/usr/etc/ggzd /etc
-debian/tmp/usr/games/*d
+debian/tmp/usr/lib/ggz

Modified: desktop/unstable/gnome-games/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-games/debian/patches/series?rev=15220&op=diff
==============================================================================
--- desktop/unstable/gnome-games/debian/patches/series (original)
+++ desktop/unstable/gnome-games/debian/patches/series Mon Mar 17 01:12:08 2008
@@ -1,7 +1,1 @@
-01_ggz.patch
 02_desktop-path.patch
-03_dont_build_ggz.patch
-04_servers_usr_games.patch
-05_maintainer_mode.patch
-06_arm_attribute-packed.patch
-99_reautoconf.patch

Modified: desktop/unstable/gnome-games/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-games/debian/rules?rev=15220&op=diff
==============================================================================
--- desktop/unstable/gnome-games/debian/rules (original)
+++ desktop/unstable/gnome-games/debian/rules Mon Mar 17 01:12:08 2008
@@ -15,7 +15,7 @@
 		--disable-scrollkeeper
 DEB_DH_FIXPERMS_ARGS := -X/usr/games
 DEB_DH_MAKESHLIBS_ARGS_gnome-games := --no-act
-DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-O1 -Wl,--as-needed"
+DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-z,defs -Wl,-O1 -Wl,--as-needed"
 
 binary-post-install/gnome-games::
 	chmod u+w debian/gnome-games/usr/games/*




More information about the pkg-gnome-commits mailing list