tags 665530 + pending
thanks

Dear maintainer,

I've prepared an NMU for getstream with Michael's patch (versioned as
20081204-1.2) and uploaded it to DELAYED/2. Please feel free to tell
me if I should delay it longer.

Regards.

-- 
 .''`.  Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06
 : :' : Debian GNU/Linux user, admin, and developer  -  http://www.debian.org/
 `. `'  Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe
   `-   NP: Anouar Brahem: Déjà la nuit
diff -u getstream-20081204/debian/changelog getstream-20081204/debian/changelog
--- getstream-20081204/debian/changelog
+++ getstream-20081204/debian/changelog
@@ -1,3 +1,13 @@
+getstream (20081204-1.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "Including individual glib headers no longer supported":
+    add debian/patches/glib-single-include.dpatch from Michael Biebl:
+    don't include individual headers.
+    (Closes: #665530)
+
+ -- gregor herrmann <gre...@debian.org>  Sat, 18 May 2013 19:54:38 +0200
+
 getstream (20081204-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -u getstream-20081204/debian/patches/00list getstream-20081204/debian/patches/00list
--- getstream-20081204/debian/patches/00list
+++ getstream-20081204/debian/patches/00list
@@ -2,0 +3 @@
+glib-single-include
only in patch2:
unchanged:
--- getstream-20081204.orig/debian/patches/glib-single-include.dpatch
+++ getstream-20081204/debian/patches/glib-single-include.dpatch
@@ -0,0 +1,90 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## glib-single-include.dpatch by Michael Biebl <bi...@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix glib include headers
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' getstream-20081204~/config.c getstream-20081204/config.c
+--- getstream-20081204~/config.c	2012-12-16 05:45:37.000000000 +0100
++++ getstream-20081204/config.c	2012-12-16 05:46:06.690795825 +0100
+@@ -10,7 +10,7 @@
+ #include <strings.h>
+ #include <string.h>
+ 
+-#include <glib/glist.h>
++#include <glib.h>
+ 
+ #include "config.h"
+ #include "libconf.h"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' getstream-20081204~/config.h getstream-20081204/config.h
+--- getstream-20081204~/config.h	2012-12-16 05:45:37.000000000 +0100
++++ getstream-20081204/config.h	2012-12-16 05:46:06.690795825 +0100
+@@ -1,5 +1,5 @@
+ 
+-#include <glib/glist.h>
++#include <glib.h>
+ 
+ #include "getstream.h"
+ 
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' getstream-20081204~/getstream.h getstream-20081204/getstream.h
+--- getstream-20081204~/getstream.h	2012-12-16 05:45:37.000000000 +0100
++++ getstream-20081204/getstream.h	2012-12-16 05:46:06.690795825 +0100
+@@ -10,7 +10,7 @@
+ #include <linux/dvb/frontend.h>
+ 
+ #include <event.h>
+-#include <glib/glist.h>
++#include <glib.h>
+ 
+ #include "sap.h"
+ #include "psi.h"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' getstream-20081204~/libhttp.c getstream-20081204/libhttp.c
+--- getstream-20081204~/libhttp.c	2012-12-16 05:45:37.000000000 +0100
++++ getstream-20081204/libhttp.c	2012-12-16 05:46:06.690795825 +0100
+@@ -13,7 +13,7 @@
+ #include <stdio.h>
+ #include <stdarg.h>
+ 
+-#include <glib/glist.h>
++#include <glib.h>
+ 
+ #include "libhttp.h"
+ 
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' getstream-20081204~/libhttp.h getstream-20081204/libhttp.h
+--- getstream-20081204~/libhttp.h	2012-12-16 05:45:37.000000000 +0100
++++ getstream-20081204/libhttp.h	2012-12-16 05:46:06.690795825 +0100
+@@ -7,8 +7,7 @@
+ #include <netinet/in.h>
+ #include <event.h>
+ 
+-#include <glib/glist.h>
+-#include <glib/ghash.h>
++#include <glib.h>
+ 
+ 
+ #define MAX_HEADER_SIZE	3000
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' getstream-20081204~/output.h getstream-20081204/output.h
+--- getstream-20081204~/output.h	2012-12-16 05:45:37.000000000 +0100
++++ getstream-20081204/output.h	2012-12-16 05:46:06.690795825 +0100
+@@ -4,7 +4,7 @@
+ #include "getstream.h"
+ #include "libhttp.h"
+ 
+-#include <glib/glist.h>
++#include <glib.h>
+ 
+ #include <event.h>
+ 
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' getstream-20081204~/output_http.c getstream-20081204/output_http.c
+--- getstream-20081204~/output_http.c	2012-12-16 05:45:37.000000000 +0100
++++ getstream-20081204/output_http.c	2012-12-16 05:46:06.694795868 +0100
+@@ -5,7 +5,7 @@
+ #include <string.h>
+ #include <stdio.h>
+ 
+-#include <glib/glist.h>
++#include <glib.h>
+ 
+ #include "output.h"
+ #include "simplebuffer.h"

Attachment: signature.asc
Description: Digital signature

Reply via email to