[Pkg-fedora-ds-maintainers] [389-admin] 01/02: Merge branch 'debian-unstable' 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 389-admin.

commit 7ed4dcd808f69d57b08cce6eb22d4e8a0409a8f8
Merge: fe03d03 740f559
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Tue Oct 8 12:10:30 2013 +0300

    Merge branch 'debian-unstable' into ubuntu
    
    Conflicts:
    	debian/changelog
    	debian/control

 .gitignore                                |    4 +
 Makefile.am                               |    5 +
 VERSION.sh                                |    2 +-
 admserv/cfgstuff/httpd-2.4.conf.in        |  742 +++++++++++++++++++++++++++++
 admserv/cgi-src40/admpw.c                 |    4 +-
 admserv/cgi-src40/config.c                |    9 +-
 admserv/cgi-src40/dsconfig.c              |    1 +
 admserv/cgi-src40/htmladmin.c             |  137 +++---
 admserv/cgi-src40/monreplication.c        |    1 +
 admserv/cgi-src40/restartsrv.c            |    5 +-
 admserv/cgi-src40/sec-activate.c          |   31 +-
 admserv/cgi-src40/security.c              |  118 +++--
 admserv/cgi-src40/security.properties     |    6 +-
 admserv/cgi-src40/statpingserv.c          |   85 ++--
 admserv/cgi-src40/stopsrv.c               |    5 +-
 admserv/cgi-src40/ugdsconfig.c            |    1 +
 admserv/cgi-src40/viewdata.c              |    5 +-
 admserv/cgi-src40/viewlog.c               |   13 +-
 admserv/newinst/src/AdminServer.pm.in     |   33 +-
 admserv/newinst/src/remove-ds-admin.pl.in |    8 +-
 compile                                   |  227 ++++++++-
 configure.ac                              |    5 +
 debian/changelog                          |   24 +-
 debian/control                            |    3 +-
 debian/gbp.conf                           |    6 +
 debian/patches/fix-group-name.patch       |   18 +
 debian/patches/format-security.patch      |  252 ----------
 debian/patches/http_conf_fix              |   48 +-
 debian/patches/series                     |    1 -
 debian/watch                              |    3 +-
 depcomp                                   |  189 +++++---
 include/libadmin/dbtlibadmin.h            |    2 -
 install-sh                                |   35 +-
 lib/base/file.cpp                         |    8 -
 lib/base/nscputil.cpp                     |    5 +-
 lib/libadmin/util.c                       |   88 ++--
 lib/libdsa/dsalib_confs.c                 |   16 +-
 lib/libdsa/dsalib_util.c                  |    8 -
 m4/adminutil.m4                           |    4 -
 m4/httpd.m4                               |    3 +-
 missing                                   |  148 ++----
 mod_admserv/mod_admserv.c                 |   81 ++--
 mod_restartd/mod_restartd-2.2.c           |   16 +
 wrappers/initscript.in                    |    3 +
 44 files changed, 1642 insertions(+), 766 deletions(-)

diff --cc debian/control
index 02649b2,b4e3926..a2435c1
--- a/debian/control
+++ b/debian/control
@@@ -1,8 -1,8 +1,9 @@@
  Source: 389-admin
  Section: net
  Priority: optional
 -Maintainer: Debian 389ds Team <pkg-fedora-ds-maintainers at lists.alioth.debian.org>
 +Maintainer: Ubuntu 389ds <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: quilt, debhelper (>= 9),
   dh-autoreconf,
   libnspr4-dev,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-fedora-ds/389-admin.git