From: Ben Hutchings <ben@decadent.org.uk>
Date: Mon, 7 Feb 2011 12:31:12 +0000 (+0000)
Subject: Merge remote branch 'jcristau/master'
X-Git-Tag: 1.2.10~1
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=videolink.git;a=commitdiff_plain;h=cd758c798d0c48f8161e5102faf8d862ba76aa2d

Merge remote branch 'jcristau/master'

Update ChangeLog based on debian/changelog entry 1.2.9-2.1.

Resolve conflict on setting of moz_ldflags_extra in Makefile.
---

cd758c798d0c48f8161e5102faf8d862ba76aa2d
diff --cc ChangeLog
index 4b1bb2f,dffaad7..7d3e9ba
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,3 +1,16 @@@
 +videolink (1.2.10) UNRELEASED; urgency=low
 +
++  [ Ben Hutchings ]
 +  * List all needed libraries to the linker.  We were accidentally
 +    depending on the behaviour of GNU ld, which treats 'needed' as
 +    transitive by default - Debian bug #556760
 +
++  [ Nobuhiro Iwamatsu ]
++  * Define XPCOM_GLUE_USE_NSPR, link against nspr - Debian bug #611389
++  * Include <cstdio> in xpcom_support.cpp - Debian bug #611427
++
 + -- Ben Hutchings <ben@decadent.org.uk>  Wed, 18 Nov 2009 02:42:40 +0000
 +
  videolink (1.2.9) unstable; urgency=low
  
    * Add support for XULRunner 1.9.1, requiring a version match down to
diff --cc Makefile
index 72ce839,c250490..7238b7b
--- a/Makefile
+++ b/Makefile
@@@ -8,11 -8,9 +8,12 @@@ mandir := $(sharedir)/ma
  ifeq ($(shell pkg-config --atleast-version 1.9 mozilla-gtkmozembed-embedding && echo yes),yes)
      moz_name := xulrunner-1.9
      moz_pc := mozilla-gtkmozembed-embedding
-     moz_cppflags_extra := $(shell pkg-config --cflags xulrunner-nspr)
+     moz_cppflags_extra := $(shell pkg-config --cflags xulrunner-nspr) -DXPCOM_GLUE_USE_NSPR
      moz_unstable_cppflags_extra :=
+     moz_ldflags_extra := $(shell pkg-config --libs xulrunner-nspr)
 +    # libxpcomglue needs libdl, but mozilla-gtkmozembed-embedding.pc
 +    # doesn't mention it.
-     moz_ldflags_extra := -ldl
++    moz_ldflags_extra += -ldl
  else
      ifeq ($(shell pkg-config --exists xulrunner-gtkmozembed && echo yes),yes)
      moz_name := xulrunner