This is an automated email from the git hooks/post-receive script. ecsv-guest pushed a commit to branch master in repository mupen64plus.
commit 57631b4642371e47d89475b116e778826a178128 Author: Sven Eckelmann <[email protected]> Date: Wed Jun 3 16:44:11 2009 +0200 Add 109-remove-nondfsg-icons.patch, don't include non-dfsg icons --- debian/changelog | 2 + debian/patches/109-remove-nondfsg-icons.patch | 101 ++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 104 insertions(+) diff --git a/debian/changelog b/debian/changelog index ffc4e3d..812893b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -39,6 +39,8 @@ mupen64plus (1.5-3) UNRELEASED; urgency=low - Add 106-system-zlib.patch, use zlib from debian instead of buildin - Add 107-system-libbz2.patch, use libbz2 from debian instead of buildin - Add 108-remove-gln64.patch, don't try to build glN64 removed from dfsg tar + - Add 109-remove-nondfsg-icons.patch, don't include non-dfsg icons which are + removed from dfsg tarball * Convert debian/copyright to new dep5 version -- Félix Arreola Rodríguez <[email protected]> Mon, 01 Jun 2009 14:42:41 +0200 diff --git a/debian/patches/109-remove-nondfsg-icons.patch b/debian/patches/109-remove-nondfsg-icons.patch new file mode 100644 index 0000000..37c30db --- /dev/null +++ b/debian/patches/109-remove-nondfsg-icons.patch @@ -0,0 +1,101 @@ +From 6a14e09d62dc9bfc62637392da56fb9e43b8ae74 Mon Sep 17 00:00:00 2001 +From: Sven Eckelmann <[email protected]> +Date: Wed, 3 Jun 2009 16:38:09 +0200 +Subject: [PATCH] Remove non-dfsg clean icons from build + + +Signed-off-by: Sven Eckelmann <[email protected]> +--- + glide64/messagebox_gtk2.c | 26 -------------------------- + glide64/messagebox_qt4.cpp | 24 ------------------------ + 2 files changed, 0 insertions(+), 50 deletions(-) + +diff --git a/glide64/messagebox_gtk2.c b/glide64/messagebox_gtk2.c +index 349666e..28acfd9 100644 +--- a/glide64/messagebox_gtk2.c ++++ b/glide64/messagebox_gtk2.c +@@ -23,12 +23,6 @@ + #include <stdarg.h> + #include <stdio.h> + +-// include icons +-#include "icons/messagebox-error.xpm" +-#include "icons/messagebox-info.xpm" +-#include "icons/messagebox-quest.xpm" +-#include "icons/messagebox-warn.xpm" +- + static gint delete_question_event(GtkWidget *widget, GdkEvent *event, gpointer data) + { + return TRUE; // undeleteable +@@ -127,26 +121,6 @@ messagebox( const char *title, int flags, const char *fmt, ... ) + gtk_box_pack_start( GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, TRUE, TRUE, 0 ); + gtk_widget_show( hbox ); + +- // icon +- switch( flags & 0x00000F00 ) +- { +- case MB_ICONWARNING: +- icon = create_pixmap_d( dialog, messagebox_warn_xpm ); +- break; +- +- case MB_ICONINFORMATION: +- icon = create_pixmap_d( dialog, messagebox_info_xpm ); +- break; +- +- case MB_ICONQUESTION: +- icon = create_pixmap_d( dialog, messagebox_quest_xpm ); +- break; +- +- case MB_ICONERROR: +- icon = create_pixmap_d( dialog, messagebox_error_xpm ); +- break; +- } +- + if( icon ) + { + gtk_box_pack_start( GTK_BOX(hbox), icon, FALSE, FALSE, 0 ); +diff --git a/glide64/messagebox_qt4.cpp b/glide64/messagebox_qt4.cpp +index e8ffc3b..9bddd86 100644 +--- a/glide64/messagebox_qt4.cpp ++++ b/glide64/messagebox_qt4.cpp +@@ -30,11 +30,6 @@ + #include <stdio.h> + #include <assert.h> + +-#include "icons/messagebox-error.xpm" +-#include "icons/messagebox-info.xpm" +-#include "icons/messagebox-quest.xpm" +-#include "icons/messagebox-warn.xpm" +- + #include "Gfx1.3.h" + #include "messagebox.h" + +@@ -75,25 +70,6 @@ int messagebox(const char *title, int flags, const char *fmt, ...) + QWaitCondition w; + e->waitCondition = &w; + +- switch( flags & 0x00000F00 ) +- { +- case MB_ICONWARNING: +- e->image = QImage(messagebox_warn_xpm); +- break; +- +- case MB_ICONINFORMATION: +- e->image = QImage(messagebox_info_xpm); +- break; +- +- case MB_ICONQUESTION: +- e->image = QImage(messagebox_quest_xpm); +- break; +- +- case MB_ICONERROR: +- e->image = QImage(messagebox_error_xpm); +- break; +- } +- + QObject* target = 0; + foreach (QWidget* w, qApp->topLevelWidgets()) { + if (w->inherits("MainWindow")) { +-- +1.6.3.1 + diff --git a/debian/patches/series b/debian/patches/series index da0f6ed..8e922b3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,3 +7,4 @@ 106-system-zlib.patch 107-system-libbz2.patch 108-remove-gln64.patch +109-remove-nondfsg-icons.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
