r75206 - in /trunk/libgtk2-mozembed-perl/debian: changelog patches/dont-pollute-HOME patches/use-the-right-xul patches/whatis-entry

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Mon Jun  6 19:40:28 2011
New Revision: 75206

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=75206
Log:
Update patches.

Modified:
    trunk/libgtk2-mozembed-perl/debian/changelog
    trunk/libgtk2-mozembed-perl/debian/patches/dont-pollute-HOME
    trunk/libgtk2-mozembed-perl/debian/patches/use-the-right-xul
    trunk/libgtk2-mozembed-perl/debian/patches/whatis-entry

Modified: trunk/libgtk2-mozembed-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-mozembed-perl/debian/changelog?rev=75206&op=diff
==============================================================================
--- trunk/libgtk2-mozembed-perl/debian/changelog (original)
+++ trunk/libgtk2-mozembed-perl/debian/changelog Mon Jun  6 19:40:28 2011
@@ -6,6 +6,7 @@
   [ gregor herrmann ]
   * debian/rules: switch order of arguments to dh.
   * New upstream release.
+  * Update patches.
 
  -- gregor herrmann <gregoa at debian.org>  Mon, 06 Jun 2011 21:33:46 +0200
 

Modified: trunk/libgtk2-mozembed-perl/debian/patches/dont-pollute-HOME
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-mozembed-perl/debian/patches/dont-pollute-HOME?rev=75206&op=diff
==============================================================================
--- trunk/libgtk2-mozembed-perl/debian/patches/dont-pollute-HOME (original)
+++ trunk/libgtk2-mozembed-perl/debian/patches/dont-pollute-HOME Mon Jun  6 19:40:28 2011
@@ -1,11 +1,13 @@
-Author: gregor herrmann <gregoa at debian.org>
 Description: use tmpdir for tests instead of polluting $HOME;
              also, if $HOME doesn't exist, the tests segfault.
              discovered by Niko Tyni in #525534
+Forwarded: no
+Author: gregor herrmann <gregoa at debian.org>
+Last-Update: 2011-06-06
 
 --- a/t/GtkMozEmbed.t
 +++ b/t/GtkMozEmbed.t
-@@ -8,13 +8,17 @@
+@@ -8,14 +8,18 @@
  use Gtk2 -init;
  use Gtk2::MozEmbed;
  
@@ -14,8 +16,9 @@
 +
  use Test::More tests => 8;
  
- Gtk2::MozEmbed -> push_startup();
- Gtk2::MozEmbed -> pop_startup();
+ # These cause an abort:
+ # Gtk2::MozEmbed -> push_startup();
+ # Gtk2::MozEmbed -> pop_startup();
  
 -Gtk2::MozEmbed -> set_comp_path($ENV{ HOME });
 -Gtk2::MozEmbed -> set_profile_path($ENV{ HOME } . "/.Schmuh", "Schmuh");
@@ -25,7 +28,7 @@
  
  my $moz = Gtk2::MozEmbed -> new();
  isa_ok($moz, "Gtk2::MozEmbed");
-@@ -53,3 +57,5 @@
+@@ -54,3 +58,5 @@
  
  # my $single = Gtk2::MozEmbedSingle -> new();
  # isa_ok($single, "Gtk2::MozEmbedSingle");

Modified: trunk/libgtk2-mozembed-perl/debian/patches/use-the-right-xul
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-mozembed-perl/debian/patches/use-the-right-xul?rev=75206&op=diff
==============================================================================
--- trunk/libgtk2-mozembed-perl/debian/patches/use-the-right-xul (original)
+++ trunk/libgtk2-mozembed-perl/debian/patches/use-the-right-xul Mon Jun  6 19:40:28 2011
@@ -1,11 +1,14 @@
 Description: link to xulrunner the right way by using the insane glue code
+ the actual code part (in the BOOT: section of the xs) was stolen from
+ the gnome-python-extras package, who stole it from Ubuntu. :)
+Forwarded: no
 Author: Ryan Niebur
-the actual code part (in the BOOT: section of the xs) was stolen from
-the gnome-python-extras package, who stole it from Ubuntu. :)
+Reviewed-by: gregor herrmann <gregoa at debian.org>
+Last-Update: 2011-06-06
 
 --- a/Makefile.PL
 +++ b/Makefile.PL
-@@ -42,17 +42,9 @@
+@@ -42,26 +42,9 @@
    exit 1; # not reached
  }
  
@@ -16,17 +19,26 @@
 -}
 +my $use_dom = 0;
  
--my %pkgcfg = ExtUtils::PkgConfig->find(
--	"xulrunner-gtkmozembed >= $build_reqs{'XULRunner'}",
--	"mozilla-gtkmozembed >= $build_reqs{'Mozilla'}",
--	"firefox-gtkmozembed >= $build_reqs{'Firefox'}",
--	"mozilla-firefox-gtkmozembed >= $build_reqs{'Firefox'}");
+-# If the package can't be found, warn and exit with status 0 to indicate to
+-# CPAN testers that their system is not supported.
+-my %pkgcfg;
+-unless (eval {
+-          %pkgcfg = ExtUtils::PkgConfig->find(
+-            "xulrunner-gtkmozembed >= $build_reqs{'XULRunner'}",
+-            "mozilla-gtkmozembed >= $build_reqs{'Mozilla'}",
+-            "firefox-gtkmozembed >= $build_reqs{'Firefox'}",
+-            "mozilla-firefox-gtkmozembed >= $build_reqs{'Firefox'}");
+-          1; })
+-{
+-	warn $@;
+-	exit 0;
+-}
 +my %pkgcfg = ExtUtils::PkgConfig->find("mozilla-gtkmozembed-embedding >= $build_reqs{'XULRunner'}");
  
  mkdir 'build', 0777;
  
-@@ -81,6 +73,8 @@
- 	      . qq("\\"/usr/lib/xulrunner-$1\\"" );
+@@ -90,6 +73,8 @@
+ 	      . qq("\\"/usr/$1/xulrunner-$3\\"" );
  }
  
 +$libs .= " -lstdc++ ";
@@ -34,7 +46,7 @@
  my $mozembed = ExtUtils::Depends->new('Gtk2::MozEmbed', 'Gtk2',
                                        ($use_dom ? ('Mozilla::DOM') : ()));
  
-@@ -107,7 +101,7 @@
+@@ -116,7 +101,7 @@
    XSPROTOARG    => '-noprototypes',
    MAN3PODS      => \%pod_files,
  

Modified: trunk/libgtk2-mozembed-perl/debian/patches/whatis-entry
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-mozembed-perl/debian/patches/whatis-entry?rev=75206&op=diff
==============================================================================
--- trunk/libgtk2-mozembed-perl/debian/patches/whatis-entry (original)
+++ trunk/libgtk2-mozembed-perl/debian/patches/whatis-entry Mon Jun  6 19:40:28 2011
@@ -1,4 +1,10 @@
-add a useful whatis entry to the generated man page
+Description: add a useful whatis entry to the generated man page
+Origin: vendor
+Forwarded: no
+Author: Ryan Niebur <ryan at debian.org>
+Reviewed-by: gregor herrmann <gregoa at debian.org>
+Last-Update: 2011-06-06
+
 
 --- a/xs/GtkMozEmbed.xs
 +++ b/xs/GtkMozEmbed.xs