r11205 - in /packages/unstable/gweled/debian: changelog control patches/fix_double_free.diff patches/gweled-timer.diff patches/mikmod-disable-disk-writers.diff patches/scoredir-destdir.patch rules

ondrej at users.alioth.debian.org ondrej at users.alioth.debian.org
Wed May 30 06:57:34 UTC 2007


Author: ondrej
Date: Wed May 30 06:57:34 2007
New Revision: 11205

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11205
Log:
gweled: Merge 0.7-2 from my private repository

Added:
    packages/unstable/gweled/debian/patches/fix_double_free.diff
    packages/unstable/gweled/debian/patches/mikmod-disable-disk-writers.diff
Removed:
    packages/unstable/gweled/debian/patches/gweled-timer.diff
    packages/unstable/gweled/debian/patches/scoredir-destdir.patch
Modified:
    packages/unstable/gweled/debian/changelog
    packages/unstable/gweled/debian/control
    packages/unstable/gweled/debian/rules

Modified: packages/unstable/gweled/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gweled/debian/changelog?rev=11205&op=diff
==============================================================================
--- packages/unstable/gweled/debian/changelog (original)
+++ packages/unstable/gweled/debian/changelog Wed May 30 06:57:34 2007
@@ -1,12 +1,18 @@
-gweled (0.7-1) UNRELEASED; urgency=low
+gweled (0.7-2) unstable; urgency=low
 
