[SCM] Debian packaging of libhtml-mason-perl branch, master, updated. debian/1.48-1-8-g4d9fecc

[Florian Schlichting]

The following commit has been merged in the master branch:
commit fec7268f126fe76d312baf2b17934adc239a162d
Author: Florian Schlichting <fschlich at zedat.fu-berlin.de>
Date:   Tue Aug 14 21:32:48 2012 +0200

    remove packaging infrastructure for htdocs, which are no longer shipped

diff --git a/debian/control b/debian/control
index d5bd929..cf90f43 100644
--- a/debian/control
+++ b/debian/control
@@ -55,7 +55,7 @@ Priority: extra
 Depends: ${misc:Depends}
 Conflicts: libhtml-mason-perl-examples
 Replaces: libhtml-mason-perl-examples
-Description: HTML::Mason documentation
+Description: HTML::Mason examples
  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
@@ -64,4 +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 and examples.
+ This package contains the HTML::Mason examples.
diff --git a/debian/libhtml-mason-perl-doc.dirs b/debian/libhtml-mason-perl-doc.dirs
deleted file mode 100644
index 920ca93..0000000
--- a/debian/libhtml-mason-perl-doc.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/libhtml-mason-perl-doc/html
diff --git a/debian/libhtml-mason-perl-doc.doc-base b/debian/libhtml-mason-perl-doc.doc-base
deleted file mode 100644
index 9bd929b..0000000
--- a/debian/libhtml-mason-perl-doc.doc-base
+++ /dev/null
@@ -1,8 +0,0 @@
-Document: libhtml-mason-perl
-Title: HTML::Mason Guides and Reference Pages
-Author: Jonathan Swartz <swartz at transbay.net>
-Section: Web Development
-
-Format: HTML
-Index: /usr/share/doc/libhtml-mason-perl-doc/html/index.html
-Files: /usr/share/doc/libhtml-mason-perl-doc/html/*.html
diff --git a/debian/libhtml-mason-perl.README.Debian b/debian/libhtml-mason-perl.README.Debian
index 102abc6..2f4b69b 100644
--- a/debian/libhtml-mason-perl.README.Debian
+++ b/debian/libhtml-mason-perl.README.Debian
@@ -1,17 +1,16 @@
 HTML::Mason Debian package
 ==========================
 
-All Mason documentation is available in the libhtml-mason-perl-doc
-package, and [1]on the Mason website. An introduction to Mason can be
-found in [2]Mason.html, and the Administrator's Manual in
-[3]Admin.html.
+All Mason documentation is available [1]on the Mason website. An
+introduction to Mason can be found in [2]Mason.html, and the
+Administrator's Manual in [3]Admin.html.
 
    1. http://www.masonhq.com/docs/manual/
    2. http://www.masonhq.com/docs/manual/Mason.html
    3. http://www.masonhq.com/docs/manual/Admin.html
 
-Some basic Mason examples can also be found in the
-libhtml-mason-perl-doc package.
+Some basic Mason examples can be found in the libhtml-mason-perl-doc
+package.
 
 Using HTML::Mason with mod_perl
 -------------------------------
diff --git a/debian/rules b/debian/rules
index ac40569..906e590 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,3 @@ TMP     = $(CURDIR)/debian/tmp
 override_dh_auto_install:
 	dh_auto_install
 	cp -v $(CURDIR)/debian/Apache*UserDirHandler.pm $(TMP)/usr/share/perl5/HTML/Mason
-
-override_dh_installdocs:
-	dh_installdocs
-	cp -rv $(CURDIR)/htdocs/* $(CURDIR)/debian/libhtml-mason-perl-doc/usr/share/doc/libhtml-mason-perl-doc/html

-- 
Debian packaging of libhtml-mason-perl