Added patch to adjust examples and tutorial for use in the package.

diff --git a/debian/patches/202_fix-example-references.diff b/debian/patches/202_fix-example-references.diff
new file mode 100644 (file)
index 0000000..e35ec87
--- /dev/null
+++ b/debian/patches/202_fix-example-references.diff
@@ -0,0 +1,120 @@
+--- trunk.orig/ex/BeerDB.pm
++++ trunk/ex/BeerDB.pm
+@@ -13,7 +13,7 @@
+     my $dbi_driver = DBI_DRIVER;
+     if ($dbi_driver =~ /^SQLite/) {
+         die sprintf "SQLite datasource '%s' not found, correct the path or "
+-            . "recreate the database by running Makefile.PL", DATASOURCE
++            . "recreate the database using beerdb.sql", DATASOURCE
+             unless -e DATASOURCE;
+         eval "require DBD::SQLite";
+         if ($@) {
+@@ -31,8 +31,10 @@
+ 
+ # Change this to the htdoc root for your maypole application.
+ 
+-my @root=  ('t/templates'); 
+-push @root,$ENV{BEERDB_TEMPLATE_ROOT} if ($ENV{BEERDB_TEMPLATE_ROOT});
++my @root;
++push @root, 't/templates' if (-d 't/templates');
++push @root, $ENV{BEERDB_TEMPLATE_ROOT} if ($ENV{BEERDB_TEMPLATE_ROOT});
++push @root, '/usr/share/doc/libmaypole-perl/ex/templates' unless @root;
+ BeerDB->config->template_root( [@root] ); 
+ # Specify the rows per page in search results, lists, etc : 10 is a nice round number
+ BeerDB->config->rows_per_page(10);
+--- trunk.orig/ex/fancy_example/BeerDB.pm
++++ trunk/ex/fancy_example/BeerDB.pm
+@@ -14,7 +14,7 @@
+     my $dbi_driver = DBI_DRIVER;
+     if ($dbi_driver =~ /^SQLite/) {
+         die sprintf "SQLite datasource '%s' not found, correct the path or "
+-            . "recreate the database by running Makefile.PL", DATASOURCE
++            . "recreate the database using beerdb.sql", DATASOURCE
+             unless -e DATASOURCE;
+         eval "require DBD::SQLite";
+         if ($@) {
+@@ -32,8 +32,11 @@
+ 
+ # Change this to the htdoc root for your maypole application.
+ 
+-my @root=  ('t/templates'); 
+-push @root,$ENV{BEERDB_TEMPLATE_ROOT} if ($ENV{BEERDB_TEMPLATE_ROOT});
++my @root;
++push @root, 't/templates' if (-d 't/templates');
++push @root, $ENV{BEERDB_TEMPLATE_ROOT} if ($ENV{BEERDB_TEMPLATE_ROOT});
++push @root, '/usr/share/doc/libmaypole-perl/ex/fancy_example/templates'
++    unless @root;
+ BeerDB->config->template_root( [@root] ); 
+ # Specify the rows per page in search results, lists, etc : 10 is a nice round number
+ BeerDB->config->rows_per_page(10);
+--- trunk.orig/lib/Maypole/Manual/About.pod
++++ trunk/lib/Maypole/Manual/About.pod
+@@ -142,15 +142,15 @@
+         notes text
+     );
+ 
+-If you have C<DBD::SQLite> available, then a database like this will
+-be created when Maypole was installed. Let's now see how to set it up
+-with a web interface.
+-
+ =head2 Setting up Maypole
+ 
+ The first thing we need for a Maypole interface to a database is to
+ have a database. If you don't have one, now would be a good time to
+-create one, using the schema above. If you're creating a database
++create one, using the schema in
++F</usr/share/doc/libmaypole-perl/ex/beerdb.sql> (similar to the
++above).  To use it with SQLite you must change C<auto_increment> to
++C<autoincrement>; with PostgreSQL you must use C<serial>.
++If you're creating a database
+ by hand, don't forget to grant permissions for your Apache server to
+ access it as well as yourself (typically a user name like C<www-data>
+ or C<wwwrun>).
+@@ -189,17 +189,29 @@
+         "a pub has beers on handpumps");
+     1;
+ 
+-There's a version of this program in the F<ex/> directory in the Maypole
+-files that you downloaded in the F<~root/.cpan/> build area.
+-This defines the C<BeerDB> application.
+-To set it up as a mod_perl handler, just tell the Apache configuration
+-about it:
++There's a version of this program in the
++F</usr/share/doc/libmaypole-perl/ex/> directory.  This defines the
++C<BeerDB> application.  To set it up as a mod_perl handler:
++
++=over
++
++=item *
++Copy F<BeerDB.pm> and the F<BeerDB/> directory into
++F</usr/local/lib/perl/C<$version>/> or F</usr/local/lib/site_perl/>
++
++=item *
++Set the database path in F<BeerDB.pm>
++
++=item *
++Add the following to the Apache configuration:
+ 
+     <Location /beerdb>
+         SetHandler perl-script
+         PerlHandler BeerDB
+     </Location>
+ 
++=back
++
+ To use it as a CGI script, put it in your F<cgi-bin> directory,
+ together with a small file called F<beer.cgi>:
+ 
+@@ -215,10 +227,8 @@
+ 
+ And now we need some templates. As we'll see in the chapter on
+ L<views|Maypole::Manual::View>, there are several types of template.
+-We're going to copy
+-the whole lot from the F<templates/> directory of the Maypole source
+-package into the F</beerdb> directory under our web root.
+-Make the C<template_root> in C<BeerDB> agree with your path.
++These are found in the F</usr/share/doc/libmaypole-perl/ex/templates/>
++directory.
+ 
+ And that's it. We should now be able to go to C<http://localhost/beerdb/>
+ or C<http://localhost/cgi-bin/beer.cgi/>

diff --git a/debian/patches/series b/debian/patches/series
index efe0375f6e58d92fd96248afc4bbe6b2c8a4972c..a1a022dc7219e623a7eab0da159e378690f9fb08 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 107_make-examples-consistent.diff
 108_fix-uris.diff
 201_no-file-mmagic-xs.diff
+202_fix-example-references.diff