diff -Nru gmotionlive-1.0/debian/changelog gmotionlive-1.0/debian/changelog --- gmotionlive-1.0/debian/changelog 2012-01-29 08:13:48.000000000 +0000 +++ gmotionlive-1.0/debian/changelog 2012-01-04 00:00:16.000000000 +0000 @@ -1,3 +1,11 @@ +gmotionlive (1.0-3) unstable; urgency=low + + * Added binary dependency in libgnomevfs2-extra (Closes: Ubuntu#573011) + * Debian source format 3.0 quilt migration + * Updated Standards-Version to 3.9.2, no changes needed. + + -- Maximiliano Curia Tue, 03 Jan 2012 20:57:07 -0300 + gmotionlive (1.0-2) unstable; urgency=low * Added dpatch dependency. diff -Nru gmotionlive-1.0/debian/compat gmotionlive-1.0/debian/compat --- gmotionlive-1.0/debian/compat 2012-01-29 08:13:48.000000000 +0000 +++ gmotionlive-1.0/debian/compat 2012-01-08 15:06:23.000000000 +0000 @@ -1 +1 @@ -5 +7 diff -Nru gmotionlive-1.0/debian/control gmotionlive-1.0/debian/control --- gmotionlive-1.0/debian/control 2012-01-29 08:13:48.000000000 +0000 +++ gmotionlive-1.0/debian/control 2012-01-08 15:12:57.000000000 +0000 @@ -2,14 +2,14 @@ Section: graphics Priority: extra Maintainer: Maximiliano Curia -Build-Depends: debhelper (>= 5), dpatch, libgtk2.0-dev, libgnomevfs2-dev, pkg-config +Build-Depends: debhelper (>= 7.0.50~), quilt, libgtk2.0-dev, libgnomevfs2-dev, pkg-config Homepage: http://gate.vitsch.net/~pe1rxq/gmotionlive/ -Standards-Version: 3.8.0 +Standards-Version: 3.9.2 Package: gmotionlive Architecture: any -Depends: ${shlibs:Depends} -Description: A simple multipart/x-mixed-replace viewer +Depends: ${shlibs:Depends}, ${misc:Depends}, libgnomevfs2-extra +Description: Simple multipart/x-mixed-replace viewer gmotionlive is a simple gtk viewer for streaming webcams that use multipart/x-mixed-replace streams. . diff -Nru gmotionlive-1.0/debian/patches/001-unsign_sign_chars.dpatch gmotionlive-1.0/debian/patches/001-unsign_sign_chars.dpatch --- gmotionlive-1.0/debian/patches/001-unsign_sign_chars.dpatch 2012-01-29 08:13:48.000000000 +0000 +++ gmotionlive-1.0/debian/patches/001-unsign_sign_chars.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 001-unsign_sign_chars.dpatch by Maximiliano Curia -## -## DP: Fixes useless gcc signed/unsigned char warnings - -@DPATCH@ -diff -urNad gmotionlive-1.0~/gmotionlive.c gmotionlive-1.0/gmotionlive.c ---- gmotionlive-1.0~/gmotionlive.c 2005-04-12 05:52:11.000000000 -0300 -+++ gmotionlive-1.0/gmotionlive.c 2008-07-15 15:46:52.000000000 -0300 -@@ -34,10 +34,10 @@ - int netcam_data = 0; - int netcam_boundarylen; - int netcam_offset; --unsigned char databuf[8192]; --unsigned char boundary[4096]; --unsigned char *boundarystart; --unsigned char *buf = databuf + 4096; -+char databuf[8192]; -+char boundary[4096]; -+char *boundarystart; -+char *buf = databuf + 4096; - int netcam_count = 0; - int netcam_time = 0; - int netcam_timecount = 0; -@@ -96,7 +96,7 @@ - size_t netcam_write(void *ptr, size_t size, size_t nmemb, void *stream) - { - int i, j; -- unsigned char *data = ptr; -+ char *data = ptr; - - /* Write the entire stream to stdout for debugging (or recording): */ - /*write(2, data, size * nmemb);*/ -@@ -150,7 +150,7 @@ - } - } - if (netcam_state == NETCAM_STATE_DATA) { -- unsigned char *start; -+ char *start; - int checklen; - int boundoff = 0; - int back = i + 1; -@@ -185,7 +185,7 @@ - } - } - if (j) { -- if (FALSE == gdk_pixbuf_loader_write(pixbufloader, start, j, NULL)) { -+ if (FALSE == gdk_pixbuf_loader_write(pixbufloader, (unsigned char*) start, j, NULL)) { - netcam_linesize = 1; - i = back; - netcam_state = NETCAM_STATE_START; diff -Nru gmotionlive-1.0/debian/patches/002-g_object_unref.dpatch gmotionlive-1.0/debian/patches/002-g_object_unref.dpatch --- gmotionlive-1.0/debian/patches/002-g_object_unref.dpatch 2012-01-29 08:13:48.000000000 +0000 +++ gmotionlive-1.0/debian/patches/002-g_object_unref.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,40 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 002-g_object_unref.dpatch by Maximiliano Curia -## -## DP: Fixes a major memory leakage - -@DPATCH@ -diff -urNad gmotionlive-1.0~/gmotionlive.c gmotionlive-1.0/gmotionlive.c ---- gmotionlive-1.0~/gmotionlive.c 2005-04-12 05:52:11.000000000 -0300 -+++ gmotionlive-1.0/gmotionlive.c 2008-07-15 15:55:31.000000000 -0300 -@@ -86,7 +86,6 @@ - if (!newpixbuf) - return; - gtk_image_set_from_pixbuf(GTK_IMAGE(gtkimage), newpixbuf); -- g_object_unref(newpixbuf); - gtk_widget_show(gtkimage); - gtk_window_resize(GTK_WINDOW(window), 100, 100); - gtk_widget_show_all(window); -@@ -131,6 +130,8 @@ - i++; - netcam_linesize = 0; - netcam_state = NETCAM_STATE_DATA; -+ if ( pixbufloader ) -+ g_object_unref(pixbufloader); - pixbufloader = gdk_pixbuf_loader_new(); - if (!pixbufloader) { - g_print("ohoh6\n"); -@@ -194,9 +195,11 @@ - i += j; - } - if (netcam_state == NETCAM_STATE_START) { -- netcam_linesize = 1; -- netcam_line[0] = 0; -+ netcam_linesize = 1; -+ netcam_line[0] = 0; -+ if ( G_IS_OBJECT(pixbufloader) ) { - gdk_pixbuf_loader_close(pixbufloader, NULL); -+ } - } - memcpy(boundarystart + boundoff, start + checklen, netcam_boundarylen); - } diff -Nru gmotionlive-1.0/debian/patches/00list gmotionlive-1.0/debian/patches/00list --- gmotionlive-1.0/debian/patches/00list 2012-01-29 08:13:48.000000000 +0000 +++ gmotionlive-1.0/debian/patches/00list 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -001-unsign_sign_chars -002-g_object_unref diff -Nru gmotionlive-1.0/debian/patches/g_object_unref gmotionlive-1.0/debian/patches/g_object_unref --- gmotionlive-1.0/debian/patches/g_object_unref 1970-01-01 00:00:00.000000000 +0000 +++ gmotionlive-1.0/debian/patches/g_object_unref 2012-01-08 15:09:57.000000000 +0000 @@ -0,0 +1,40 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 002-g_object_unref.dpatch by Maximiliano Curia +## +## DP: Fixes a major memory leakage + +@DPATCH@ +diff -urNad gmotionlive-1.0~/gmotionlive.c gmotionlive-1.0/gmotionlive.c +--- gmotionlive-1.0~/gmotionlive.c 2005-04-12 05:52:11.000000000 -0300 ++++ gmotionlive-1.0/gmotionlive.c 2008-07-15 15:55:31.000000000 -0300 +@@ -86,7 +86,6 @@ + if (!newpixbuf) + return; + gtk_image_set_from_pixbuf(GTK_IMAGE(gtkimage), newpixbuf); +- g_object_unref(newpixbuf); + gtk_widget_show(gtkimage); + gtk_window_resize(GTK_WINDOW(window), 100, 100); + gtk_widget_show_all(window); +@@ -131,6 +130,8 @@ + i++; + netcam_linesize = 0; + netcam_state = NETCAM_STATE_DATA; ++ if ( pixbufloader ) ++ g_object_unref(pixbufloader); + pixbufloader = gdk_pixbuf_loader_new(); + if (!pixbufloader) { + g_print("ohoh6\n"); +@@ -194,9 +195,11 @@ + i += j; + } + if (netcam_state == NETCAM_STATE_START) { +- netcam_linesize = 1; +- netcam_line[0] = 0; ++ netcam_linesize = 1; ++ netcam_line[0] = 0; ++ if ( G_IS_OBJECT(pixbufloader) ) { + gdk_pixbuf_loader_close(pixbufloader, NULL); ++ } + } + memcpy(boundarystart + boundoff, start + checklen, netcam_boundarylen); + } diff -Nru gmotionlive-1.0/debian/patches/series gmotionlive-1.0/debian/patches/series --- gmotionlive-1.0/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ gmotionlive-1.0/debian/patches/series 2012-01-08 15:09:57.000000000 +0000 @@ -0,0 +1,2 @@ +g_object_unref +unsign_sign_chars diff -Nru gmotionlive-1.0/debian/patches/unsign_sign_chars gmotionlive-1.0/debian/patches/unsign_sign_chars --- gmotionlive-1.0/debian/patches/unsign_sign_chars 1970-01-01 00:00:00.000000000 +0000 +++ gmotionlive-1.0/debian/patches/unsign_sign_chars 2012-01-08 15:09:38.000000000 +0000 @@ -0,0 +1,51 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 001-unsign_sign_chars.dpatch by Maximiliano Curia +## +## DP: Fixes useless gcc signed/unsigned char warnings + +@DPATCH@ +diff -urNad gmotionlive-1.0~/gmotionlive.c gmotionlive-1.0/gmotionlive.c +--- gmotionlive-1.0~/gmotionlive.c 2005-04-12 05:52:11.000000000 -0300 ++++ gmotionlive-1.0/gmotionlive.c 2008-07-15 15:46:52.000000000 -0300 +@@ -34,10 +34,10 @@ + int netcam_data = 0; + int netcam_boundarylen; + int netcam_offset; +-unsigned char databuf[8192]; +-unsigned char boundary[4096]; +-unsigned char *boundarystart; +-unsigned char *buf = databuf + 4096; ++char databuf[8192]; ++char boundary[4096]; ++char *boundarystart; ++char *buf = databuf + 4096; + int netcam_count = 0; + int netcam_time = 0; + int netcam_timecount = 0; +@@ -96,7 +96,7 @@ + size_t netcam_write(void *ptr, size_t size, size_t nmemb, void *stream) + { + int i, j; +- unsigned char *data = ptr; ++ char *data = ptr; + + /* Write the entire stream to stdout for debugging (or recording): */ + /*write(2, data, size * nmemb);*/ +@@ -150,7 +150,7 @@ + } + } + if (netcam_state == NETCAM_STATE_DATA) { +- unsigned char *start; ++ char *start; + int checklen; + int boundoff = 0; + int back = i + 1; +@@ -185,7 +185,7 @@ + } + } + if (j) { +- if (FALSE == gdk_pixbuf_loader_write(pixbufloader, start, j, NULL)) { ++ if (FALSE == gdk_pixbuf_loader_write(pixbufloader, (unsigned char*) start, j, NULL)) { + netcam_linesize = 1; + i = back; + netcam_state = NETCAM_STATE_START; diff -Nru gmotionlive-1.0/debian/rules gmotionlive-1.0/debian/rules --- gmotionlive-1.0/debian/rules 2012-01-29 08:13:48.000000000 +0000 +++ gmotionlive-1.0/debian/rules 2012-01-08 15:06:05.000000000 +0000 @@ -1,62 +1,3 @@ #!/usr/bin/make -f -# -*- makefile -*- - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -include /usr/share/dpatch/dpatch.make - -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -build: build-stamp - -build-stamp: patch-stamp - dh_testdir - - $(MAKE) - - touch $@ - -clean: unpatch - dh_testdir - dh_testroot - rm -f build-stamp - - ${MAKE} clean - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - -# Build architecture-independent files here. -binary-indep: build install - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_install - dh_installman - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure unpatch patch +%: + dh $@ diff -Nru gmotionlive-1.0/debian/source/format gmotionlive-1.0/debian/source/format --- gmotionlive-1.0/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ gmotionlive-1.0/debian/source/format 2012-01-29 08:13:48.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru gmotionlive-1.0/debian/watch gmotionlive-1.0/debian/watch --- gmotionlive-1.0/debian/watch 2012-01-29 08:13:48.000000000 +0000 +++ gmotionlive-1.0/debian/watch 2012-01-08 15:06:18.000000000 +0000 @@ -1,5 +1,3 @@ # Compulsory line, this is a version 3 file version=3 - http://gate.vitsch.net/~pe1rxq/gmotionlive/ gmotionlive-(.*)\.tar\.gz -