r16292 - in /packages/unstable/devhelp/debian: changelog control patches/02_gecko_1.9.patch

[brad-guest at users.alioth.debian.org]

Author: brad-guest
Date: Thu Jun 19 19:22:39 2008
New Revision: 16292

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16292
Log:
* Fix 02_gecko_1.9.patch. Closes: #485644
* Update Standards-Version to 3.8.0 (No Changes)
* Remove Build-Depends on -1 revisions.

Modified:
    packages/unstable/devhelp/debian/changelog
    packages/unstable/devhelp/debian/control
    packages/unstable/devhelp/debian/patches/02_gecko_1.9.patch

Modified: packages/unstable/devhelp/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/devhelp/debian/changelog?rev=16292&op=diff
==============================================================================
--- packages/unstable/devhelp/debian/changelog (original)
+++ packages/unstable/devhelp/debian/changelog Thu Jun 19 19:22:39 2008
@@ -1,3 +1,11 @@
+devhelp (0.19.1-4) UNRELEASED; urgency=low
+
+  * Fix 02_gecko_1.9.patch. Closes: #485644
+  * Update Standards-Version to 3.8.0 (No Changes)
+  * Remove Build-Depends on -1 revisions.
+
+ -- Bradley Smith <brad at brad-smith.co.uk>  Thu, 19 Jun 2008 20:06:01 +0100
+
 devhelp (0.19.1-3) unstable; urgency=low
 
   * Upload to unstable; drop check-dist include.

Modified: packages/unstable/devhelp/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/devhelp/debian/control?rev=16292&op=diff
==============================================================================
--- packages/unstable/devhelp/debian/control (original)
+++ packages/unstable/devhelp/debian/control Thu Jun 19 19:22:39 2008
@@ -6,8 +6,8 @@
 Build-Depends: cdbs,
                quilt,
                debhelper (>= 5),
-               libgtk2.0-dev (>= 2.8.17-1),
-               libglade2-dev (>= 1:2.4.0-1),
+               libgtk2.0-dev (>= 2.8.17),
+               libglade2-dev (>= 1:2.4.0),
                libgconf2-dev (>= 2.6.0),
                libwnck-dev (>= 2.14.1),
                xulrunner-dev (>= 1.9~rc1),
@@ -18,7 +18,7 @@
                python-dev,
                python-support (>= 0.3),
                chrpath
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 
 Package: libdevhelp-1-0
 Section: libs

Modified: packages/unstable/devhelp/debian/patches/02_gecko_1.9.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/devhelp/debian/patches/02_gecko_1.9.patch?rev=16292&op=diff
==============================================================================
--- packages/unstable/devhelp/debian/patches/02_gecko_1.9.patch (original)
+++ packages/unstable/devhelp/debian/patches/02_gecko_1.9.patch Thu Jun 19 19:22:39 2008
@@ -525,7 +525,7 @@
  
  static nsresult
  gecko_utils_init_prefs (void)
-@@ -318,11 +321,57 @@ dh_gecko_utils_init (void)
+@@ -318,11 +321,55 @@ dh_gecko_utils_init (void)
  	NS_LogInit ();
  #endif
  
@@ -558,14 +558,12 @@
 +       return;
 +    }
 +
-+ #ifdef GTKEmbedGlueStartupInternal
 +    rv = GTKEmbedGlueStartupInternal();
 +    if (NS_FAILED (rv))
 +    {
 +       g_warning ("Could not startup embed glue (internal)!\n");
 +       return;
 +    }
-+ #endif
 +
 +    char *lastSlash = strrchr(xpcomLocation, '/');
 +    if (lastSlash)