This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository w3c-linkchecker.

commit 3bab5d94a58d74145bcefaaa87524af49f061ef4
Author: Nicholas Bamber <nicho...@periapt.co.uk>
Date:   Fri May 4 20:02:03 2012 +0000

    Added support for apache 2.4 (Closes: #669796)
    
    (cherry picked from commit e6159e5cbdf9ce277d80bcaf2a48b5c0125d65f0)
    
    Conflicts:
        debian/changelog
    
    (resolved by ignoring the changes in d/changelog)
---
 debian/control                                            | 2 +-
 debian/w3c-linkchecker.apache2                            | 1 +
 debian/{apache2-linkchecker.conf => w3c-linkchecker.conf} | 0
 debian/w3c-linkchecker.install                            | 1 -
 debian/w3c-linkchecker.links                              | 1 -
 5 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 0c700bc..0a3b415 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: perl
 Priority: optional
 Build-Depends: debhelper (>= 8)
 Build-Depends-Indep: perl, libcss-dom-perl, po-debconf, libhtml-parser-perl,
- libwww-perl (>= 5.833), liburi-perl (>= 1.53), libencode-locale-perl
+ libwww-perl (>= 5.833), liburi-perl (>= 1.53), libencode-locale-perl, 
dh-apache2
 Maintainer: Debian Perl Group <pkg-perl-maintain...@lists.alioth.debian.org>
 Uploaders: Nicholas Bamber <nicho...@periapt.co.uk>
 Standards-Version: 3.9.2
diff --git a/debian/w3c-linkchecker.apache2 b/debian/w3c-linkchecker.apache2
new file mode 100644
index 0000000..e14bda2
--- /dev/null
+++ b/debian/w3c-linkchecker.apache2
@@ -0,0 +1 @@
+conf    debian/w3c-linkchecker.conf
diff --git a/debian/apache2-linkchecker.conf b/debian/w3c-linkchecker.conf
similarity index 100%
rename from debian/apache2-linkchecker.conf
rename to debian/w3c-linkchecker.conf
diff --git a/debian/w3c-linkchecker.install b/debian/w3c-linkchecker.install
index 5e17d92..63fd05f 100644
--- a/debian/w3c-linkchecker.install
+++ b/debian/w3c-linkchecker.install
@@ -2,4 +2,3 @@ bin/checklink usr/bin
 etc/checklink.conf usr/share/w3c-linkchecker/
 docs/* usr/share/w3c-linkchecker/docs/
 images/* usr/share/w3c-linkchecker/images/
-debian/apache2-linkchecker.conf etc/w3c/
diff --git a/debian/w3c-linkchecker.links b/debian/w3c-linkchecker.links
deleted file mode 100644
index 8cdd9bc..0000000
--- a/debian/w3c-linkchecker.links
+++ /dev/null
@@ -1 +0,0 @@
-etc/w3c/apache2-linkchecker.conf etc/apache2/conf.d/linkchecker.conf

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-perl/packages/w3c-linkchecker.git

_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits

Reply via email to