This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository lgeneral.
commit 1c6a73ba91775a83f3e17e3e440a8d3b10faace3 Author: Markus Koschany <[email protected]> Date: Wed Aug 12 10:48:04 2015 +0200 Drop all patches. Merged upstream. --- debian/patches/lgc-pg-man-page.patch | 36 ---------------------- .../patches/segfaults-when-running-headless.patch | 30 ------------------ debian/patches/series | 2 -- 3 files changed, 68 deletions(-) diff --git a/debian/patches/lgc-pg-man-page.patch b/debian/patches/lgc-pg-man-page.patch deleted file mode 100644 index 3cbe2e8..0000000 --- a/debian/patches/lgc-pg-man-page.patch +++ /dev/null @@ -1,36 +0,0 @@ -From: Markus Koschany <[email protected]> -Date: Fri, 26 Jun 2015 21:07:06 +0200 -Subject: lgc-pg man page - -Mention that lgc-pg requires a graphical desktop environment for the -conversion. - -Bug: https://bugs.debian.org/784259 -Forwarded: via private e-mail ---- - lgc-pg/lgc-pg.1 | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/lgc-pg/lgc-pg.1 b/lgc-pg/lgc-pg.1 -index 4dfd7d3..3a0165b 100644 ---- a/lgc-pg/lgc-pg.1 -+++ b/lgc-pg/lgc-pg.1 -@@ -22,7 +22,8 @@ lgc-pg \- Converter Tool for original Panzer General\*R Data Files - [\-s SOURCE] [\-d DEST] [\-\-defpal] [\-\-custom] [\-n NAME] [\-i ID] [\-t TACICONS] - .br - .SH DESCRIPTION --LGC-PG is a simple tool to convert the original Panzer General\*R Data into LGeneral Data Files. -+LGC-PG is a simple tool to convert the original Panzer General\*R Data into LGeneral Data Files. -+It requires a graphical desktop environment for the conversion. - .SH OPTIONS - .TP - .B \-s -@@ -48,7 +49,7 @@ This is the scenario's file name and default title. - This is the <ID> in the source file name (game<ID>.scn). If you do not specify an ID the default is O. - .TP - .B \-t <TACICONS> --If custom tactical icons are involved (scenario offers a TACICONS.SHP)this is the name of the graphical file. -+If custom tactical icons are involved (scenario offers a TACICONS.SHP)this is the name of the graphical file. - If this option is not provided it defaults to <NAME>.bmp. - .SH EXAMPLES - .TP diff --git a/debian/patches/segfaults-when-running-headless.patch b/debian/patches/segfaults-when-running-headless.patch deleted file mode 100644 index 0d13178..0000000 --- a/debian/patches/segfaults-when-running-headless.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Markus Koschany <[email protected]> -Date: Fri, 26 Jun 2015 20:41:17 +0200 -Subject: segfaults when running headless - -lgc-pg requires a graphical desktop environment for the conversion. -If it can't be detected, lgc-pg will print an error message and quit with exit -code 1. - -Bug: https://bugs.debian.org/784259 -Forwarded: via private e-mail ---- - lgc-pg/main.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/lgc-pg/main.c b/lgc-pg/main.c -index 989bda3..2017af0 100644 ---- a/lgc-pg/main.c -+++ b/lgc-pg/main.c -@@ -168,7 +168,10 @@ int main( int argc, char **argv ) - } - - /* SDL required for graphical conversion */ -- SDL_Init( SDL_INIT_VIDEO | SDL_INIT_TIMER ); -+ if (SDL_Init( SDL_INIT_VIDEO | SDL_INIT_TIMER ) < 0) { -+ printf( "lgc-pg requires a running graphical desktop environment. \n"); -+ exit( 1 ); -+ } - SDL_SetVideoMode( 320, 240, 16, SDL_SWSURFACE ); - atexit( SDL_Quit ); - /* show nice image */ diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index af9d511..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -segfaults-when-running-headless.patch -lgc-pg-man-page.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/lgeneral.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
