r75205 - in /trunk/libgtk2-mozembed-perl: ./ debian/ examples/ lib/ t/ xs/

gregoa at users.alioth.debian.org gregoa at users.alioth.debian.org
Mon Jun 6 19:34:53 UTC 2011


Author: gregoa
Date: Mon Jun  6 19:34:46 2011
New Revision: 75205

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=75205
Log:
New upstream release.

Added:
    trunk/libgtk2-mozembed-perl/ChangeLog.pre-git
      - copied unchanged from r75204, branches/upstream/libgtk2-mozembed-perl/current/ChangeLog.pre-git
    trunk/libgtk2-mozembed-perl/lib/
      - copied from r75204, branches/upstream/libgtk2-mozembed-perl/current/lib/
    trunk/libgtk2-mozembed-perl/perl-Gtk2-MozEmbed.doap
      - copied unchanged from r75204, branches/upstream/libgtk2-mozembed-perl/current/perl-Gtk2-MozEmbed.doap
Removed:
    trunk/libgtk2-mozembed-perl/ChangeLog
    trunk/libgtk2-mozembed-perl/MozEmbed.pm
Modified:
    trunk/libgtk2-mozembed-perl/MANIFEST
    trunk/libgtk2-mozembed-perl/MANIFEST.SKIP
    trunk/libgtk2-mozembed-perl/META.yml
    trunk/libgtk2-mozembed-perl/Makefile.PL
    trunk/libgtk2-mozembed-perl/NEWS
    trunk/libgtk2-mozembed-perl/copyright.pod
    trunk/libgtk2-mozembed-perl/debian/changelog
    trunk/libgtk2-mozembed-perl/examples/pumzilla
    trunk/libgtk2-mozembed-perl/gtkmozembed2perl.h
    trunk/libgtk2-mozembed-perl/t/GtkMozEmbed.t
    trunk/libgtk2-mozembed-perl/xs/GtkMozEmbed.xs

Modified: trunk/libgtk2-mozembed-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-mozembed-perl/MANIFEST?rev=75205&op=diff
==============================================================================
--- trunk/libgtk2-mozembed-perl/MANIFEST (original)
+++ trunk/libgtk2-mozembed-perl/MANIFEST Mon Jun  6 19:34:46 2011
@@ -1,15 +1,16 @@
-ChangeLog
+ChangeLog.pre-git
 copyright.pod
 examples/pumzilla
 gtkmozembed.typemap
 gtkmozembed2perl.h
+lib/Gtk2/MozEmbed.pm
 LICENSE
 Makefile.PL
 MANIFEST			This list of files
 MANIFEST.SKIP
 maps
-MozEmbed.pm
 NEWS
+perl-Gtk2-MozEmbed.doap
 README
 t/GtkMozEmbed.t
 xs/GtkMozEmbed.xs

Modified: trunk/libgtk2-mozembed-perl/MANIFEST.SKIP
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-mozembed-perl/MANIFEST.SKIP?rev=75205&op=diff
==============================================================================
--- trunk/libgtk2-mozembed-perl/MANIFEST.SKIP (original)
+++ trunk/libgtk2-mozembed-perl/MANIFEST.SKIP Mon Jun  6 19:34:46 2011
@@ -4,8 +4,7 @@
 \.bs$
 build
 \.c$
-CVS
-\.cvsignore$
+\.git
 Makefile$
 Makefile\.old$
 \.o$

Modified: trunk/libgtk2-mozembed-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-mozembed-perl/META.yml?rev=75205&op=diff
==============================================================================
--- trunk/libgtk2-mozembed-perl/META.yml (original)
+++ trunk/libgtk2-mozembed-perl/META.yml Mon Jun  6 19:34:46 2011
@@ -1,20 +1,28 @@
 --- #YAML:1.0
-name:                Gtk2-MozEmbed
-version:             0.08
-abstract:            Perl interface to the Mozilla embedding widget
-license:             ~
-author:              ~
-generated_by:        ExtUtils::MakeMaker version 6.44
-distribution_type:   module
-requires:     
-    ExtUtils::Depends:             0.20
-    ExtUtils::PkgConfig:           1.03
-    Gtk2:                          1.081
+name:               Gtk2-MozEmbed
+version:            0.09
+abstract:           Perl interface to the Mozilla embedding widget
+author:  []
+license:            unknown
+distribution_type:  module
+configure_requires:
+    ExtUtils::Depends:    0.20
+    ExtUtils::MakeMaker:  0
+    ExtUtils::PkgConfig:  1.03
+    Gtk2:                 1.081
+build_requires:
+    ExtUtils::MakeMaker:  0
+requires:
+    ExtUtils::Depends:    0.20
+    ExtUtils::PkgConfig:  1.03
+    Gtk2:                 1.081
+no_index:
+    directory:
+        - t
+        - inc
+    file:
+        - xs/GtkMozEmbed.xs
+generated_by:       ExtUtils::MakeMaker version 6.56
 meta-spec:
