Author: pabs Date: 2012-03-11 07:16:14 +0000 (Sun, 11 Mar 2012) New Revision: 13375
Removed: packages/trunk/sdlbasic/debian/patches/properties.patch Modified: packages/trunk/sdlbasic/debian/changelog packages/trunk/sdlbasic/debian/patches/64bit.patch packages/trunk/sdlbasic/debian/patches/bison_code.patch packages/trunk/sdlbasic/debian/patches/datadir.patch packages/trunk/sdlbasic/debian/patches/fix_example.patch packages/trunk/sdlbasic/debian/patches/fonts.patch packages/trunk/sdlbasic/debian/patches/ldflags.patch packages/trunk/sdlbasic/debian/patches/makefiles.patch packages/trunk/sdlbasic/debian/patches/quickhelp.patch packages/trunk/sdlbasic/debian/patches/x-www-browser.patch Log: Clean up the patches and add DEP-3 headers Modified: packages/trunk/sdlbasic/debian/changelog =================================================================== --- packages/trunk/sdlbasic/debian/changelog 2012-03-11 06:37:01 UTC (rev 13374) +++ packages/trunk/sdlbasic/debian/changelog 2012-03-11 07:16:14 UTC (rev 13375) @@ -4,6 +4,7 @@ * Run wrap-and-sort -sa * Add missing build-dep on libtiff-dev (Closes: #662937) * Switch from plain quilt to dpkg-source v3 + * Clean up the patches and add DEP-3 headers -- Paul Wise <[email protected]> Sun, 11 Mar 2012 13:16:13 +0800 Modified: packages/trunk/sdlbasic/debian/patches/64bit.patch =================================================================== --- packages/trunk/sdlbasic/debian/patches/64bit.patch 2012-03-11 06:37:01 UTC (rev 13374) +++ packages/trunk/sdlbasic/debian/patches/64bit.patch 2012-03-11 07:16:14 UTC (rev 13375) @@ -1,6 +1,6 @@ -# Copyright (C) 2008 by Peter De Wachter <[email protected]> -# Distributed under the same license as the program. See debian/copyright. - +Author: Peter De Wachter <[email protected]> +Description: Fix some issues on 64-bit platforms +Last-Update: 2008 --- a/src/sdlBasic/src/sdlBasic/gtk/SciTEGTK.cxx +++ b/src/sdlBasic/src/sdlBasic/gtk/SciTEGTK.cxx @@ -2217,7 +2217,7 @@ Modified: packages/trunk/sdlbasic/debian/patches/bison_code.patch =================================================================== --- packages/trunk/sdlbasic/debian/patches/bison_code.patch 2012-03-11 06:37:01 UTC (rev 13374) +++ packages/trunk/sdlbasic/debian/patches/bison_code.patch 2012-03-11 07:16:14 UTC (rev 13375) @@ -1,9 +1,8 @@ -#Author: Barry deFreese <[email protected]> -#Description: Declare the tokens before the code. -Index: sdlbasic-0.0.20070714/src/sdlBasic/src/sdlBrt/sdlBrt_tab.y -=================================================================== ---- sdlbasic-0.0.20070714.orig/src/sdlBasic/src/sdlBrt/sdlBrt_tab.y 2009-05-06 10:51:48.000000000 -0400 -+++ sdlbasic-0.0.20070714/src/sdlBasic/src/sdlBrt/sdlBrt_tab.y 2009-05-06 10:52:16.000000000 -0400 +Author: Barry deFreese <[email protected]> +Description: Declare the tokens before the code. Fixes FTBFS with newer Bison. +Last-Update: 2009-05-06 +--- a/src/sdlBasic/src/sdlBrt/sdlBrt_tab.y ++++ b/src/sdlBasic/src/sdlBrt/sdlBrt_tab.y @@ -1,53 +1,3 @@ -%{ - Modified: packages/trunk/sdlbasic/debian/patches/datadir.patch =================================================================== --- packages/trunk/sdlbasic/debian/patches/datadir.patch 2012-03-11 06:37:01 UTC (rev 13374) +++ packages/trunk/sdlbasic/debian/patches/datadir.patch 2012-03-11 07:16:14 UTC (rev 13375) @@ -1,10 +1,9 @@ -# Copyright (C) 2008 by Miriam Ruiz <[email protected]> -# Distributed under the same license as the program. See debian/copyright. - -Index: sdlbasic/src/sdlBasic/share/sdlBasic/sdlBasic.properties -=================================================================== ---- sdlbasic.orig/src/sdlBasic/share/sdlBasic/sdlBasic.properties 2008-09-13 23:14:17.000000000 +0200 -+++ sdlbasic/src/sdlBasic/share/sdlBasic/sdlBasic.properties 2008-09-13 23:14:39.000000000 +0200 +Author: Miriam Ruiz <[email protected]> +Description: fix some issues with the datadir +Bug-Ubuntu: http://launchpad.net/bugs/372185 +Last-Update: 2008-09-13 +--- a/src/sdlBasic/share/sdlBasic/sdlBasic.properties ++++ b/src/sdlBasic/share/sdlBasic/sdlBasic.properties @@ -651,21 +651,21 @@ BASEDIR=$(SciteDefaultHome)/../.. # uncomment this if you use kde and have problems with audio @@ -32,10 +31,8 @@ +command.3.*.sdlbas=$(SDLBRT) --nodefaults /usr/share/sdlbasic/plugins/bind.sdlbas $(SDLBRT) "$(FilePath)" command.is.filter.3.*.sdlbas=1 -Index: sdlbasic/src/sdlBasic/src/sdlBasic/src/SciTEIO.cxx -=================================================================== ---- sdlbasic.orig/src/sdlBasic/src/sdlBasic/src/SciTEIO.cxx 2008-09-13 23:14:17.000000000 +0200 -+++ sdlbasic/src/sdlBasic/src/sdlBasic/src/SciTEIO.cxx 2008-09-13 23:14:39.000000000 +0200 +--- a/src/sdlBasic/src/sdlBasic/src/SciTEIO.cxx ++++ b/src/sdlBasic/src/sdlBasic/src/SciTEIO.cxx @@ -91,8 +91,8 @@ const char propGlobalFileName[] = "../share/sdlBasic/Global.properties"; const char propAbbrevFileName[] = "../share/sdlBasic/abbrev.properties"; @@ -47,10 +44,8 @@ #endif #define PROPERTIES_EXTENSION ".properties" -Index: sdlbasic-0.0.20070714/src/sdlBasic/share/sdlBasic/Global.properties -=================================================================== ---- sdlbasic-0.0.20070714.orig/src/sdlBasic/share/sdlBasic/Global.properties 2009-05-06 14:12:57.000000000 +0200 -+++ sdlbasic-0.0.20070714/src/sdlBasic/share/sdlBasic/Global.properties 2009-05-06 14:14:48.000000000 +0200 +--- a/src/sdlBasic/share/sdlBasic/Global.properties ++++ b/src/sdlBasic/share/sdlBasic/Global.properties @@ -209,7 +209,7 @@ if PLAT_GTK BROWSER=firefox Modified: packages/trunk/sdlbasic/debian/patches/fix_example.patch =================================================================== --- packages/trunk/sdlbasic/debian/patches/fix_example.patch 2012-03-11 06:37:01 UTC (rev 13374) +++ packages/trunk/sdlbasic/debian/patches/fix_example.patch 2012-03-11 07:16:14 UTC (rev 13375) @@ -1,10 +1,8 @@ -# Copyright (C) 2008 by Miriam Ruiz <[email protected]> -# Distributed under the same license as the program. See debian/copyright. - -Index: sdlbasic/src/sdlBasic/share/sdlBasic/clickme.sdlbas -=================================================================== ---- sdlbasic.orig/src/sdlBasic/share/sdlBasic/clickme.sdlbas 2008-09-03 15:30:03.000000000 +0200 -+++ sdlbasic/src/sdlBasic/share/sdlBasic/clickme.sdlbas 2008-09-03 15:30:45.000000000 +0200 +Author: Miriam Ruiz <[email protected]> +Description: Fix the example +Last-Update: 2008-09-03 +--- a/src/sdlBasic/share/sdlBasic/clickme.sdlbas ++++ b/src/sdlBasic/share/sdlBasic/clickme.sdlbas @@ -23,13 +23,13 @@ setalphachannel(0) 'directscreen Modified: packages/trunk/sdlbasic/debian/patches/fonts.patch =================================================================== --- packages/trunk/sdlbasic/debian/patches/fonts.patch 2012-03-11 06:37:01 UTC (rev 13374) +++ packages/trunk/sdlbasic/debian/patches/fonts.patch 2012-03-11 07:16:14 UTC (rev 13375) @@ -1,10 +1,8 @@ -# Copyright (C) 2008 by Miriam Ruiz <[email protected]> -# Distributed under the same license as the program. See debian/copyright. - -Index: sdlbasic-0.0.20070714/src/sdlBasic/src/sdlBrt/SDLengine/SDLengine.c -=================================================================== ---- sdlbasic-0.0.20070714.orig/src/sdlBasic/src/sdlBrt/SDLengine/SDLengine.c 2008-04-04 15:03:54.000000000 +0000 -+++ sdlbasic-0.0.20070714/src/sdlBasic/src/sdlBrt/SDLengine/SDLengine.c 2008-04-04 15:08:52.000000000 +0000 +Author: Miriam Ruiz <[email protected]> +Description: Allow hard-coding a path to the font at build time +Last-Update: 2008-04-04 +--- a/src/sdlBasic/src/sdlBrt/SDLengine/SDLengine.c ++++ b/src/sdlBasic/src/sdlBrt/SDLengine/SDLengine.c @@ -278,6 +278,10 @@ enabledsound=0; } @@ -25,10 +23,8 @@ /* -Index: sdlbasic-0.0.20070714/src/sdlBasic/src/sdlBrt/SDLengine/makefile -=================================================================== ---- sdlbasic-0.0.20070714.orig/src/sdlBasic/src/sdlBrt/SDLengine/makefile 2008-04-04 15:10:46.000000000 +0000 -+++ sdlbasic-0.0.20070714/src/sdlBasic/src/sdlBrt/SDLengine/makefile 2008-04-04 15:13:25.000000000 +0000 +--- a/src/sdlBasic/src/sdlBrt/SDLengine/makefile ++++ b/src/sdlBasic/src/sdlBrt/SDLengine/makefile @@ -71,8 +71,9 @@ CPP=g++ RANLIB= ranlib @@ -40,10 +36,8 @@ LIBS=-Wl,-rpath, -lSDL_mixer -lSDL_image -lSDL_ttf -lSDL_net -lvorbisfile -lvorbis -logg -lsmpeg -lasound -lSDL -lpng -ltiff -lz -ljpeg -lpthread -lm -lfreetype -ldl #LIBS=-Wl,-rpath, -lSDL -lSDL_mixer -lSDL_image -lSDL_ttf -lSDL_net -lvorbisfile -lvorbis -logg -lsmpeg -lpthread -lm -lfreetype -lSDL -lpng -ljpeg -ltiff -lz -lartsdsp -lasound -lartsdsp -ldl #LIBS=-lSDL_mixer -lSDL_image -lSDL_ttf -lSDL_net -lsmpeg -Index: sdlbasic-0.0.20070714/src/sdlBasic/src/sdlBrt/makefile -=================================================================== ---- sdlbasic-0.0.20070714.orig/src/sdlBasic/src/sdlBrt/makefile 2008-04-04 15:10:46.000000000 +0000 -+++ sdlbasic-0.0.20070714/src/sdlBasic/src/sdlBrt/makefile 2008-04-04 15:13:20.000000000 +0000 +--- a/src/sdlBasic/src/sdlBrt/makefile ++++ b/src/sdlBasic/src/sdlBrt/makefile @@ -95,8 +95,9 @@ INSTALL=/usr/bin/install RM=rm @@ -55,10 +49,8 @@ COMPILE=$(CPP) $(CFLAG) -Index: sdlbasic-0.0.20070714/src/sdlBasic/src/sdlBrt/sdlBrt.c -=================================================================== ---- sdlbasic-0.0.20070714.orig/src/sdlBasic/src/sdlBrt/sdlBrt.c 2008-04-04 15:03:54.000000000 +0000 -+++ sdlbasic-0.0.20070714/src/sdlBasic/src/sdlBrt/sdlBrt.c 2008-04-04 15:08:51.000000000 +0000 +--- a/src/sdlBasic/src/sdlBrt/sdlBrt.c ++++ b/src/sdlBasic/src/sdlBrt/sdlBrt.c @@ -256,6 +256,10 @@ Modified: packages/trunk/sdlbasic/debian/patches/ldflags.patch =================================================================== --- packages/trunk/sdlbasic/debian/patches/ldflags.patch 2012-03-11 06:37:01 UTC (rev 13374) +++ packages/trunk/sdlbasic/debian/patches/ldflags.patch 2012-03-11 07:16:14 UTC (rev 13375) @@ -1,10 +1,8 @@ -# Copyright (C) 2008 by Miriam Ruiz <[email protected]> -# Distributed under the same license as the program. See debian/copyright. - -Index: sdlbasic/src/sdlBasic/src/sdlBrt/makefile -=================================================================== ---- sdlbasic.orig/src/sdlBasic/src/sdlBrt/makefile 2008-09-13 04:43:51.000000000 +0200 -+++ sdlbasic/src/sdlBasic/src/sdlBrt/makefile 2008-09-13 04:46:04.000000000 +0200 +Author: Miriam Ruiz <[email protected]> +Description: Add LDFLAGS to the makefile +Last-Update: 2008-09-13 +--- a/src/sdlBasic/src/sdlBrt/makefile ++++ b/src/sdlBasic/src/sdlBrt/makefile @@ -98,6 +98,7 @@ DEJAVUSANS_TTF=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf Modified: packages/trunk/sdlbasic/debian/patches/makefiles.patch =================================================================== --- packages/trunk/sdlbasic/debian/patches/makefiles.patch 2012-03-11 06:37:01 UTC (rev 13374) +++ packages/trunk/sdlbasic/debian/patches/makefiles.patch 2012-03-11 07:16:14 UTC (rev 13375) @@ -1,10 +1,8 @@ -# Copyright (C) 2008 by Miriam Ruiz <[email protected]> -# Distributed under the same license as the program. See debian/copyright. - -Index: sdlbasic-0.0.20070714/src/sdlBasic/src/sdlBasic/gtk/makefile -=================================================================== ---- sdlbasic-0.0.20070714.orig/src/sdlBasic/src/sdlBasic/gtk/makefile 2008-04-04 14:51:15.000000000 +0000 -+++ sdlbasic-0.0.20070714/src/sdlBasic/src/sdlBasic/gtk/makefile 2008-04-04 14:53:30.000000000 +0000 +Author: Miriam Ruiz <[email protected]> +Description: Add DESTDIR support and other fixes to the makefile +Last-Update: 2008-04-04 +--- a/src/sdlBasic/src/sdlBasic/gtk/makefile ++++ b/src/sdlBasic/src/sdlBasic/gtk/makefile @@ -96,25 +96,26 @@ # This is OK - just means no SciTE in the Gnome Applications menu # Dead: install -D SciTEGTK.properties $(SYSCONF_PATH)/SciTEGlobal.properties @@ -39,10 +37,8 @@ done uninstall: -Index: sdlbasic-0.0.20070714/src/sdlBasic/src/sdlBrt/makefile -=================================================================== ---- sdlbasic-0.0.20070714.orig/src/sdlBasic/src/sdlBrt/makefile 2008-04-04 14:51:15.000000000 +0000 -+++ sdlbasic-0.0.20070714/src/sdlBasic/src/sdlBrt/makefile 2008-04-04 14:58:48.000000000 +0000 +--- a/src/sdlBasic/src/sdlBrt/makefile ++++ b/src/sdlBasic/src/sdlBrt/makefile @@ -328,23 +328,23 @@ ifeq ($(compress), UPX) upx -9 $(TARGET) Deleted: packages/trunk/sdlbasic/debian/patches/properties.patch =================================================================== --- packages/trunk/sdlbasic/debian/patches/properties.patch 2012-03-11 06:37:01 UTC (rev 13374) +++ packages/trunk/sdlbasic/debian/patches/properties.patch 2012-03-11 07:16:14 UTC (rev 13375) @@ -1,13 +0,0 @@ -Index: sdlbasic/src/sdlBasic/share/sdlBasic/sdlBasic.properties -=================================================================== ---- sdlbasic.orig/src/sdlBasic/share/sdlBasic/sdlBasic.properties 2008-11-15 18:25:48.000000000 +0100 -+++ sdlbasic/src/sdlBasic/share/sdlBasic/sdlBasic.properties 2008-11-15 18:26:06.000000000 +0100 -@@ -651,7 +651,7 @@ - BASEDIR=$(SciteDefaultHome)/../.. - # uncomment this if you use kde and have problems with audio - #ARTSDSP=artsdsp -m -- SDLBRT=$(ARTSDSP) $/usr/bin/sdlBrt -+ SDLBRT=$(ARTSDSP) /usr/bin/sdlBrt - BROWSER=firefox - command.go.*.sdlbas=$(SDLBRT) "$(FilePath)" - command.help.*.sdlbas=$(BROWSER) "file:/usr/share/doc/sdlbasic/english/QuickHelp.html" Modified: packages/trunk/sdlbasic/debian/patches/quickhelp.patch =================================================================== --- packages/trunk/sdlbasic/debian/patches/quickhelp.patch 2012-03-11 06:37:01 UTC (rev 13374) +++ packages/trunk/sdlbasic/debian/patches/quickhelp.patch 2012-03-11 07:16:14 UTC (rev 13375) @@ -1,7 +1,8 @@ -Index: sdlbasic-0.0.20070714/src/sdlBasic/share/sdlBasic/sdlBasic.properties -=================================================================== ---- sdlbasic-0.0.20070714.orig/src/sdlBasic/share/sdlBasic/sdlBasic.properties 2009-05-06 22:57:03.000000000 +0200 -+++ sdlbasic-0.0.20070714/src/sdlBasic/share/sdlBasic/sdlBasic.properties 2009-05-06 22:57:23.000000000 +0200 +Author: Evgeni Golov +Description: Fix the QuickHelp path +Last-Update: 2009-05-06 +--- a/src/sdlBasic/share/sdlBasic/sdlBasic.properties ++++ b/src/sdlBasic/share/sdlBasic/sdlBasic.properties @@ -654,7 +654,7 @@ SDLBRT=$(ARTSDSP) /usr/bin/sdlBrt BROWSER=x-www-browser Modified: packages/trunk/sdlbasic/debian/patches/x-www-browser.patch =================================================================== --- packages/trunk/sdlbasic/debian/patches/x-www-browser.patch 2012-03-11 06:37:01 UTC (rev 13374) +++ packages/trunk/sdlbasic/debian/patches/x-www-browser.patch 2012-03-11 07:16:14 UTC (rev 13375) @@ -1,7 +1,8 @@ -Index: sdlbasic-0.0.20070714/src/sdlBasic/share/sdlBasic/Global.properties -=================================================================== ---- sdlbasic-0.0.20070714.orig/src/sdlBasic/share/sdlBasic/Global.properties 2009-05-06 22:55:39.000000000 +0200 -+++ sdlbasic-0.0.20070714/src/sdlBasic/share/sdlBasic/Global.properties 2009-05-06 22:56:02.000000000 +0200 +Author: Evgeni Golov +Description: Use the default Debian browser instead of Firefox +Last-Update: 2009-05-06 +--- a/src/sdlBasic/share/sdlBasic/Global.properties ++++ b/src/sdlBasic/share/sdlBasic/Global.properties @@ -207,7 +207,7 @@ command.scite.help=explorer "$(SciteDefaultHome)\..\share\doc\sdlBasic\english\index.html" command.scite.help.subsystem=2 @@ -11,10 +12,8 @@ #command.print.*=a2ps $(FileNameExt) command.scite.help=$(BROWSER) "file:/usr/share/doc/sdlbasic/english/index.html" # Internationalisation -Index: sdlbasic-0.0.20070714/src/sdlBasic/share/sdlBasic/sdlBasic.properties -=================================================================== ---- sdlbasic-0.0.20070714.orig/src/sdlBasic/share/sdlBasic/sdlBasic.properties 2009-05-06 22:55:15.000000000 +0200 -+++ sdlbasic-0.0.20070714/src/sdlBasic/share/sdlBasic/sdlBasic.properties 2009-05-06 22:55:31.000000000 +0200 +--- a/src/sdlBasic/share/sdlBasic/sdlBasic.properties ++++ b/src/sdlBasic/share/sdlBasic/sdlBasic.properties @@ -652,7 +652,7 @@ # uncomment this if you use kde and have problems with audio #ARTSDSP=artsdsp -m _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
