[perl-Gtk2-MozEmbed] Small infrastructure updates

[Torsten Schönfeld <tsch src gnome org>]

commit c30e84a33a1b89d3b7a9fd3f0f55450e96240890
Author: Torsten Schönfeld <kaffeetisch gmx de>
Date:   Sat May 14 14:22:41 2011 +0200

    Small infrastructure updates

 MANIFEST                            |    4 ++--
 Makefile.PL                         |   17 ++++++++++-------
 copyright.pod                       |    2 +-
 MozEmbed.pm => lib/Gtk2/MozEmbed.pm |    0
 4 files changed, 13 insertions(+), 10 deletions(-)
---
diff --git a/MANIFEST b/MANIFEST
index 37cd0bb..723db81 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,14 +1,14 @@
-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
diff --git a/Makefile.PL b/Makefile.PL
index c6ec40f..8b87873 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -67,7 +67,7 @@ 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),
 );
 
@@ -96,7 +96,7 @@ my $mozembed = ExtUtils::Depends->new('Gtk2::MozEmbed', 'Gtk2',
 $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));
@@ -110,8 +110,8 @@ my $configure_requires =
 
 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,
@@ -120,9 +120,12 @@ WriteMakefile(
 
   $mozembed->get_makefile_vars,
 
-  EXTRA_META => qq/
-$configure_requires
-/,
+  META_MERGE => {
+    configure_requires => \%pre_reqs,
+    no_index => {
+      file => [ xs_files],
+    },
+  },
 );
 
 sub MY::postamble {
diff --git a/copyright.pod b/copyright.pod
index b2f38bf..c79d682 100644
--- a/copyright.pod
+++ b/copyright.pod
@@ -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.
diff --git a/MozEmbed.pm b/lib/Gtk2/MozEmbed.pm
similarity index 100%
rename from MozEmbed.pm
rename to lib/Gtk2/MozEmbed.pm