-    url:     http://module-build.sourceforge.net/META-spec-v1.3.html
-    version: 1.3
-
-configure_requires:
-   ExtUtils::Depends: 0.20
-   Gtk2: 1.081
-   ExtUtils::PkgConfig: 1.03
+    url:      http://module-build.sourceforge.net/META-spec-v1.4.html
+    version:  1.4

Modified: trunk/libgtk2-mozembed-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-mozembed-perl/Makefile.PL?rev=75205&op=diff
==============================================================================
--- trunk/libgtk2-mozembed-perl/Makefile.PL (original)
+++ trunk/libgtk2-mozembed-perl/Makefile.PL Mon Jun  6 19:34:46 2011
@@ -8,7 +8,7 @@
 use Cwd;
 use File::Spec;
 
-# $Header: /cvsroot/gtk2-perl/gtk2-perl-xs/Gtk2-MozEmbed/Makefile.PL,v 1.14 2008/08/25 21:30:23 kaffeetisch Exp $
+# $Id$
 
 our %build_reqs = (
   'perl-ExtUtils-Depends'   => '0.20',
@@ -48,17 +48,26 @@
   $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;
+}
 
 mkdir 'build', 0777;
 
 our @xs_files = <xs/*.xs>;
 our %pod_files = (
-	'MozEmbed.pm' => '$(INST_MAN3DIR)/Gtk2::MozEmbed.$(MAN3EXT)',
+	'lib/Gtk2/MozEmbed.pm' => '$(INST_MAN3DIR)/Gtk2::MozEmbed.$(MAN3EXT)',
 	Glib::MakeHelper->do_pod_files (@xs_files),
 );
 
@@ -76,9 +85,9 @@
 my $inc = $pkgcfg{cflags};
 my $libs = $pkgcfg{libs};
 
-if ($libs =~ m#xulrunner-devel-([^/]+)#) {
+if ($libs =~ m#(lib|lib64)/xulrunner-(devel|sdk)-([^/]+)#) {
 	$inc .= qq( -DGTK_MOZ_EMBED_PERL_XULRUNNER_PATH=)
-	      . qq("\\"/usr/lib/xulrunner-$1\\"" );
+	      . qq("\\"/usr/$1/xulrunner-$3\\"" );
 }
 
 my $mozembed = ExtUtils::Depends->new('Gtk2::MozEmbed', 'Gtk2',
@@ -87,7 +96,7 @@
 $mozembed->set_inc($inc);
 $mozembed->set_libs($libs);
 $mozembed->add_xs(@xs_files);
-$mozembed->add_pm('MozEmbed.pm' => '$(INST_LIBDIR)/MozEmbed.pm');
+$mozembed->add_pm('lib/Gtk2/MozEmbed.pm' => '$(INST_LIBDIR)/MozEmbed.pm');
 $mozembed->add_typemaps(map { File::Spec->catfile(cwd(), $_) }
                           qw(gtkmozembed.typemap
                              build/gtkmozembed2perl.typemap));
@@ -101,8 +110,8 @@
 
 WriteMakefile(
   NAME          => 'Gtk2::MozEmbed',
-  VERSION_FROM  => 'MozEmbed.pm',
-  ABSTRACT_FROM => 'MozEmbed.pm',
+  VERSION_FROM  => 'lib/Gtk2/MozEmbed.pm',
+  ABSTRACT_FROM => 'lib/Gtk2/MozEmbed.pm',
   PREREQ_PM     => \%pre_reqs,
   XSPROTOARG    => '-noprototypes',
   MAN3PODS      => \%pod_files,
@@ -111,9 +120,12 @@
 
   $mozembed->get_makefile_vars,
 
-  EXTRA_META => qq/
-$configure_requires
-/,
+  META_MERGE => {
+    configure_requires => \%pre_reqs,
+    no_index => {
+      file => [@xs_files],
+    },
+  },
 );
 
 sub MY::postamble {

Modified: trunk/libgtk2-mozembed-perl/NEWS
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-mozembed-perl/NEWS?rev=75205&op=diff
==============================================================================
--- trunk/libgtk2-mozembed-perl/NEWS (original)
+++ trunk/libgtk2-mozembed-perl/NEWS Mon Jun  6 19:34:46 2011
@@ -1,3 +1,9 @@
+Overview of changes in Gtk2::MozEmbed 0.09
+==========================================
+
+* Make the xulrunner SDK detection work more robust.  [Remi Collet]
+* Fix a test failure.
+
 Overview of changes in Gtk2::MozEmbed 0.08
 ==========================================
 

Modified: trunk/libgtk2-mozembed-perl/copyright.pod
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-mozembed-perl/copyright.pod?rev=75205&op=diff
==============================================================================
--- trunk/libgtk2-mozembed-perl/copyright.pod (original)
+++ trunk/libgtk2-mozembed-perl/copyright.pod Mon Jun  6 19:34:46 2011
@@ -1,4 +1,4 @@
-Copyright (C) 2004-2008 by the gtk2-perl team.
+Copyright (C) 2004-2011 by the gtk2-perl team.
 
 This software is licensed under the LGPL.  See L<Gtk2::MozEmbed> for a full
 notice.

Modified: trunk/libgtk2-mozembed-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-mozembed-perl/debian/changelog?rev=75205&op=diff
==============================================================================
--- trunk/libgtk2-mozembed-perl/debian/changelog (original)
+++ trunk/libgtk2-mozembed-perl/debian/changelog Mon Jun  6 19:34:46 2011
@@ -1,13 +1,13 @@
-libgtk2-mozembed-perl (0.08-4.1) UNRELEASED; urgency=low
+libgtk2-mozembed-perl (0.09-1) UNRELEASED; urgency=low
 
   [ Damyan Ivanov ]
-  * Non-maintainer upload.
   * add -a option to xvfb-run invocation
 
   [ gregor herrmann ]
   * debian/rules: switch order of arguments to dh.
+  * New upstream release.
 
- -- Damyan Ivanov <dmn at debian.org>  Mon, 15 Mar 2010 08:39:32 +0200
+ -- gregor herrmann <gregoa at debian.org>  Mon, 06 Jun 2011 21:33:46 +0200
 
 libgtk2-mozembed-perl (0.08-4) unstable; urgency=low
 

Modified: trunk/libgtk2-mozembed-perl/examples/pumzilla
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-mozembed-perl/examples/pumzilla?rev=75205&op=diff
==============================================================================
--- trunk/libgtk2-mozembed-perl/examples/pumzilla (original)
+++ trunk/libgtk2-mozembed-perl/examples/pumzilla Mon Jun  6 19:34:46 2011
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Header: /cvsroot/gtk2-perl/gtk2-perl-xs/Gtk2-MozEmbed/examples/pumzilla,v 1.4 2005/04/11 22:30:40 kaffeetisch Exp $
+# $Id$
 
 package PumZilla;
 

Modified: trunk/libgtk2-mozembed-perl/gtkmozembed2perl.h
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-mozembed-perl/gtkmozembed2perl.h?rev=75205&op=diff
==============================================================================
--- trunk/libgtk2-mozembed-perl/gtkmozembed2perl.h (original)
+++ trunk/libgtk2-mozembed-perl/gtkmozembed2perl.h Mon Jun  6 19:34:46 2011
@@ -15,7 +15,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Header: /cvsroot/gtk2-perl/gtk2-perl-xs/Gtk2-MozEmbed/gtkmozembed2perl.h,v 1.4 2005/04/11 22:30:19 kaffeetisch Exp $
+ * $Id$
  */
 
 #ifndef _GTKMOZEMBED2PERL_H_

