[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, next, updated. 68930adb12678db0840275cd5fc7dfdc252b3f45

Arno Töll debian at toell.net
Sun Mar 11 02:30:39 UTC 2012


The following commit has been merged in the next branch:
commit 68930adb12678db0840275cd5fc7dfdc252b3f45
Author: Arno Töll <debian at toell.net>
Date:   Sun Mar 11 03:21:23 2012 +0100

    Update changelog, document Lintian overrides, update maintainer scripts
    
    * Update debian/copyright for Apache 2.4. While I was at it, I switched to DEP-5
    * Update maintainer scripts for apache2-doc to use the maintscript-helper
    * Update descriptions of MPM transitional packages
    * Document Lintian overrides
    * Make changelog.Debian.gz in apache2-data a symlink to apache2's changelog.
      Lintian won't like that. Me neither. Bad bad bad Arno.

diff --git a/debian/apache2-data.links b/debian/apache2-data.links
new file mode 100644
index 0000000..c5ff091
--- /dev/null
+++ b/debian/apache2-data.links
@@ -0,0 +1,2 @@
+# This link is dangling by design (sometimes)
+usr/share/doc/apache2/changelog.Debian.gz	usr/share/doc/apache2-data/changelog.Debian.gz
diff --git a/debian/apache2-doc.postinst b/debian/apache2-doc.postinst
index f506468..ee9465f 100644
--- a/debian/apache2-doc.postinst
+++ b/debian/apache2-doc.postinst
@@ -2,23 +2,18 @@
 
 set -e
 
-# conffiles be moved before invoking rc.d
+# conffiles must be moved before invoking rc.d
 #DEBHELPER#
 
 # This code should use dh_apache2 once it is available as build dependency
 
 if [ "$1" = "configure" ] ; then
-        if [ -x "/usr/sbin/a2enconf" ] ; then
-                for S in apache2-doc ; do
-                        /usr/sbin/a2enconf -q $S || true
-                done
-
-                if [ -x "/etc/init.d/apache2" ]; then
-                      invoke-rc.d apache2 restart || true
-                fi
-
-        fi
+	if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
+		if [ -z $EXPORT_APACHE2_MAINTSCRIPT_HELPER ] ; then
+			. /usr/share/apache2/apache2-maintscript-helper
+		fi
+		apache2_invoke enconf apache2-doc || true
+	fi
 fi
 
-exit 0
-
+exit
diff --git a/debian/apache2-doc.postrm b/debian/apache2-doc.postrm
index 567d86c..5159100 100644
--- a/debian/apache2-doc.postrm
+++ b/debian/apache2-doc.postrm
@@ -5,18 +5,16 @@ set -e
 # This code should use dh_apache2 once it is available as build dependency
 
 if [ "$1" = "purge" ] ; then
-        if [ -x "/usr/sbin/a2disconf" ] ; then
-                for S in apache2-doc ; do
-                        /usr/sbin/a2disconf -q $S || true
-                done
+	if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
+		if [ -z $EXPORT_APACHE2_MAINTSCRIPT_HELPER ] ; then
+			. /usr/share/apache2/apache2-maintscript-helper
+		fi
+		apache2_invoke disconf apache2-doc || true
 
-                if [ -x "/etc/init.d/apache2" ]; then
-                      invoke-rc.d apache2 restart || true
-                fi
-
-        fi
+	fi
 fi
 
+
 #DEBHELPER#
 
 exit 0
diff --git a/debian/apache2-suexec.lintian-overrides.in b/debian/apache2-suexec.lintian-overrides.in
index c592525..c50c815 100644
--- a/debian/apache2-suexec.lintian-overrides.in
+++ b/debian/apache2-suexec.lintian-overrides.in
@@ -1 +1,4 @@
+# The suexec binaries basically do no more than setuid/setgid before executing a
+# CGI script. As these operations require root privileges but Apache drops its
+# privileges, the binary needs to have the setuid bit set
 setuid-binary usr/lib/apache2/suexec-__TYPE__ 4754 root/www-data
diff --git a/debian/apache2.lintian-overrides b/debian/apache2.lintian-overrides
index 40060be..4d9c867 100644
--- a/debian/apache2.lintian-overrides
+++ b/debian/apache2.lintian-overrides
@@ -1,2 +1,6 @@
+# Log files must not be world readable because they may contain sensitive
+# information
 non-standard-dir-perm var/log/apache2/ 0750 != 0755
+# The default configuration refers to this directory. Thus it should exist on
+# default installations.
 package-contains-empty-directory usr/lib/cgi-bin/
diff --git a/debian/changelog b/debian/changelog
index 1bb4792..762a2d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -135,6 +135,8 @@ apache2 (2.4.1-1) experimental; urgency=low
     /usr/share/doc/apache2/PROGRAMMING.
   * Fix the watch file, thanks to Jean-Michel Vourgère for pointing out the
     problem.
+  * Update debian/copyright and switch it to the copyright-format 1.0 (formerly
+    known as DEP5)
 
   [ Stefan Fritsch ]
 
@@ -153,7 +155,7 @@ apache2 (2.4.1-1) experimental; urgency=low
   * Migrate patches to DEP-3 format. For particular changes see the summary
     above.
 
- -- Arno Töll <debian at toell.net>  Fri, 09 Mar 2012 03:03:54 +0100
+ -- Arno Töll <debian at toell.net>  Sun, 11 Mar 2012 01:00:01 +0100
 
 apache2 (2.2.22-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index ee3736d..e783f2a 100644
--- a/debian/control
+++ b/debian/control
@@ -67,27 +67,27 @@ Architecture: any
 Section: oldlibs
 Priority: extra
 Depends: ${shlibs:Depends}, ${misc:Depends}, apache2 (= ${binary:Version})
-Description: transitional package for apache2
- This is a transitional package for apache2, and can be safely removed
- after the installation is complete.
+Description: transitional worker MPM package for apache2
+ This is a transitional package to apache2 for users of apache2-mpm-worker and
+ can be safely removed after the installation is complete.
 
 Package: apache2-mpm-prefork
 Architecture: any
 Section: oldlibs
 Priority: extra
 Depends: ${shlibs:Depends}, ${misc:Depends}, apache2 (= ${binary:Version})
-Description: transitional package for apache2
- This is a transitional package for apache2, and can be safely removed
- after the installation is complete.
+Description: transitional prefork MPM package for apache2
+ This is a transitional package to apache2 for users of apache2-mpm-prefork and
+ can be safely removed after the installation is complete.
 
 Package: apache2-mpm-event
 Architecture: any
 Section: oldlibs
 Priority: extra
 Depends: ${shlibs:Depends}, ${misc:Depends}, apache2 (= ${binary:Version})
-Description: transitional package for apache2
- This is a transitional package for apache2, and can be safely removed
- after the installation is complete.
+Description: transitional event MPM package for apache2
+ This is a transitional package to apache2 for users of apache2-mpm-event and
+ can be safely removed after the  installation is complete.
 
 #XXX: apache2-mpm-itk transitional?
 
@@ -210,9 +210,9 @@ Priority: optional
 Architecture: all
 Depends: debhelper (>= 7.0.50~), ${misc:Depends}
 Description: Apache debhelper utilities
- The apache debhelper provides dh_apache2 and dh sequence addons useful to
+ The Apache debhelper provides dh_apache2 and dh sequence addons useful to
  install various Debian Apache2 extensions. It supports
- - Apache 2 module configurations and shared objects
- - Site configuration files
- - Global configuration files
+  - Apache 2 module configurations and shared objects
+  - Site configuration files
+  - Global configuration files
 
diff --git a/debian/copyright b/debian/copyright
index 1f5e219..eafcc23 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,546 +1,463 @@
-This package was debianized by Thom May <thom at ubuntu.com> on
-Tues, 8 Feb 2005 16:00:00 +0000.
-
-It was downloaded from http://httpd.apache.org/download.cgi
-
-Upstream Authors:
-	The Apache Software Foundation - http://httpd.apache.org
-	For apache2-mpm-itk:
-	Steinar H. Gunderson <sgunderson at bigfoot.com>
-	Knut Auvor Grythe <knut at auvor.no>
-
-Copyright:
-
-Licensed to the Apache Software Foundation (ASF) under one or more contributor
-license agreements. The ASF licenses this work to You under the Apache License,
-Version 2.0 (the "License"); you may not use this work except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-On a Debian system, the license can be found at
-/usr/share/common-licenses/Apache-2.0 .
-
-APACHE2-MPM-ITK:
-
-apache2-mpm-itk is copyright Steinar H. Gunderson <sgunderson at bigfoot.com>
-and Knut Auvor Grythe <knut at auvor.no>, and is provided under the same license
-as the Apache web server.
-
-Get the latest version at http://mpm-itk.sesse.net/ .
-
-APACHE HTTP SERVER SUBCOMPONENTS: 
-
-The Apache HTTP Server includes a number of subcomponents with
-separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses. 
-
-For the mod_mime_magic component:
-
-/*
- * mod_mime_magic: MIME type lookup via file magic numbers
- * Copyright (c) 1996-1997 Cisco Systems, Inc.
- *
- * This software was submitted by Cisco Systems to the Apache Group in July
- * 1997.  Future revisions and derivatives of this source code must
- * acknowledge Cisco Systems as the original contributor of this module.
- * All other licensing and usage conditions are those of the Apache Group.
- *
- * Some of this code is derived from the free version of the file command
- * originally posted to comp.sources.unix.  Copyright info for that program
- * is included below as required.
- * ---------------------------------------------------------------------------
- * - Copyright (c) Ian F. Darwin, 1987. Written by Ian F. Darwin.
- *
- * This software is not subject to any license of the American Telephone and
- * Telegraph Company or of the Regents of the University of California.
- *
- * Permission is granted to anyone to use this software for any purpose on any
- * computer system, and to alter it and redistribute it freely, subject to
- * the following restrictions:
- *
- * 1. The author is not responsible for the consequences of use of this
- * software, no matter how awful, even if they arise from flaws in it.
- *
- * 2. The origin of this software must not be misrepresented, either by
- * explicit claim or by omission.  Since few users ever read sources, credits
- * must appear in the documentation.
- *
- * 3. Altered versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.  Since few users ever read
- * sources, credits must appear in the documentation.
- *
- * 4. This notice may not be removed or altered.
- * -------------------------------------------------------------------------
- *
- */
-
-For the file /etc/apache2/magic (taken from the package file 4.17-5etch3):
-
-Copyright (c) Ian F. Darwin 1986, 1987, 1989, 1990, 1991, 1992, 1994, 1995.
-Software written by Ian F. Darwin and others;
-maintained 1994-2004 Christos Zoulas.
-
-This software is not subject to any export provision of the United States
-Department of Commerce, and may be exported to any country or planet.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice immediately at the beginning of the file, without modification,
-   this list of conditions, and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-
-For the  modules\mappers\mod_imap.c component:
-
-  "macmartinized" polygon code copyright 1992 by Eric Haines, erich at eye.com
-
-For the  server\util_md5.c component:
-
-/************************************************************************
- * NCSA HTTPd Server
- * Software Development Group
- * National Center for Supercomputing Applications
- * University of Illinois at Urbana-Champaign
- * 605 E. Springfield, Champaign, IL 61820
- * httpd at ncsa.uiuc.edu
- *
- * Copyright  (C)  1995, Board of Trustees of the University of Illinois
- *
- ************************************************************************
- *
- * md5.c: NCSA HTTPd code which uses the md5c.c RSA Code
- *
- *  Original Code Copyright (C) 1994, Jeff Hostetler, Spyglass, Inc.
- *  Portions of Content-MD5 code Copyright (C) 1993, 1994 by Carnegie Mellon
- *     University (see Copyright below).
- *  Portions of Content-MD5 code Copyright (C) 1991 Bell Communications 
- *     Research, Inc. (Bellcore) (see Copyright below).
- *  Portions extracted from mpack, John G. Myers - jgm+ at cmu.edu
- *  Content-MD5 Code contributed by Martin Hamilton (martin at net.lut.ac.uk)
- *
- */
-
-
-/* these portions extracted from mpack, John G. Myers - jgm+ at cmu.edu */
-/* (C) Copyright 1993,1994 by Carnegie Mellon University
- * All Rights Reserved.
- *
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without
- * fee, provided that the above copyright notice appear in all copies
- * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of Carnegie
- * Mellon University not be used in advertising or publicity
- * pertaining to distribution of the software without specific,
- * written prior permission.  Carnegie Mellon University makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
- *
- * Permission to use, copy, modify, and distribute this material
- * for any purpose and without fee is hereby granted, provided
- * that the above copyright notice and this permission notice
- * appear in all copies, and that the name of Bellcore not be
- * used in advertising or publicity pertaining to this
- * material without the specific, prior written permission
- * of an authorized representative of Bellcore.  BELLCORE
- * MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
- * OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
- * WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.  
- */
-
-For the  srclib\apr\include\apr_md5.h component: 
-/*
- * This is work is derived from material Copyright RSA Data Security, Inc.
- *
- * The RSA copyright statement and Licence for that original material is
- * included below. This is followed by the Apache copyright statement and
- * licence for the modifications made to that material.
- */
-
-/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
-   rights reserved.
-
-   License to copy and use this software is granted provided that it
-   is identified as the "RSA Data Security, Inc. MD5 Message-Digest
-   Algorithm" in all material mentioning or referencing this software
-   or this function.
-
-   License is also granted to make and use derivative works provided
-   that such works are identified as "derived from the RSA Data
-   Security, Inc. MD5 Message-Digest Algorithm" in all material
-   mentioning or referencing the derived work.
-
-   RSA Data Security, Inc. makes no representations concerning either
-   the merchantability of this software or the suitability of this
-   software for any particular purpose. It is provided "as is"
-   without express or implied warranty of any kind.
-
-   These notices must be retained in any copies of any part of this
-   documentation and/or software.
- */
-
-For the  srclib\apr\passwd\apr_md5.c component:
-
-/*
- * This is work is derived from material Copyright RSA Data Security, Inc.
- *
- * The RSA copyright statement and Licence for that original material is
- * included below. This is followed by the Apache copyright statement and
- * licence for the modifications made to that material.
- */
-
-/* MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
- */
-
-/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
-   rights reserved.
-
-   License to copy and use this software is granted provided that it
-   is identified as the "RSA Data Security, Inc. MD5 Message-Digest
-   Algorithm" in all material mentioning or referencing this software
-   or this function.
-
-   License is also granted to make and use derivative works provided
-   that such works are identified as "derived from the RSA Data
-   Security, Inc. MD5 Message-Digest Algorithm" in all material
-   mentioning or referencing the derived work.
-
-   RSA Data Security, Inc. makes no representations concerning either
-   the merchantability of this software or the suitability of this
-   software for any particular purpose. It is provided "as is"
-   without express or implied warranty of any kind.
-
-   These notices must be retained in any copies of any part of this
-   documentation and/or software.
- */
-/*
- * The apr_md5_encode() routine uses much code obtained from the FreeBSD 3.0
- * MD5 crypt() function, which is licenced as follows:
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <phk at login.dknet.dk> wrote this file.  As long as you retain this notice you
- * can do whatever you want with this stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return.  Poul-Henning Kamp
- * ----------------------------------------------------------------------------
- */
-
-For the srclib\apr-util\crypto\apr_md4.c component:
-
- * This is derived from material copyright RSA Data Security, Inc.
- * Their notice is reproduced below in its entirety.
- *
- * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
- * rights reserved.
- *
- * License to copy and use this software is granted provided that it
- * is identified as the "RSA Data Security, Inc. MD4 Message-Digest
- * Algorithm" in all material mentioning or referencing this software
- * or this function.
- *
- * License is also granted to make and use derivative works provided
- * that such works are identified as "derived from the RSA Data
- * Security, Inc. MD4 Message-Digest Algorithm" in all material
- * mentioning or referencing the derived work.
- *
- * RSA Data Security, Inc. makes no representations concerning either
- * the merchantability of this software or the suitability of this
- * software for any particular purpose. It is provided "as is"
- * without express or implied warranty of any kind.
- *
- * These notices must be retained in any copies of any part of this
- * documentation and/or software.
- */
-
-For the srclib\apr-util\include\apr_md4.h component:
-
- *
- * This is derived from material copyright RSA Data Security, Inc.
- * Their notice is reproduced below in its entirety.
- *
- * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
- * rights reserved.
- *
- * License to copy and use this software is granted provided that it
- * is identified as the "RSA Data Security, Inc. MD4 Message-Digest
- * Algorithm" in all material mentioning or referencing this software
- * or this function.
- *
- * License is also granted to make and use derivative works provided
- * that such works are identified as "derived from the RSA Data
- * Security, Inc. MD4 Message-Digest Algorithm" in all material
- * mentioning or referencing the derived work.
- *
- * RSA Data Security, Inc. makes no representations concerning either
- * the merchantability of this software or the suitability of this
- * software for any particular purpose. It is provided "as is"
- * without express or implied warranty of any kind.
- *
- * These notices must be retained in any copies of any part of this
- * documentation and/or software.
- */
-
-
-For the srclib\apr-util\test\testdbm.c component:
-
-/* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" must
- *    not be used to endorse or promote products derived from this
- *    software without prior written permission. For written
- *    permission, please contact apache at apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- *    nor may "Apache" appear in their name, without prior written
- *    permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- * This file came from the SDBM package (written by oz at nexus.yorku.ca).
- * That package was under public domain. This file has been ported to
- * APR, updated to ANSI C and other, newer idioms, and added to the Apache
- * codebase under the above copyright and license.
- */
-
-
-For the srclib\apr-util\test\testmd4.c component:
-
- *
- * This is derived from material copyright RSA Data Security, Inc.
- * Their notice is reproduced below in its entirety.
- *
- * Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All
- * rights reserved.
- *
- * RSA Data Security, Inc. makes no representations concerning either
- * the merchantability of this software or the suitability of this
- * software for any particular purpose. It is provided "as is"
- * without express or implied warranty of any kind.
- *
- * These notices must be retained in any copies of any part of this
- * documentation and/or software.
- */
-
-For the srclib\apr-util\xml\expat\conftools\install-sh component:
-
-#
-# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
-#
-# Copyright 1991 by the Massachusetts Institute of Technology
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission.  M.I.T. makes no representations about the
-# suitability of this software for any purpose.  It is provided "as is"
-# without express or implied warranty.
-#
-
-For the srclib\pcre\install-sh component:
-
-#
-# Copyright 1991 by the Massachusetts Institute of Technology
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission.  M.I.T. makes no representations about the
-# suitability of this software for any purpose.  It is provided "as is"
-# without express or implied warranty.
-
-For the pcre component:
-
-PCRE LICENCE
-------------
-
-PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-Written by: Philip Hazel <ph10 at cam.ac.uk>
-
-University of Cambridge Computing Service,
-Cambridge, England. Phone: +44 1223 334714.
-
-Copyright (c) 1997-2001 University of Cambridge
-
-Permission is granted to anyone to use this software for any purpose on any
-computer system, and to redistribute it freely, subject to the following
-restrictions:
-
-1. This software is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-2. The origin of this software must not be misrepresented, either by
-   explicit claim or by omission. In practice, this means that if you use
-   PCRE in software which you distribute to others, commercially or
-   otherwise, you must put a sentence like this
-
-     Regular expression support is provided by the PCRE library package,
-     which is open source software, written by Philip Hazel, and copyright
-     by the University of Cambridge, England.
-
-   somewhere reasonably visible in your documentation and in any relevant
-   files or online help data or similar. A reference to the ftp site for
-   the source, that is, to
-
-     ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
-
-   should also be given in the documentation.
-
-3. Altered versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-
-4. If PCRE is embedded in any software that is released under the GNU
-   General Purpose Licence (GPL), or Lesser General Purpose Licence (LGPL),
-   then the terms of that licence shall supersede any condition above with
-   which it is incompatible.
-
-The documentation for PCRE, supplied in the "doc" directory, is distributed
-under the same terms as the software itself.
-
-End PCRE LICENCE
-
-Note: The various versions of the GPL and the LGPL can be found in
-/usr/share/common-licenses/.
-
-For the test\zb.c component:
-
-/*                          ZeusBench V1.01
-			    ===============
-
-This program is Copyright (C) Zeus Technology Limited 1996.
-
-This program may be used and copied freely providing this copyright notice
-is not removed.
-
-This software is provided "as is" and any express or implied waranties, 
-including but not limited to, the implied warranties of merchantability and
-fitness for a particular purpose are disclaimed.  In no event shall 
-Zeus Technology Ltd. be liable for any direct, indirect, incidental, special, 
-exemplary, or consequential damaged (including, but not limited to, 
-procurement of substitute good or services; loss of use, data, or profits;
-or business interruption) however caused and on theory of liability.  Whether
-in contract, strict liability or tort (including negligence or otherwise) 
-arising in any way out of the use of this software, even if advised of the
-possibility of such damage.
-
-     Written by Adam Twiss (adam at zeus.co.uk).  March 1996
-
-Thanks to the following people for their input:
-  Mike Belshe (mbelshe at netscape.com) 
-  Michael Campanella (campanella at stevms.enet.dec.com)
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Apache HTTPD Server
+Source: http://httpd.apache.org/
+
+Files: *
+Copyright: Copyright 2009 The Apache Software Foundation
+License: Apache 2.0
+
+Files: include/ap_regex.h
+Copyright: 2009 The Apache Software Foundation
+ Copyright: 1997-2004 University of Cambridge
+License: Apache 2.0 and BSD-3-clause (Cambridge)
+
+Files: server/util_pcre.c
+Copyright:  1997-2001 University of Cambridge
+License: PCRE
+
+Files: server/util_expr_parse.c
+Copyright: 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
+License: GPL-3+ or Custom
+
+Files: test/test_limits.c
+Copyright: 1998 Dag-Erling Codan Smrgrav
+License: BSD-3-clause (Smrgrav)
+
+Files: modules/metadata/mod_mime_magic.c
+Copyright: 2009 The Apache Software Foundation
+ 1996-1997 Cisco Systems, Inc.
+ 1987 Ian F. Darwin.
+License: Apache 2.0 and Cisco
+
+Files: docs/conf/magic debian/config-dir/magic
+Copyright: Ian F. Darwin 1986, 1987, 1989, 1990, 1991, 1992, 1994, 1995.
+License: BSD-2-clause (Darwin)
+
+Files: modules/mappers/mod_imagemap.c
+Copyright: 2009 The Apache Software Foundation
+ 1992 by Eric Haines, erich at eye.com
+License: Apache 2.0 and Haines
+
+Files: server/util_md5.c
+Copyright: 2009 The Apache Software Foundation
+ 1995, Board of Trustees of the University of Illinois
+ 1993,1994 by Carnegie Mellon University
+ 1991 Bell Communications Research, Inc. (Bellcore)
+License: Apache 2.0 and MD5
+
+Files: support/ab.c
+Copyright: 2009 The Apache Software Foundation
+ 1996 by Zeus Technology Ltd. http://www.zeustech.net/
+License: Apache 2.0 and Zeus
+
+Files: debian/a2query.in debian/debhelper/dh_apache2
+Copyright: 2012 Arno Töll
+License: Apache 2.0 or GPL-2+
+
+Files: debian/debhelper/apache2-maintscript-helper
+Copyright: 2012 Arno Töll
+License: Free for all
+
+Files: debian/a2enmod
+Copyright: 2008 Stefan Fritsch
+License: Apache 2.0
+
+License: Apache 2.0
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+ .
+      http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian systems, the full text of the Apache Software License version 2 can
+ be found in the file `/usr/share/common-licenses/Apache-2.0'.
+
+License: Zeus
+   This program is based on ZeusBench V1.0 written by Adam Twiss
+   which is Copyright (c) 1996 by Zeus Technology Ltd. http://www.zeustech.net/
+   .
+   This software is provided "as is" and any express or implied waranties,
+   including but not limited to, the implied warranties of merchantability and
+   fitness for a particular purpose are disclaimed.  In no event shall
+   Zeus Technology Ltd. be liable for any direct, indirect, incidental, special,
+   exemplary, or consequential damaged (including, but not limited to,
+   procurement of substitute good or services; loss of use, data, or profits;
+   or business interruption) however caused and on theory of liability.  Whether
+   in contract, strict liability or tort (including negligence or otherwise)
+   arising in any way out of the use of this software, even if advised of the
+   possibility of such damage
+
+License: PCRE
+ This is a library of functions to support regular expressions whose syntax
+ and semantics are as close as possible to those of the Perl 5 language. See
+ the file Tech.Notes for some information on the internals.
+ .
+ This module is a wrapper that provides a POSIX API to the underlying PCRE
+ functions.
+ .
+ Written by: Philip Hazel <ph10 at cam.ac.uk>
+ .
+           Copyright (c) 1997-2004 University of Cambridge
+ .
+ -----------------------------------------------------------------------------
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+ .
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+ .
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+
+
+License: MD5
+ NCSA HTTPd Server
+ Software Development Group
+ National Center for Supercomputing Applications
+ University of Illinois at Urbana-Champaign
+ 605 E. Springfield, Champaign, IL 61820
+ httpd at ncsa.uiuc.edu
+ .
+  Copyright  (C)  1995, Board of Trustees of the University of Illinois
+ .
+ ***********************************************************************
+ .
+ md5.c: NCSA HTTPd code which uses the md5c.c RSA Code
+ .
+   Original Code Copyright (C) 1994, Jeff Hostetler, Spyglass, Inc.
+   Portions of Content-MD5 code Copyright (C) 1993, 1994 by Carnegie Mellon
+      University (see Copyright below).
+   Portions of Content-MD5 code Copyright (C) 1991 Bell Communications
+      Research, Inc. (Bellcore) (see Copyright below).
+   Portions extracted from mpack, John G. Myers - jgm+ at cmu.edu
+   Content-MD5 Code contributed by Martin Hamilton (martin at net.lut.ac.uk)
+ .
+ these portions extracted from mpack, John G. Myers - jgm+ at cmu.edu */
+ .
+ (C) Copyright 1993,1994 by Carnegie Mellon University
+ All Rights Reserved.
+ .
+ Permission to use, copy, modify, distribute, and sell this software
+ and its documentation for any purpose is hereby granted without
+ fee, provided that the above copyright notice appear in all copies
+ and that both that copyright notice and this permission notice
+ appear in supporting documentation, and that the name of Carnegie
+ Mellon University not be used in advertising or publicity
+ pertaining to distribution of the software without specific,
+ written prior permission.  Carnegie Mellon University makes no
+ representations about the suitability of this software for any
+ purpose.  It is provided "as is" without express or implied
+ warranty.
+ .
+ CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ SOFTWARE.
+ .
+ .
+ .
+ Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
+ .
+ Permission to use, copy, modify, and distribute this material
+ for any purpose and without fee is hereby granted, provided
+ that the above copyright notice and this permission notice
+ appear in all copies, and that the name of Bellcore not be
+ used in advertising or publicity pertaining to this
+ material without the specific, prior written permission
+ of an authorized representative of Bellcore.  BELLCORE
+ MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
+ OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
+ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
+
+
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-3'.
+
+License: GPL-2+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+
+License: Haines
+ This imagemap module started as a port of the original imagemap.c
+ written by Rob McCool (11/13/93 robm at ncsa.uiuc.edu).
+ This version includes the mapping algorithms found in version 1.3
+ of imagemap.c.
+ .
+ Contributors to this code include:
+ .
+ Kevin Hughes, kevinh at pulua.hcc.hawaii.edu
+ .
+ Eric Haines, erich at eye.com
+ "macmartinized" polygon code copyright 1992 by Eric Haines, erich at eye.com
+ .
+ Randy Terbush, randy at zyzzyva.com
+ port to Apache module format, "base_uri" and support for relative URLs
+ .
+ James H. Cloos, Jr., cloos at jhcloos.com
+ Added point datatype, using code in NCSA's version 1.8 imagemap.c
+ program, as distributed with version 1.4.1 of their server.
+ The point code is originally added by Craig Milo Rogers, Rogers at ISI.Edu
+ .
+ Nathan Kurz, nate at tripod.com
+ Rewrite/reorganization.  New handling of default, base and relative URLs.
+ New Configuration directives:
+    ImapMenu {none, formatted, semiformatted, unformatted}
+    ImapDefault {error, nocontent, referer, menu, URL}
+    ImapBase {map, referer, URL}
+ Support for creating non-graphical menu added.  (backwards compatible):
+    Old:  directive URL [x,y ...]
+    New:  directive URL "Menu text" [x,y ...]
+     or:  directive URL x,y ... "Menu text"
+ Map format and menu concept courtesy Joshua Bell, jsbell at acs.ucalgary.ca.
+ .
+ Mark Cox, mark at ukweb.com, Allow relative URLs even when no base specified
+
+
+License: BSD-2-clause (Darwin)
+ Software written by Ian F. Darwin and others;
+ maintained 1994-2004 Christos Zoulas.
+ .
+ This software is not subject to any export provision of the United States
+ Department of Commerce, and may be exported to any country or planet.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice immediately at the beginning of the file, without modification,
+    this list of conditions, and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+
+License: Cisco
+ This software was submitted by Cisco Systems to the Apache Software Foundation in July
+ 1997.  Future revisions and derivatives of this source code must
+ acknowledge Cisco Systems as the original contributor of this module.
+ All other licensing and usage conditions are those of the Apache Software Foundation.
+ .
+ Some of this code is derived from the free version of the file command
+ originally posted to comp.sources.unix.  Copyright info for that program
+ is included below as required.
+ ---------------------------------------------------------------------------
+ - Copyright (c) Ian F. Darwin, 1987. Written by Ian F. Darwin.
+ .
+ This software is not subject to any license of the American Telephone and
+ Telegraph Company or of the Regents of the University of California.
+ .
+ Permission is granted to anyone to use this software for any purpose on any
+ computer system, and to alter it and redistribute it freely, subject to
+ the following restrictions:
+ .
+ 1. The author is not responsible for the consequences of use of this
+ software, no matter how awful, even if they arise from flaws in it.
+ .
+ 2. The origin of this software must not be misrepresented, either by
+ explicit claim or by omission.  Since few users ever read sources, credits
+ must appear in the documentation.
+ .
+ 3. Altered versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.  Since few users ever read
+ sources, credits must appear in the documentation.
+ .
+ 4. This notice may not be removed or altered.
+  -------------------------------------------------------------------------
+ .
+ For compliance with Mr Darwin's terms: this has been very significantly
+ modified from the free "file" command.
+ - all-in-one file for compilation convenience when moving from one
+   version of Apache to the next.
+ - Memory allocation is done through the Apache API's apr_pool_t structure.
+ - All functions have had necessary Apache API request or server
+   structures passed to them where necessary to call other Apache API
+   routines.  (i.e. usually for logging, files, or memory allocation in
+   itself or a called function.)
+ - struct magic has been converted from an array to a single-ended linked
+   list because it only grows one record at a time, it's only accessed
+   sequentially, and the Apache API has no equivalent of realloc().
+ - Functions have been changed to get their parameters from the server
+   configuration instead of globals.  (It should be reentrant now but has
+   not been tested in a threaded environment.)
+ - Places where it used to print results to stdout now saves them in a
+   list where they're used to set the MIME type in the Apache request
+   record.
+ - Command-line flags have been removed since they will never be used here.
+ .
+ Ian Kluft <ikluft at cisco.com>
+ Engineering Information Framework
+ Central Engineering
+ Cisco Systems, Inc.
+ San Jose, CA, USA
+ .
+ Initial installation          July/August 1996
+ Misc bug fixes                May 1997
+ Submission to Apache Software Foundation    July 1997
+
+
+License: BSD-3-clause (Smrgrav)
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer
+    in this position and unchanged.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+    derived from this software withough specific prior written permission
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+License: BSD-3-clause (Cambridge)
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+ .
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+ .
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+
+License: Custom
+   As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+   .
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+   .
+   C LALR(1) parser skeleton written by Richard Stallman, by
+   simplifying the original so-called "semantic" parser.
+
+License: GPL-2.0+
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later
+ version.
+ .
+ This program is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+
+License: Free for all
+ As a special exception this file is not subject to any copyright and released
+ to the general public without any restriction in inclusion, embedding,
+ modification or distribution of this file. It can be included and used in any
+ other program without limitation.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-*/
-
-For the expat xml parser component:
-
-Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
-                               and Clark Cooper
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-	
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-	
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-====================================================================
-
-OpenDocument icons:
--------------------
-
-These icons are copyright of Pete Harlow and licensed under the Apache
-license. See 
-https://bugs.edge.launchpad.net/ubuntu/+source/apache2/+bug/130836 
-http://www.catnip.co.uk/opendocument/icons/#apache
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 844f3d9..b6f787a 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,7 +1,7 @@
 [DEFAULT]
 pristine-tar = True
 builder=dpkg-buildpackage -i\.git -I.git
-cleaner=true
+#cleaner=true
 
 [git-buildpackage]
 debian-branch=next
diff --git a/debian/rules b/debian/rules
index c16249c..5dc5151 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,7 @@ prepare-a2query:
 	(grep -s -v apache2:API debian/apache2-bin.substvars; echo apache2:API=apache2-api-$(API)) > debian/apache2-bin.substvars.new ; \
 	mv debian/apache2-bin.substvars.new debian/apache2-bin.substvars
 
-suexec-maintainer-scripts:
+generate-maintainer-scripts:
 	set -e ; \
 	for type in custom pristine ; do \
 		for f in postinst preinst prerm links dirs lintian-overrides; do \
@@ -47,11 +47,10 @@ suexec-maintainer-scripts:
 		done ;\
 	done
 
-
 %:
 	dh $@ --parallel --with autotools_dev
 
-override_dh_auto_configure: prepare-custom-suexec suexec-maintainer-scripts
+override_dh_auto_configure: prepare-custom-suexec generate-maintainer-scripts
 	./configure --enable-layout=Debian --enable-so --with-program-name=apache2 \
 		--enable-suexec --with-suexec-caller=www-data \
 		--with-suexec-bin=/usr/lib/apache2/suexec --with-suexec-docroot=/var/www \
@@ -88,7 +87,10 @@ override_dh_installinit:
 override_dh_installdocs:
 	# TODO: So, did anyone check convert_docs needs an update? ;)
 	perl debian/convert_docs debian/apache2-doc/usr/share/doc/apache2-doc/manual
-	dh_installdocs --link-doc=apache2 -papache2 -papache2-dev -papache2-dbg
+	dh_installdocs --link-doc=apache2 -papache2 -papache2-dev -papache2-dbg \
+		-papache2-mpm-worker -papache2-mpm-prefork -papache2-mpm-event
+	dh_installdocs --link-doc=apache2-bin -papache2.2-bin
+	dh_installdocs --link-doc=apache2-suexec-pristine -papache2-suexec
 	dh_installdocs
 
 override_dh_installchangelogs:
@@ -96,7 +98,8 @@ override_dh_installchangelogs:
 	# package not to trash the disk at the installation site. Together with
 	# dh_installdocs this means that changelogs are installed in a few
 	# packages only.
-	dh_installchangelogs -Napache2.2-bin -Napache2-suexec -Napache2-mpm -Napache2-data
+	dh_installchangelogs -Napache2.2-bin -Napache2-suexec -Napache2-mpm-worker \
+		-Napache2-mpm-prefork -Napache2-mpm-event -Napache2-data
 
 override_dh_installman:
 	mv debian/tmp/usr/share/man/man8/suexec.8 debian/tmp/usr/share/man/man8/suexec-pristine.8
@@ -110,4 +113,4 @@ override_dh_auto_install:
 
 
 
-.PHONY: prepare-custom-suexec suexec-maintainer-scripts clean-config-vars prepare-a2query
+.PHONY: prepare-custom-suexec generate-maintainer-scripts clean-config-vars prepare-a2query

-- 
Debian packaging for apache2 (Apache HTTPD 2.x)



More information about the Pkg-apache-commits mailing list