Dear maintainers,
this is the patch for my gamine NMU for the gstreamer transition.
Cheers,
Moritz
diff -Nru gamine-1.1/debian/changelog gamine-1.1/debian/changelog
--- gamine-1.1/debian/changelog 2013-06-23 12:35:22.000000000 +0200
+++ gamine-1.1/debian/changelog 2015-11-14 23:56:50.000000000 +0100
@@ -1,3 +1,10 @@
+gamine (1.1-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Port to gstreamer 1.0 (Closes: #785832)
+
+ -- Moritz Muehlenhoff <[email protected]> Sat, 14 Nov 2015 23:56:11 +0100
+
gamine (1.1-3) unstable; urgency=low
* Add myself to uploaders.
diff -Nru gamine-1.1/debian/control gamine-1.1/debian/control
--- gamine-1.1/debian/control 2013-06-23 12:35:22.000000000 +0200
+++ gamine-1.1/debian/control 2015-11-15 00:01:52.000000000 +0100
@@ -5,7 +5,7 @@
Uploaders: Barry deFreese <[email protected]>,
Gonéri Le Bouder <[email protected]>
Build-Depends: debhelper (>= 9), libgtk2.0-dev, libcairo2-dev,
- libgstreamer0.10-dev, docbook-to-man, libgconf2-dev, libx11-dev
+ libgstreamer1.0-dev, docbook-to-man, libgconf2-dev, libx11-dev
Standards-Version: 3.9.4
Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/gamine/
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/gamine/
@@ -13,7 +13,7 @@
Package: gamine
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, gamine-data (= ${source:Version}), gstreamer0.10-plugins-good
+Depends: ${shlibs:Depends}, ${misc:Depends}, gamine-data (= ${source:Version}), gstreamer1.0-plugins-good
Description: Interactive game for young children
Gamine is a game designed for 2 years old children who are not able to use
a keyboard.
diff -Nru gamine-1.1/debian/patches/dfdf gamine-1.1/debian/patches/dfdf
--- gamine-1.1/debian/patches/dfdf 1970-01-01 01:00:00.000000000 +0100
+++ gamine-1.1/debian/patches/dfdf 2015-11-15 00:00:59.000000000 +0100
@@ -0,0 +1,48 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ gamine (1.1-3.1) unstable; urgency=medium
+ .
+ * Non-maintainer upload.
+ * Port to gstreamer 1.0 (Closes: #785832)
+Author: Moritz Muehlenhoff <[email protected]>
+Bug-Debian: https://bugs.debian.org/785832
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- gamine-1.1.orig/gamine.c
++++ gamine-1.1/gamine.c
+@@ -237,7 +237,6 @@ draw_star (GtkWidget *widget,
+ static void
+ save_picture(gamine_t *cb)
+ {
+- stat st;
+ gchar *dirname;
+ gchar *filename;
+ char buf[20];
+@@ -248,10 +247,6 @@ save_picture(gamine_t *cb)
+
+ dirname = g_build_filename(g_get_home_dir(), "gamine", NULL);
+ //if dirname not exists
+- if(stat(dirname,&st) != 0)
+- if (mkdir(dirname, 0750) < 0)
+- printf(gettext("*** error: failed to create directory %s***\n"),
+- dirname);
+ sprintf(buf,"%d-%d-%d_%d-%d-%d.png",1900 + t->tm_year,
+ t->tm_mon,t->tm_mday,t->tm_hour,t->tm_min,t->tm_sec);
+ filename = g_build_filename(dirname, buf, NULL);
diff -Nru gamine-1.1/debian/patches/gstreamer1.patch gamine-1.1/debian/patches/gstreamer1.patch
--- gamine-1.1/debian/patches/gstreamer1.patch 1970-01-01 01:00:00.000000000 +0100
+++ gamine-1.1/debian/patches/gstreamer1.patch 2015-11-14 23:55:54.000000000 +0100
@@ -0,0 +1,15 @@
+Use gstreamer 1.0
+
+--- gamine-1.1.orig/Makefile
++++ gamine-1.1/Makefile
+@@ -15,8 +15,8 @@ GCONF_SCHEMA_FILE_DIR = $(SYSCONFDIR)/gc
+ GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL = 0
+ CFLAGS += -Wall
+ #CFLAGS = -Wall -g
+-CPPFLAGS += $(shell pkg-config --cflags gtk+-2.0 cairo glib-2.0 gstreamer-0.10 gconf-2.0) -DDATADIR=\""$(PKGDATADIR)"\" -DLOCALDIR=\""$(LOCALEDIR)"\"
+-LDLIBS = $(shell pkg-config --libs gtk+-2.0 cairo glib-2.0 gstreamer-0.10 gconf-2.0) -lX11 -lm -DDATADIR=\""$(PKGDATADIR)"\" -DLOCALDIR=\""$(LOCALEDIR)"\"
++CPPFLAGS += $(shell pkg-config --cflags gtk+-2.0 cairo glib-2.0 gstreamer-1.0 gconf-2.0) -DDATADIR=\""$(PKGDATADIR)"\" -DLOCALDIR=\""$(LOCALEDIR)"\"
++LDLIBS = $(shell pkg-config --libs gtk+-2.0 cairo glib-2.0 gstreamer-1.0 gconf-2.0) -lX11 -lm -DDATADIR=\""$(PKGDATADIR)"\" -DLOCALDIR=\""$(LOCALEDIR)"\"
+ LDFLAGS += -g
+ CC = gcc
+ target = gamine
diff -Nru gamine-1.1/debian/patches/series gamine-1.1/debian/patches/series
--- gamine-1.1/debian/patches/series 2013-06-23 12:35:22.000000000 +0200
+++ gamine-1.1/debian/patches/series 2015-11-15 00:00:59.000000000 +0100
@@ -2,3 +2,6 @@
link-X11.diff
link-libm.patch
makefile-flags.patch
+gstreamer1.patch
+stat.patch
+dfdf
diff -Nru gamine-1.1/debian/patches/stat.patch gamine-1.1/debian/patches/stat.patch
--- gamine-1.1/debian/patches/stat.patch 1970-01-01 01:00:00.000000000 +0100
+++ gamine-1.1/debian/patches/stat.patch 2015-11-14 23:59:42.000000000 +0100
@@ -0,0 +1,38 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ gamine (1.1-3.1) unstable; urgency=medium
+ .
+ * Non-maintainer upload.
+ * Port to gstreamer 1.0 (Closes: #785832)
+Author: Moritz Muehlenhoff <[email protected]>
+Bug-Debian: https://bugs.debian.org/785832
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- gamine-1.1.orig/gamine.c
++++ gamine-1.1/gamine.c
+@@ -237,7 +237,7 @@ draw_star (GtkWidget *widget,
+ static void
+ save_picture(gamine_t *cb)
+ {
+- struct stat st;
++ stat st;
+ gchar *dirname;
+ gchar *filename;
+ char buf[20];