-  [ Ondřej Surý ]
-  * New upstream release.
+  * Disable disk writer driver in MikMod initialization
+    (Closes: #401727, #401375)
+  * Fix double free when exiting (Closes: #401730)
 
-  [ Loic Minier ]
-  * Add a get-orig-source target to retrieve the upstream tarball.
+ -- Ondřej Surý <ondrej at debian.org>  Tue,  5 Dec 2006 18:20:44 +0100
 
- -- Loic Minier <lool at dooz.org>  Sun, 14 Jan 2007 00:03:32 +0100
+gweled (0.7-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #392973)
+    + Removed some patches merged upstream.
+  * Added -rdynamic CFLAG (Closes: #392971)
+
+ -- Ondřej Surý <ondrej at debian.org>  Mon, 23 Oct 2006 14:14:41 +0200
 
 gweled (0.6-2) unstable; urgency=low
 

Modified: packages/unstable/gweled/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gweled/debian/control?rev=11205&op=diff
==============================================================================
--- packages/unstable/gweled/debian/control (original)
+++ packages/unstable/gweled/debian/control Wed May 30 06:57:34 2007
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ondřej Surý <ondrej at debian.org>
 Build-Depends: debhelper (>= 4.0.0), cdbs, gnome-pkg-tools, libgnomecanvas2-dev, libglade2-dev, libgnomeui-dev, librsvg2-dev, libmikmod2-dev
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Akira TAGOH <tagoh at debian.org>, Andreas Rottmann <rotty at debian.org>, Andrew Lau <netsnipe at users.sourceforge.net>, Carlos Perelló Marín <carlos at pemas.net>, Clément Stenac <zorglub at debian.org>, Ed Boraas <ed at debian.org>, Edd Dumbill <ejad at debian.org>, Emil Soleyman-Zomalan <emil at nishra.com>, Guilherme de S. Pastore <guilherme.pastore at terra.com.br>, Gustavo Noronha Silva <kov at debian.org>, J.H.M. Dassen (Ray) <jdassen at debian.org>, Joe Drew <drew at debian.org>, Johannes Rohr <jr.debian at rohr.org>, Jordi Mallach <jordi at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Marc 'HE' Brockschmidt <he at debian.org>, Rob Bradford <rob at debianplanet.org>, Robert McQueen <robot101 at debian.org>, Ross Burton <ross at debian.org>, Sebastien Bacher <seb128 at debian.org>, Sjoerd Simons <sjoerd at debian.org>, Takuo KITAME <kitame at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Andrew Lau <netsnipe at users.sourceforge.net>, Clément Stenac <zorglub at debian.org>, Dafydd Harries <daf at debian.org>, Guilherme de S. Pastore <gpastore at debian.org>, Gustavo Franco <stratus at debian.org>, Gustavo Noronha Silva <kov at debian.org>, J.H.M. Dassen (Ray) <jdassen at debian.org>, Jordi Mallach <jordi at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Marc 'HE' Brockschmidt <he at debian.org>, Marco Cabizza <marco87 at gmail.com>, Oystein Gisnas <oystein at gisnas.net>, Ross Burton <ross at debian.org>, Sebastien Bacher <seb128 at debian.org>, Sjoerd Simons <sjoerd at debian.org>
 Standards-Version: 3.6.1.0
 
 Package: gweled

Added: packages/unstable/gweled/debian/patches/fix_double_free.diff
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gweled/debian/patches/fix_double_free.diff?rev=11205&op=file
==============================================================================
--- packages/unstable/gweled/debian/patches/fix_double_free.diff (added)
+++ packages/unstable/gweled/debian/patches/fix_double_free.diff Wed May 30 06:57:34 2007
@@ -1,0 +1,12 @@
+diff -urN gweled-0.7~/src/main.c gweled-0.7/src/main.c
+--- gweled-0.7~/src/main.c	2005-05-25 23:44:04.000000000 +0200
++++ gweled-0.7/src/main.c	2006-12-05 18:29:49.000000000 +0100
+@@ -365,7 +369,7 @@
+ 	if(swap_sfx)
+ 		Sample_Free(swap_sfx);
+ 	if(click_sfx)
+-		Sample_Free(swap_sfx);
++		Sample_Free(click_sfx);
+ 
+ 	MikMod_Exit();
+ 

Added: packages/unstable/gweled/debian/patches/mikmod-disable-disk-writers.diff
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gweled/debian/patches/mikmod-disable-disk-writers.diff?rev=11205&op=file
==============================================================================
--- packages/unstable/gweled/debian/patches/mikmod-disable-disk-writers.diff (added)
+++ packages/unstable/gweled/debian/patches/mikmod-disable-disk-writers.diff Wed May 30 06:57:34 2007
@@ -1,0 +1,16 @@
+diff -urN gweled-0.7~/src/main.c gweled-0.7/src/main.c
+--- gweled-0.7~/src/main.c	2005-05-25 23:44:04.000000000 +0200
++++ gweled-0.7/src/main.c	2006-12-05 18:29:49.000000000 +0100
+@@ -254,7 +254,11 @@
+ 				PACKAGE_DATA_DIR, NULL);
+ 
+     /* register all the drivers */
+-    MikMod_RegisterAllDrivers();
++    MikMod_RegisterDriver(&drv_AF);
++    MikMod_RegisterDriver(&drv_esd);
++    MikMod_RegisterDriver(&drv_alsa);
++    MikMod_RegisterDriver(&drv_oss);
++    MikMod_RegisterDriver(&drv_nos);
+ 
+     /* register all the module loaders */
+     MikMod_RegisterAllLoaders();

Modified: packages/unstable/gweled/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gweled/debian/rules?rev=11205&op=diff
==============================================================================
--- packages/unstable/gweled/debian/rules (original)
+++ packages/unstable/gweled/debian/rules Wed May 30 06:57:34 2007
@@ -11,7 +11,7 @@
 DEB_CONFIGURE_EXTRA_FLAGS := --bindir=\$${prefix}/games 
 DEB_DH_FIXPERMS_ARGS := -X/var/games/.*scores -X/usr/games
 
-CFLAGS := -Wall -g
+CFLAGS := -Wall -g -rdynamic
 
 # Ensure at build time that the library has no dependencies on undefined
 # symbols.




More information about the pkg-gnome-commits mailing list