[SCM] Debian packaging of libhtml-mason-perl branch, master, updated. debian/1%1.46-1-9-g1be3c96

[Florian Schlichting]

The following commit has been merged in the master branch:
commit 5eb705a7c6d9e815c92caa3be46ac0e60fe51f10
Author: Florian Schlichting <fschlich at zedat.fu-berlin.de>
Date:   Fri Nov 11 22:49:37 2011 +0000

    kill -examples package and install mason_example in -docs

diff --git a/debian/control b/debian/control
index a12761e..501cd94 100644
--- a/debian/control
+++ b/debian/control
@@ -53,6 +53,8 @@ Section: doc
 Architecture: all
 Priority: extra
 Depends: ${misc:Depends}
+Conflicts: libhtml-mason-perl-examples
+Replaces: libhtml-mason-perl-examples
 Description: HTML::Mason documentation
  Mason allows web pages and sites to be constructed from shared,
  reusable building blocks called components. Components contain a mix
@@ -62,23 +64,4 @@ Description: HTML::Mason documentation
  logos) can be extracted into their own components where they need be
  changed only once to affect the whole site.
  .
- This package contains the HTML::Mason manuals.
-
-Package: libhtml-mason-perl-examples
-Architecture: all
-Depends: ${misc:Depends},
- libhtml-mason-perl (>= ${source:Upstream-Version})
-Recommends: apache2,
- libapache2-mod-perl2
-Priority: extra
-Description: HTML::Mason example setup
- Mason allows web pages and sites to be constructed from shared,
- reusable building blocks called components. Components contain a mix
- of Perl and HTML, and can call each other and pass values back and
- forth like subroutines. Components increase modularity and eliminate
- repetitive work: common design elements (headers, footers, menus,
- logos) can be extracted into their own components where they need be
- changed only once to affect the whole site.
- .
- This package will set up some example Mason components in your local
- Apache.
+ This package contains the HTML::Mason manuals and examples.
diff --git a/debian/libhtml-mason-perl-doc.examples b/debian/libhtml-mason-perl-doc.examples
index 1aeda61..763c02b 100644
--- a/debian/libhtml-mason-perl-doc.examples
+++ b/debian/libhtml-mason-perl-doc.examples
@@ -1,2 +1,3 @@
 samples
 eg
+debian/mason_example

-- 
Debian packaging of libhtml-mason-perl