[Pkg-fedora-ds-maintainers] [libapache2-mod-nss] 01/02: Merge branch 'master' into ubuntu

[Timo Aaltonen]

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

tjaalton-guest pushed a commit to branch ubuntu
in repository libapache2-mod-nss.

commit 1fc4f759ce448a43aaf3e658efa7097d8ac8c9ee
Merge: a7e6f34 419b507
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Wed Feb 19 09:39:07 2014 +0200

    Merge branch 'master' into ubuntu
    
    Conflicts:
    	debian/changelog

 debian/changelog                             |  19 +++-
 debian/control                               |   6 +-
 debian/libapache2-mod-nss.apache2            |   2 +
 debian/libapache2-mod-nss.install            |   2 -
 debian/patches/mod_nss-clientauth.patch      |  50 ++++++++++
 debian/patches/mod_nss-httpd24.patch         | 135 +++++++++++++++++++++++++++
 debian/patches/mod_nss-nssverifyclient.patch |  12 +++
 debian/patches/series                        |   3 +
 debian/rules                                 |   1 +
 9 files changed, 220 insertions(+), 10 deletions(-)

diff --cc debian/control
index c9f3b6d,57189e7..6fde8b5
--- a/debian/control
+++ b/debian/control
@@@ -1,11 -1,11 +1,12 @@@
  Source: libapache2-mod-nss
  Section: web
  Priority: extra
 -Maintainer: Debian 389ds Team <pkg-fedora-ds-maintainers at lists.alioth.debian.org>
 +Maintainer: Ubuntu 389ds Maintainers <ubuntu-389-directory-server at lists.launchpad.net>
 +XSBC-Original-Maintainer: Debian 389ds Team <pkg-fedora-ds-maintainers at lists.alioth.debian.org>
  Uploaders: Timo Aaltonen <tjaalton at ubuntu.com>
  Build-Depends: debhelper (>= 5),
-  apache2-threaded-dev (>= 2.2.3),
+  dh-apache2,
+  apache2-dev (>= 2.4),
   libnss3-dev,
   libapr1-dev, 
   quilt,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-fedora-ds/libapache2-mod-nss.git