Author: bdefreese Date: 2009-12-08 01:36:42 +0000 (Tue, 08 Dec 2009) New Revision: 10589
Modified: packages/trunk/mathwar/debian/changelog packages/trunk/mathwar/debian/patches/10_gnome2.diff packages/trunk/mathwar/debian/patches/20_autofiles.diff packages/trunk/mathwar/debian/patches/30_desktop_file.diff Log: * Add descriptions for quilt patches. * Improve desktop file patch. (Closes: #525587). Modified: packages/trunk/mathwar/debian/changelog =================================================================== --- packages/trunk/mathwar/debian/changelog 2009-12-08 01:11:57 UTC (rev 10588) +++ packages/trunk/mathwar/debian/changelog 2009-12-08 01:36:42 UTC (rev 10589) @@ -7,6 +7,8 @@ * Add ${misc:Depends} for debhelper package. * Move from Section: gnome to games. * Add README.source for quilt. + * Add descriptions for quilt patches. + * Improve desktop file patch. (Closes: #525587). * Bump Standards Version to 3.8.3. -- Barry deFreese <bdefre...@debian.org> Mon, 07 Dec 2009 17:07:31 -0500 Modified: packages/trunk/mathwar/debian/patches/10_gnome2.diff =================================================================== --- packages/trunk/mathwar/debian/patches/10_gnome2.diff 2009-12-08 01:11:57 UTC (rev 10588) +++ packages/trunk/mathwar/debian/patches/10_gnome2.diff 2009-12-08 01:36:42 UTC (rev 10589) @@ -1,7 +1,8 @@ -Index: MathWar-0.2.5/src/about_dlg.c +Description: Patch upstream to work with gtk2. +Index: mathwar-0.2.5/src/about_dlg.c =================================================================== ---- MathWar-0.2.5.orig/src/about_dlg.c 2008-03-12 22:01:06.000000000 -0400 -+++ MathWar-0.2.5/src/about_dlg.c 2008-03-12 22:11:46.000000000 -0400 +--- mathwar-0.2.5.orig/src/about_dlg.c 2009-12-07 20:22:00.000000000 -0500 ++++ mathwar-0.2.5/src/about_dlg.c 2009-12-07 20:23:12.000000000 -0500 @@ -41,6 +41,7 @@ { GtkWidget *about_dlg; @@ -26,10 +27,10 @@ g_string_free (logo_str, TRUE); if (parent != NULL) -Index: MathWar-0.2.5/src/draw.c +Index: mathwar-0.2.5/src/draw.c =================================================================== ---- MathWar-0.2.5.orig/src/draw.c 2008-03-12 22:01:06.000000000 -0400 -+++ MathWar-0.2.5/src/draw.c 2008-03-12 22:11:22.000000000 -0400 +--- mathwar-0.2.5.orig/src/draw.c 2009-12-07 20:22:00.000000000 -0500 ++++ mathwar-0.2.5/src/draw.c 2009-12-07 20:23:12.000000000 -0500 @@ -188,7 +188,7 @@ * The position of the equal sign + the width of the equal sign, * plus some padding. @@ -39,10 +40,10 @@ } -Index: MathWar-0.2.5/src/mainwin.c +Index: mathwar-0.2.5/src/mainwin.c =================================================================== ---- MathWar-0.2.5.orig/src/mainwin.c 2008-03-12 22:01:06.000000000 -0400 -+++ MathWar-0.2.5/src/mainwin.c 2008-03-12 22:11:22.000000000 -0400 +--- mathwar-0.2.5.orig/src/mainwin.c 2009-12-07 20:22:00.000000000 -0500 ++++ mathwar-0.2.5/src/mainwin.c 2009-12-07 20:23:12.000000000 -0500 @@ -566,7 +566,8 @@ GTK_SIGNAL_FUNC (on_pause_toggled), NULL); @@ -72,10 +73,10 @@ return; } -Index: MathWar-0.2.5/src/prop_dlg.c +Index: mathwar-0.2.5/src/prop_dlg.c =================================================================== ---- MathWar-0.2.5.orig/src/prop_dlg.c 2008-03-12 22:01:06.000000000 -0400 -+++ MathWar-0.2.5/src/prop_dlg.c 2008-03-12 22:11:22.000000000 -0400 +--- mathwar-0.2.5.orig/src/prop_dlg.c 2009-12-07 20:22:00.000000000 -0500 ++++ mathwar-0.2.5/src/prop_dlg.c 2009-12-07 20:23:12.000000000 -0500 @@ -232,23 +232,23 @@ gint page_num, gpointer user_data) @@ -105,10 +106,10 @@ break; default: -Index: MathWar-0.2.5/src/support.c +Index: mathwar-0.2.5/src/support.c =================================================================== ---- MathWar-0.2.5.orig/src/support.c 2008-03-12 22:01:06.000000000 -0400 -+++ MathWar-0.2.5/src/support.c 2008-03-12 22:11:22.000000000 -0400 +--- mathwar-0.2.5.orig/src/support.c 2009-12-07 20:22:00.000000000 -0500 ++++ mathwar-0.2.5/src/support.c 2009-12-07 20:23:12.000000000 -0500 @@ -92,7 +92,7 @@ /* * Use pixbuf to load and render the file. @@ -133,10 +134,10 @@ } - +*/ -Index: MathWar-0.2.5/src/support.h +Index: mathwar-0.2.5/src/support.h =================================================================== ---- MathWar-0.2.5.orig/src/support.h 2008-03-12 22:01:06.000000000 -0400 -+++ MathWar-0.2.5/src/support.h 2008-03-12 22:11:22.000000000 -0400 +--- mathwar-0.2.5.orig/src/support.h 2009-12-07 20:22:00.000000000 -0500 ++++ mathwar-0.2.5/src/support.h 2009-12-07 20:23:12.000000000 -0500 @@ -61,5 +61,5 @@ const gchar *filename, gboolean gnome_pixmap); Modified: packages/trunk/mathwar/debian/patches/20_autofiles.diff =================================================================== --- packages/trunk/mathwar/debian/patches/20_autofiles.diff 2009-12-08 01:11:57 UTC (rev 10588) +++ packages/trunk/mathwar/debian/patches/20_autofiles.diff 2009-12-08 01:36:42 UTC (rev 10589) @@ -1,6 +1,8 @@ -diff -urN MathWar-0.2.5.orig/aclocal.m4 MathWar-0.2.5/aclocal.m4 ---- MathWar-0.2.5.orig/aclocal.m4 2007-04-15 19:42:51.000000000 -0400 -+++ MathWar-0.2.5/aclocal.m4 2008-03-12 20:57:18.000000000 -0400 +Description: Refresh autotools files to pick up GTK2. +Index: mathwar-0.2.5/aclocal.m4 +=================================================================== +--- mathwar-0.2.5.orig/aclocal.m4 2009-12-07 20:22:00.000000000 -0500 ++++ mathwar-0.2.5/aclocal.m4 2009-12-07 20:24:08.000000000 -0500 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.9.6 -*- Autoconf -*- +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- @@ -1100,9 +1102,10 @@ m4_include([m4/lib-ld.m4]) m4_include([m4/lib-link.m4]) m4_include([m4/lib-prefix.m4]) -diff -urN MathWar-0.2.5.orig/config.h.in MathWar-0.2.5/config.h.in ---- MathWar-0.2.5.orig/config.h.in 2005-07-22 21:07:30.000000000 -0400 -+++ MathWar-0.2.5/config.h.in 2008-03-12 20:57:22.000000000 -0400 +Index: mathwar-0.2.5/config.h.in +=================================================================== +--- mathwar-0.2.5.orig/config.h.in 2009-12-07 20:22:00.000000000 -0500 ++++ mathwar-0.2.5/config.h.in 2009-12-07 20:24:08.000000000 -0500 @@ -22,39 +22,6 @@ /* Define if you have the iconv() function. */ #undef HAVE_ICONV @@ -1143,9 +1146,10 @@ /* Name of package */ #undef PACKAGE -diff -urN MathWar-0.2.5.orig/configure MathWar-0.2.5/configure ---- MathWar-0.2.5.orig/configure 2007-04-15 19:42:54.000000000 -0400 -+++ MathWar-0.2.5/configure 2008-03-12 20:57:21.000000000 -0400 +Index: mathwar-0.2.5/configure +=================================================================== +--- mathwar-0.2.5.orig/configure 2009-12-07 20:22:00.000000000 -0500 ++++ mathwar-0.2.5/configure 2009-12-07 20:24:08.000000000 -0500 @@ -1,27 +1,56 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. @@ -10843,9 +10847,10 @@ { (exit 0); exit 0; } _ACEOF -diff -urN MathWar-0.2.5.orig/configure.in MathWar-0.2.5/configure.in ---- MathWar-0.2.5.orig/configure.in 2007-04-15 19:40:38.000000000 -0400 -+++ MathWar-0.2.5/configure.in 2008-03-12 20:52:33.000000000 -0400 +Index: mathwar-0.2.5/configure.in +=================================================================== +--- mathwar-0.2.5.orig/configure.in 2009-12-07 20:22:00.000000000 -0500 ++++ mathwar-0.2.5/configure.in 2009-12-07 20:24:08.000000000 -0500 @@ -25,9 +25,6 @@ AM_CONFIG_HEADER(config.h) @@ -10876,9 +10881,10 @@ # Set PACKAGE_LOCALE_DIR in config.h if test "x${prefix}" = "xNONE"; then AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, -diff -urN MathWar-0.2.5.orig/depcomp MathWar-0.2.5/depcomp ---- MathWar-0.2.5.orig/depcomp 2005-12-19 10:38:26.000000000 -0500 -+++ MathWar-0.2.5/depcomp 2008-03-12 20:57:23.000000000 -0400 +Index: mathwar-0.2.5/depcomp +=================================================================== +--- mathwar-0.2.5.orig/depcomp 2009-12-07 20:22:00.000000000 -0500 ++++ mathwar-0.2.5/depcomp 2009-12-07 20:24:08.000000000 -0500 @@ -1,9 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects @@ -11029,9 +11035,10 @@ # in $dir$base.o.d. We have to check for both files, because # one of the two compilations can be disabled. We should prefer # $dir$base.o.d over $dir.libs/$base.o.d because the latter is -diff -urN MathWar-0.2.5.orig/INSTALL MathWar-0.2.5/INSTALL ---- MathWar-0.2.5.orig/INSTALL 2005-12-19 10:38:26.000000000 -0500 -+++ MathWar-0.2.5/INSTALL 2008-03-12 20:57:23.000000000 -0400 +Index: mathwar-0.2.5/INSTALL +=================================================================== +--- mathwar-0.2.5.orig/INSTALL 2009-12-07 20:22:00.000000000 -0500 ++++ mathwar-0.2.5/INSTALL 2009-12-07 20:24:08.000000000 -0500 @@ -1,8 +1,8 @@ Installation Instructions ************************* @@ -11153,9 +11160,10 @@ `configure' Invocation ====================== -diff -urN MathWar-0.2.5.orig/install-sh MathWar-0.2.5/install-sh ---- MathWar-0.2.5.orig/install-sh 2005-12-19 10:38:26.000000000 -0500 -+++ MathWar-0.2.5/install-sh 2008-03-12 20:57:23.000000000 -0400 +Index: mathwar-0.2.5/install-sh +=================================================================== +--- mathwar-0.2.5.orig/install-sh 2009-12-07 20:22:00.000000000 -0500 ++++ mathwar-0.2.5/install-sh 2009-12-07 20:24:08.000000000 -0500 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile @@ -11801,9 +11809,10 @@ # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) -diff -urN MathWar-0.2.5.orig/m4/Makefile.in MathWar-0.2.5/m4/Makefile.in ---- MathWar-0.2.5.orig/m4/Makefile.in 2007-04-15 19:42:53.000000000 -0400 -+++ MathWar-0.2.5/m4/Makefile.in 2008-03-12 20:57:23.000000000 -0400 +Index: mathwar-0.2.5/m4/Makefile.in +=================================================================== +--- mathwar-0.2.5.orig/m4/Makefile.in 2009-12-07 20:22:00.000000000 -0500 ++++ mathwar-0.2.5/m4/Makefile.in 2009-12-07 20:24:08.000000000 -0500 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -12077,9 +12086,10 @@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. -diff -urN MathWar-0.2.5.orig/Makefile.in MathWar-0.2.5/Makefile.in ---- MathWar-0.2.5.orig/Makefile.in 2007-04-15 19:42:53.000000000 -0400 -+++ MathWar-0.2.5/Makefile.in 2008-03-12 20:57:23.000000000 -0400 +Index: mathwar-0.2.5/Makefile.in +=================================================================== +--- mathwar-0.2.5.orig/Makefile.in 2009-12-07 20:22:00.000000000 -0500 ++++ mathwar-0.2.5/Makefile.in 2009-12-07 20:24:08.000000000 -0500 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -12539,9 +12549,10 @@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. -diff -urN MathWar-0.2.5.orig/missing MathWar-0.2.5/missing ---- MathWar-0.2.5.orig/missing 2005-12-19 10:38:26.000000000 -0500 -+++ MathWar-0.2.5/missing 2008-03-12 20:57:23.000000000 -0400 +Index: mathwar-0.2.5/missing +=================================================================== +--- mathwar-0.2.5.orig/missing 2009-12-07 20:22:00.000000000 -0500 ++++ mathwar-0.2.5/missing 2009-12-07 20:24:08.000000000 -0500 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. @@ -12724,9 +12735,10 @@ *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 -diff -urN MathWar-0.2.5.orig/mkinstalldirs MathWar-0.2.5/mkinstalldirs ---- MathWar-0.2.5.orig/mkinstalldirs 2006-02-22 04:56:57.000000000 -0500 -+++ MathWar-0.2.5/mkinstalldirs 2008-03-12 20:57:23.000000000 -0400 +Index: mathwar-0.2.5/mkinstalldirs +=================================================================== +--- mathwar-0.2.5.orig/mkinstalldirs 2009-12-07 20:22:00.000000000 -0500 ++++ mathwar-0.2.5/mkinstalldirs 2009-12-07 20:24:08.000000000 -0500 @@ -1,7 +1,7 @@ #! /bin/sh # mkinstalldirs --- make directory hierarchy @@ -12810,9 +12822,10 @@ done done -diff -urN MathWar-0.2.5.orig/pixmaps/Makefile.in MathWar-0.2.5/pixmaps/Makefile.in ---- MathWar-0.2.5.orig/pixmaps/Makefile.in 2007-04-15 19:42:53.000000000 -0400 -+++ MathWar-0.2.5/pixmaps/Makefile.in 2008-03-12 20:57:23.000000000 -0400 +Index: mathwar-0.2.5/pixmaps/Makefile.in +=================================================================== +--- mathwar-0.2.5.orig/pixmaps/Makefile.in 2009-12-07 20:22:00.000000000 -0500 ++++ mathwar-0.2.5/pixmaps/Makefile.in 2009-12-07 20:24:08.000000000 -0500 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -13111,9 +13124,10 @@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. -diff -urN MathWar-0.2.5.orig/src/Makefile.am MathWar-0.2.5/src/Makefile.am ---- MathWar-0.2.5.orig/src/Makefile.am 2002-11-18 11:10:53.000000000 -0500 -+++ MathWar-0.2.5/src/Makefile.am 2008-03-12 20:48:36.000000000 -0400 +Index: mathwar-0.2.5/src/Makefile.am +=================================================================== +--- mathwar-0.2.5.orig/src/Makefile.am 2009-12-07 20:22:00.000000000 -0500 ++++ mathwar-0.2.5/src/Makefile.am 2009-12-07 20:24:08.000000000 -0500 @@ -27,7 +27,8 @@ INCLUDES = \ -I$(top_srcdir)/intl \ @@ -13131,9 +13145,10 @@ - $(GDK_PIXBUF_LIBS) + $(GDK_PIXBUF_LIBS) \ + @GNOME_LIBS@ -diff -urN MathWar-0.2.5.orig/src/Makefile.in MathWar-0.2.5/src/Makefile.in ---- MathWar-0.2.5.orig/src/Makefile.in 2007-04-15 19:42:53.000000000 -0400 -+++ MathWar-0.2.5/src/Makefile.in 2008-03-12 20:57:23.000000000 -0400 +Index: mathwar-0.2.5/src/Makefile.in +=================================================================== +--- mathwar-0.2.5.orig/src/Makefile.in 2009-12-07 20:22:00.000000000 -0500 ++++ mathwar-0.2.5/src/Makefile.in 2009-12-07 20:24:08.000000000 -0500 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. Modified: packages/trunk/mathwar/debian/patches/30_desktop_file.diff =================================================================== --- packages/trunk/mathwar/debian/patches/30_desktop_file.diff 2009-12-08 01:11:57 UTC (rev 10588) +++ packages/trunk/mathwar/debian/patches/30_desktop_file.diff 2009-12-08 01:36:42 UTC (rev 10589) @@ -1,7 +1,9 @@ -diff -urN MathWar-0.2.5.orig/MathWar.desktop MathWar-0.2.5/MathWar.desktop ---- MathWar-0.2.5.orig/MathWar.desktop 2000-11-11 17:52:24.000000000 -0500 -+++ MathWar-0.2.5/MathWar.desktop 2008-03-12 23:25:26.000000000 -0400 -@@ -1,8 +1,7 @@ +Description: Fix up upstream desktop file to be more freedesktop compliant. +Index: mathwar-0.2.5/MathWar.desktop +=================================================================== +--- mathwar-0.2.5.orig/MathWar.desktop 2009-12-07 20:22:00.000000000 -0500 ++++ mathwar-0.2.5/MathWar.desktop 2009-12-07 20:35:10.000000000 -0500 +@@ -1,8 +1,8 @@ - [Desktop Entry] Name=MathWar @@ -9,7 +11,7 @@ Exec=mathwar -Icon=mathwar.png -Terminal=0 --Type=Application +Icon=mathwar +Terminal=false -+Type=Education;Math; + Type=Application ++Categories=Education;Math; _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits