tags 622278 + pending
thanks

Dear maintainer,

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

Regards.
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.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Use pkg-config to get compiler flags for glib-2.0. Thanks to Steve
+    Langasek <steve.langa...@canonical.com> for the patch.
+    (Closes: #622278, LP: #749147)
+  * Add dpatch targets in debian/rules to apply the patches during build.
+
+ -- Ansgar Burchardt <ans...@debian.org>  Sun, 11 Dec 2011 12:17:55 +0100
+
 getstream (20081204-1) unstable; urgency=low
 
   * New upstream release (LP: #365658)
diff -u getstream-20081204/debian/rules getstream-20081204/debian/rules
--- getstream-20081204/debian/rules
+++ getstream-20081204/debian/rules
@@ -7,14 +7,14 @@
 
 build: build-stamp
 
-build-stamp:
+build-stamp: $(DPATCH_STAMPFN)
        dh_testdir
 
        $(MAKE)
 
        touch $@
 
-clean:
+clean: unpatch
        dh_testdir
        dh_testroot
        rm -f build-stamp configure-stamp
diff -u getstream-20081204/debian/control getstream-20081204/debian/control
--- getstream-20081204/debian/control
+++ getstream-20081204/debian/control
@@ -2,7 +2,7 @@
 Section: net
 Priority: extra
 Maintainer: Herve Rousseau <he...@moulticast.net>
-Build-Depends: debhelper (>= 5), libevent-dev, libglib2.0-dev, dpatch
+Build-Depends: debhelper (>= 5), libevent-dev, libglib2.0-dev, dpatch, 
pkg-config
 Vcs-Git: git://hydra.gt.owl.de/getstream.git 
 Standards-Version: 3.8.3
 Homepage: http://silicon-verl.de/home/flo/projects/streaming/
diff -u getstream-20081204/debian/patches/00list 
getstream-20081204/debian/patches/00list
--- getstream-20081204/debian/patches/00list
+++ getstream-20081204/debian/patches/00list
@@ -1,0 +2 @@
+use-pkgconfig
only in patch2:
unchanged:
--- getstream-20081204.orig/debian/patches/use-pkgconfig.dpatch
+++ getstream-20081204/debian/patches/use-pkgconfig.dpatch
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## use-pkgconfig.dpatch by Steve Langasek <steve.langa...@linaro.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use pkg-config instead of hard-coding a glib header path, to fix
+## DP: build failure under multiarch.
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
getstream-20081204~/Makefile getstream-20081204/Makefile
+--- getstream-20081204~/Makefile       2008-12-04 06:21:07.000000000 -0800
++++ getstream-20081204/Makefile        2011-04-11 10:19:09.659399230 -0700
+@@ -1,6 +1,6 @@
+ CC=gcc
+-CFLAGS=-O0 -g -Wall  -I. -I/usr/include/glib-2.0/ -I/usr/lib/glib-2.0/include/
+-LDFLAGS=-levent -lglib-2.0 -lpthread
++CFLAGS=-O0 -g -Wall  -I. $(shell pkg-config --cflags glib-2.0)
++LDFLAGS=-levent $(shell pkg-config --libs glib-2.0) -lpthread
+ OBJ-getstream=getstream.o fe.o crc32.o \
+       libhttp.o libconf.o config.o util.o logging.o \
+       stream.o input.o \



-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to