diff -u google-gadgets-0.11.2/debian/changelog google-gadgets-0.11.2/debian/changelog --- google-gadgets-0.11.2/debian/changelog +++ google-gadgets-0.11.2/debian/changelog @@ -1,3 +1,10 @@ +google-gadgets (0.11.2-1ubuntu1) lucid; urgency=low + + * Merge from Debian experimental (LP: #513163), remaining changes: + - update debian/patches/03_GRE_Version.patch for xulrunner 1.9.2 + + -- Micah Gersten Fri, 19 Mar 2010 10:34:29 -0500 + google-gadgets (0.11.2-1) experimental; urgency=low [ Pino Toscano ] @@ -54,6 +61,17 @@ -- Debian Krap Maintainers Tue, 19 Jan 2010 19:30:48 +0100 +google-gadgets (0.11.1-1.1ubuntu1) lucid; urgency=low + + * Merge from Debian unstable (LP: #382650, LP: #458773), remaining changes: + - debian/patches/13_fix_onOpen_typo.patch + * debian/control, debian/google-gadgets-common.install: Use internal + libsoup-based xml_http_request, not curl-based one. LP: #458773 + * debian/patches/14_svn_1264_gtk_events.patch: Patch from upstream SVN to + fix events using gtk 2.18 or higher. (Upstream bug #335) + + -- Michael Terry Thu, 21 Jan 2010 09:58:15 -0500 + google-gadgets (0.11.1-1.1) unstable; urgency=low * Non-maintainer upload to fix broken ABI: @@ -88,6 +106,32 @@ -- Mike Hommey Sat, 10 Oct 2009 16:08:37 +0200 +google-gadgets (0.10.5-0.2ubuntu3) lucid; urgency=low + + * debian/patches/13_fix_onOpen_typo.patch: Add missing underscore that + caused the Options dialog for the World Daylight Alarm Clock to appear + blank. LP: #507542 + + -- Michael Terry Thu, 14 Jan 2010 11:12:50 -0500 + +google-gadgets (0.10.5-0.2ubuntu2) karmic; urgency=low + + * debian/patches/10_xulrunner-1.9.1.patch: svn r1166, r1164,r1249 from + http://google-gadgets-for-linux.googlecode.com/svn/trunk/. Fixes support + for xulrunner-1.9.1. Fixed in upstream 0.11.1 (closes LP: #434127) + * debian/patches/12_fix_badatom_gtk_crash.patch: r1239 from svn. Fixes + BadAtom crash on ggl-gtk. Fixed in upstream 0.11.1 + + -- SevenMachines Wed, 14 Oct 2009 13:04:35 +0100 + +google-gadgets (0.10.5-0.2ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - Add google-gadgets-xul on google-gadgets-qt Depends field. + * Add ${misc:Depends} macro to all Depends field to make lintian happy. + + -- Alessio Treglia Thu, 03 Sep 2009 09:57:07 +0200 + google-gadgets (0.10.5-0.2) unstable; urgency=low * NMU. @@ -101,6 +145,14 @@ -- Aurelien Jarno Wed, 02 Sep 2009 20:11:41 +0200 +google-gadgets (0.10.5-0.1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (LP: #323509), Ubuntu remaining changes: + - debian/copyright: xdgmime license is LGPL, not GPL. + * Add google-gadgets-xul on google-gadgets-qt Depends field. + + -- Alessio Treglia Sat, 31 Jan 2009 08:40:49 +0100 + google-gadgets (0.10.5-0.1) unstable; urgency=low * NMU. @@ -120,6 +172,12 @@ -- Jack Coulter Wed, 17 Dec 2008 11:22:31 +1100 +google-gadgets (0.10.3-1ubuntu1) jaunty; urgency=low + + * In debian/copyright correct licence of xdgmime, LGPL not GPL + + -- Jonathan Riddell Fri, 16 Jan 2009 15:23:38 +0000 + google-gadgets (0.10.3-1) unstable; urgency=low * New upstream release diff -u google-gadgets-0.11.2/debian/control google-gadgets-0.11.2/debian/control --- google-gadgets-0.11.2/debian/control +++ google-gadgets-0.11.2/debian/control @@ -1,7 +1,8 @@ Source: google-gadgets Section: misc Priority: extra -Maintainer: Debian Krap Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Krap Maintainers Uploaders: Sune Vuorela , Modestas Vainius , Fathi Boudra Build-Depends: debhelper (>= 7.0.50~), quilt (>= 0.46-7~), automake, autoconf, libtool, chrpath, zip, libsoup2.4-dev (>= 2.26.0), diff -u google-gadgets-0.11.2/debian/patches/03_GRE_Version.patch google-gadgets-0.11.2/debian/patches/03_GRE_Version.patch --- google-gadgets-0.11.2/debian/patches/03_GRE_Version.patch +++ google-gadgets-0.11.2/debian/patches/03_GRE_Version.patch @@ -1,4 +1,3 @@ -Author: Mike Hommey Description: Tighten the GREVersionRange. --- a/extensions/gtkmoz_browser_element/browser_child.cc +++ b/extensions/gtkmoz_browser_element/browser_child.cc @@ -8,8 +7,8 @@ static const GREVersionRange kGREVersion = { - "1.9a", PR_TRUE, - "1.9.4", PR_FALSE, -+ "1.9.1", PR_TRUE, -+ "1.9.2", PR_FALSE, ++ "1.9.2", PR_TRUE, ++ "1.9.3", PR_FALSE, }; char xpcom_location[4096]; @@ -21,8 +20,8 @@ static const GREVersionRange kGREVersion = { - "1.9a", PR_TRUE, - "1.9.4", PR_FALSE, -+ "1.9.1", PR_TRUE, -+ "1.9.2", PR_FALSE, ++ "1.9.2", PR_TRUE, ++ "1.9.3", PR_FALSE, }; rv = GRE_GetGREPathWithProperties(&kGREVersion, 1, nsnull, 0,