[Pkg-apache-commits] r1385 - in /trunk/apache2: changelog config-dir/mods-available/alias.conf control rules

atoell-guest at alioth.debian.org atoell-guest at alioth.debian.org
Tue Dec 13 21:57:46 UTC 2011 

Author: atoell-guest
Date: Tue Dec 13 21:57:45 2011
New Revision: 1385

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1385
Log:
Remove unneeded 'set -e' calls, add myself to uploaders, don't export DH_VERBOSE by default anymore, make Options for /usr/share/apache2/icons more obvious

Modified:
    trunk/apache2/changelog
    trunk/apache2/config-dir/mods-available/alias.conf
    trunk/apache2/control
    trunk/apache2/rules

Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=1385&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Tue Dec 13 21:57:45 2011
@@ -31,13 +31,14 @@
     from text/plain to None. This lets the browser guess a proper MIME type
     instead of being forced to treat a given file according to our default type
     (Closes: #440058)
+  * Add myself to Uploaders
 
   [Stefan Fritsch]
 
   * Optimize debian/rules again to improve build time by doing most work in a
     parallelized "build-and-install-%" target.
 
- -- Arno Töll <debian at toell.net>  Tue, 13 Dec 2011 19:49:08 +0100
+ -- Arno Töll <debian at toell.net>  Tue, 13 Dec 2011 22:03:09 +0100
 
 apache2 (2.2.21-3) unstable; urgency=medium
 

Modified: trunk/apache2/config-dir/mods-available/alias.conf
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/config-dir/mods-available/alias.conf?rev=1385&op=diff
==============================================================================
--- trunk/apache2/config-dir/mods-available/alias.conf (original)
+++ trunk/apache2/config-dir/mods-available/alias.conf Tue Dec 13 21:57:45 2011
@@ -15,7 +15,7 @@
 Alias /icons/ "/usr/share/apache2/icons/"
 
 <Directory "/usr/share/apache2/icons">
-    Options -Indexes -MultiViews
+    Options FollowSymlinks
     AllowOverride None
     Order allow,deny
     Allow from all

Modified: trunk/apache2/control
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/control?rev=1385&op=diff
==============================================================================
--- trunk/apache2/control (original)
+++ trunk/apache2/control Tue Dec 13 21:57:45 2011
@@ -2,7 +2,7 @@
 Section: httpd
 Priority: optional
 Maintainer: Debian Apache Maintainers <debian-apache at lists.debian.org>
-Uploaders: Stefan Fritsch <sf at debian.org>, Steinar H. Gunderson <sesse at debian.org>
+Uploaders: Stefan Fritsch <sf at debian.org>, Steinar H. Gunderson <sesse at debian.org>, Arno Töll <debian at toell.net>
 Build-Depends: debhelper (>= 8), lsb-release, libaprutil1-dev (>= 1.3.4), libapr1-dev, openssl, libpcre3-dev, mawk, zlib1g-dev, libssl-dev (>= 0.9.8m), sharutils, libcap-dev [linux-any], autoconf
 Build-Conflicts: autoconf2.13
 Standards-Version: 3.9.2

Modified: trunk/apache2/rules
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/rules?rev=1385&op=diff
==============================================================================
--- trunk/apache2/rules (original)
+++ trunk/apache2/rules Tue Dec 13 21:57:45 2011
@@ -10,7 +10,9 @@
 #    MPM in any other. Hence, we build modules only for the worker MPM and reuse
 #    it for all the remaining MPMs. The worker $(DEFAULT_MPM) is the basic
 #    installation path where packages are being built from. From the remaining
-#    MPMs only the respective binaries are taken.
+#    MPMs only the respective binaries are taken. Development header are
+#    similary taken from the prefork MPM, although the threaded MPMs need their
+#    own headers partially.
 # 3) The ITK MPM needs modification in the source tree. Hence it is absolutely
 #    necessary to copy the source tree before applying patches which enable the
 #    ITK. For the remaining MPMs that's not stricly necessary
@@ -23,7 +25,7 @@
 #    (future) binary packages.See various dh_install* overrides to get the idea.
 
 # Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
+#export DH_VERBOSE=1
 
 BUILD_DIR=debian/build-tree
 INSTALL_DIR_RELATIVE=install-tree
@@ -115,9 +117,9 @@
 	rm -f debian/tmp
 
 build-%:
-	@set -ex
 	mkdir "$(BUILD_DIR)/$*"
 	cp -a `find . -maxdepth 1 -mindepth 1 -not -name debian` $(BUILD_DIR)/$*
+	set -ex	;										\
 	if [ $* = itk ] ; then                                                                  \
 		cd $(BUILD_DIR)/$* ;                                                            \
 		mkdir server/mpm/experimental/itk/ ;                                            \
@@ -145,6 +147,7 @@
 
 
 install-dev: build-worker build-prefork
+	set -ex ; \
 	for i in worker prefork; do \
 		if [ "$$i" = "prefork" ]; then \
 			TARGET=prefork ;\
@@ -169,14 +172,12 @@
 	done
 
 undo-mpm-%-maintainer-scripts:
-	@set -ex
 	for f in postinst preinst prerm links dirs ; do \
 		rm -f debian/apache2-mpm-$*.$$f ;\
 	done
 	rm -f debian/apache2-mpm-$*.lintian-overrides
 
 mpm-%-maintainer-scripts: debian/mpms.postinst debian/mpms.preinst debian/mpms.prerm debian/mpms.lintian-overrides debian/mpms.dirs debian/mpms.links
-	@set -ex
 	for f in postinst preinst prerm links dirs ; do \
 		perl -p -e "s/MPMXXX/$*/g" < debian/mpms.$$f > debian/apache2-mpm-$*.$$f ;\
 	done
@@ -222,11 +223,9 @@
 	cp debian/default-index.html debian/apache2.2-common/usr/share/apache2/default-site/index.html
 	cp debian/bash_completion debian/apache2.2-common/etc/bash_completion.d/apache2.2-common
 	cp debian/apache2-doc.conf debian/apache2-doc/etc/apache2/conf.d/apache2-doc
-	cp debian/default-index.html debian/apache2.2-common/usr/share/apache2/default-site/index.html
 	perl debian/convert_docs debian/apache2-doc/usr/share/doc/apache2-doc/manual
 
 override_dh_fixperms:
-	@set -ex
 	# standard suexec
 	chmod 4754 debian/apache2-suexec/usr/lib/apache2/suexec
 	chgrp www-data debian/apache2-suexec/usr/lib/apache2/suexec
@@ -254,7 +253,6 @@
 	cp debian/mpm-itk/README debian/apache2.2-common/usr/share/doc/apache2.2-common/README.mpm-itk
 	cp debian/mpm-itk/CHANGES debian/apache2.2-common/usr/share/doc/apache2.2-common/changelog.mpm-itk
 	cp debian/mpm-itk/debian/changelog debian/apache2.2-common/usr/share/doc/apache2.2-common/changelog.mpm-itk.Debian
-	@set -ex
 	for p in apache2-prefork-dev apache2-threaded-dev apache2-mpm-prefork apache2-mpm-event \
 		apache2-mpm-worker apache2-mpm-itk apache2; \
 	do \
@@ -272,6 +270,7 @@
 
 override_dh_strip:
 	dh_strip --dbg-package=apache2-dbg -Napache2-dbg -Xusr/lib/apache2/mpm
+	set -e \
 	if [ "$(LSB_RELEASE)" != "Ubuntu" ] && [ -n "$(DEB_BUILD_STRIP)" ] ; then \
 		for i in $(MPMS); do \
 			MPM=usr/lib/apache2/mpm-$$i/apache2 ;\

More information about the Pkg-apache-commits mailing list