[atomix] 12/32: Drop all patches. They were merged or fixed upstream.

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository atomix.

commit fb16447e83e58d240de9554fcd333182ba538c3a
Author: Markus Koschany <apo at gambaru.de>
Date:   Thu Mar 19 16:51:47 2015 +0100

    Drop all patches. They were merged or fixed upstream.
---
 debian/patches/about.patch           | 51 ------------------------------------
 debian/patches/add-lm-to-LDADD.patch | 20 --------------
 debian/patches/desktop.patch         | 30 ---------------------
 debian/patches/series                |  3 ---
 4 files changed, 104 deletions(-)

diff --git a/debian/patches/about.patch b/debian/patches/about.patch
deleted file mode 100644
index 2dbd1b4..0000000
--- a/debian/patches/about.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Description: use convenience function for about dialog and fix close button
-Origin: other, https://bugs.launchpad.net/ubuntu/+source/atomix/+bug/173772
-Author: Marshall Scorcio <marshall.scorcio at gmail.com>
-Acked-By: Petter Reinholdtsen <pere at debian.org>
-Reviewed-By: Guilherme de Siqueira Pastore <gpastore at debian.org>
-Bug-Debian: http://bugs.debian.org/495714
-Last-Update: 2013-02-02
-
----
- src/main.c |   21 +++++++++------------
- 1 file changed, 9 insertions(+), 12 deletions(-)
-
-diff --git a/src/main.c b/src/main.c
-index 0b2dd2a..016c9b4 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -152,8 +152,6 @@ static void verb_EditPreferences_cb (BonoboUIComponent * uic,
- static void verb_HelpAbout_cb (BonoboUIComponent *uic, gpointer user_data,
- 			       const char *cname)
- {
--  GtkWidget *dlg;
--
-   const char *authors[] =
-     {
-       "Guilherme de S. Pastore <gpastore at gnome.org>",
-@@ -167,16 +165,15 @@ static void verb_HelpAbout_cb (BonoboUIComponent *uic, gpointer user_data,
-       NULL
-     };
- 
--  dlg = gtk_about_dialog_new ();
--  gtk_about_dialog_set_name (GTK_ABOUT_DIALOG(dlg), "Atomix");
--  gtk_about_dialog_set_version (GTK_ABOUT_DIALOG(dlg), VERSION);
--  gtk_about_dialog_set_comments (GTK_ABOUT_DIALOG(dlg), _("A puzzle game about atoms and molecules"));
--  gtk_about_dialog_set_website (GTK_ABOUT_DIALOG(dlg), "http://www.gnome.org/projects/atomix");
--  gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG(dlg), authors);
--  gtk_about_dialog_set_artists (GTK_ABOUT_DIALOG(dlg), artists);
--  gtk_about_dialog_set_translator_credits (GTK_ABOUT_DIALOG(dlg), _("translator-credits"));
--
--  gtk_widget_show (dlg);
-+  gtk_show_about_dialog(GTK_WINDOW(app->mainwin),
-+  					"program-name", _("Atomix"),
-+  					"version", VERSION,
-+  					"comments", _("A puzzle game about atoms and molecules"),
-+  					"website",_("http://wiki.debian.org/Games/Atomix"),
-+  					"authors", authors,
-+  					"artists", artists,
-+  					"translator_credits", _("translator-credits"),
-+  					NULL);
- }
- 
- static gboolean on_app_destroy_event (GtkWidget *widget, GdkEvent *event,
diff --git a/debian/patches/add-lm-to-LDADD.patch b/debian/patches/add-lm-to-LDADD.patch
deleted file mode 100644
index bdedce4..0000000
--- a/debian/patches/add-lm-to-LDADD.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Markus Koschany <apo at gambaru.de>
-Date: Wed, 28 Aug 2013 22:03:47 +0200
-Subject: add lm to LDADD
-
----
- src/Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index e84e597..a478103 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -26,6 +26,7 @@ atomix_DEPENDENCIES = libatomix.a
- 
- atomix_LDADD = \
- 	libatomix.a \
-+    -lm \
- 	$(ATOMIX_LIBS)
- 
- noinst_LIBRARIES = libatomix.a
diff --git a/debian/patches/desktop.patch b/debian/patches/desktop.patch
deleted file mode 100644
index e9c492f..0000000
--- a/debian/patches/desktop.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Markus Koschany <apo at gambaru.de>
-Date: Sat, 2 Feb 2013 11:30:38 +0100
-Subject: desktop
-
----
- atomix.desktop.in | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/atomix.desktop.in b/atomix.desktop.in
-index d05a669..45b28d9 100644
---- a/atomix.desktop.in
-+++ b/atomix.desktop.in
-@@ -1,13 +1,13 @@
- [Desktop Entry]
--Encoding=UTF-8
- _Name=Atomix
- _Comment=Molecule puzzle game
- Exec=atomix
--Icon=atomix-icon.png
-+Icon=/usr/share/games/atomix/atomix-logo.png
- Terminal=false
- Type=Application
--Categories=GNOME;GTK;Game;PuzzleGame;
-+Categories=GNOME;GTK;Game;LogicGame;
-+Keywords=GNOME;game;logic;puzzle;atoms;molecules;sokoban;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=atomix
- X-GNOME-Bugzilla-Component=atomix
--X-GNOME-Bugzilla-Version=2.13.x
-+X-GNOME-Bugzilla-Version=2.14.x
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 27b4959..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-desktop.patch
-about.patch
-add-lm-to-LDADD.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/atomix.git