perl-Cairo r170 - in trunk: . inc lib

[tsch svn gnome org]

Author: tsch
Date: Sat Mar 28 13:19:27 2009
New Revision: 170
URL: http://svn.gnome.org/viewvc/perl-Cairo?rev=170&view=rev

Log:
Move the two modules into their own folders to make it clear that the one is
the real thing while the other is just build helper code.


Added:
   trunk/inc/
   trunk/inc/MakeHelper.pm   (props changed)
      - copied unchanged from r168, /trunk/MakeHelper.pm
   trunk/lib/
   trunk/lib/Cairo.pm   (props changed)
      - copied unchanged from r168, /trunk/Cairo.pm
Removed:
   trunk/Cairo.pm
   trunk/MakeHelper.pm
Modified:
   trunk/ChangeLog
   trunk/MANIFEST
   trunk/Makefile.PL

Modified: trunk/MANIFEST
==============================================================================
--- trunk/MANIFEST	(original)
+++ trunk/MANIFEST	Sat Mar 28 13:19:27 2009
@@ -1,7 +1,6 @@
 cairo-perl-private.h
 cairo-perl.h
 cairo-perl.typemap
-Cairo.pm
 Cairo.xs
 CairoFont.xs
 CairoFt.xs
@@ -25,9 +24,10 @@
 examples/png/text-rotate.pl
 examples/png/text.pl
 examples/simple.pl
+inc/MakeHelper.pm
+lib/Cairo.pm
 LICENSE
 Makefile.PL
-MakeHelper.pm
 MANIFEST
 MANIFEST.SKIP
 NEWS

Modified: trunk/Makefile.PL
==============================================================================
--- trunk/Makefile.PL	(original)
+++ trunk/Makefile.PL	Sat Mar 28 13:19:27 2009
@@ -11,7 +11,8 @@
 use strict;
 use warnings;
 use ExtUtils::MakeMaker;
-use MakeHelper;
+
+require './inc/MakeHelper.pm';
 
 my %extreqs = (
 	'cairo' => '1.0.0',
@@ -353,7 +354,7 @@
 $dep->set_libs ($cairo_cfg{libs});
 $dep->add_xs (@xs_files);
 $dep->add_c ('cairo-perl-enums.c');
-$dep->add_pm ('Cairo.pm' => '$(INST_LIBDIR)/Cairo.pm');
+$dep->add_pm ('lib/Cairo.pm' => '$(INST_LIBDIR)/Cairo.pm');
 $dep->add_typemaps (@typemaps);
 
 $dep->install (qw(cairo-perl.h
@@ -382,8 +383,8 @@
 
 WriteMakefile (
 	NAME          => 'Cairo',
-	VERSION_FROM  => 'Cairo.pm',
-	ABSTRACT_FROM => 'Cairo.pm',
+	VERSION_FROM  => 'lib/Cairo.pm',
+	ABSTRACT_FROM => 'lib/Cairo.pm',
 	PREREQ_PM     => \%prereqs,
 	XSPROTOARG    => '-noprototypes',
 	FUNCLIST      => \ exports,
@@ -397,7 +398,7 @@
 			'Test::Number::Delta' => 1.0,
 		},
 		no_index => {
-			files => [qw/MakeHelper.pm/],
+			files => [qw(inc/MakeHelper.pm)],
 		},
         },
 );