Modified: trunk/libgtk2-mozembed-perl/t/GtkMozEmbed.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-mozembed-perl/t/GtkMozEmbed.t?rev=75205&op=diff
==============================================================================
--- trunk/libgtk2-mozembed-perl/t/GtkMozEmbed.t (original)
+++ trunk/libgtk2-mozembed-perl/t/GtkMozEmbed.t Mon Jun  6 19:34:46 2011
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Header: /cvsroot/gtk2-perl/gtk2-perl-xs/Gtk2-MozEmbed/t/GtkMozEmbed.t,v 1.5 2007/01/31 19:04:03 kaffeetisch Exp $
+# $Id$
 
 use strict;
 use warnings;
@@ -10,8 +10,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");

Modified: trunk/libgtk2-mozembed-perl/xs/GtkMozEmbed.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-mozembed-perl/xs/GtkMozEmbed.xs?rev=75205&op=diff
==============================================================================
--- trunk/libgtk2-mozembed-perl/xs/GtkMozEmbed.xs (original)
+++ trunk/libgtk2-mozembed-perl/xs/GtkMozEmbed.xs Mon Jun  6 19:34:46 2011
@@ -15,7 +15,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Header: /cvsroot/gtk2-perl/gtk2-perl-xs/Gtk2-MozEmbed/xs/GtkMozEmbed.xs,v 1.7 2008/08/25 21:27:20 kaffeetisch Exp $
+ * $Id$
  */
 
 #include "gtkmozembed2perl.h"




More information about the Pkg-perl-cvs-commits mailing list