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

[Arno Töll]

The following commit has been merged in the next branch:
commit fea3d476676d0e8ede7e98faf1dcffd0f865d715
Author: Arno Töll <debian at toell.net>
Date:   Fri Mar 9 01:08:03 2012 +0100

    * Declare copyrights in a2query.in and apache2-maintscript-helper
    * Fix watch file (thanks to nirgal for the hint)

diff --git a/debian/a2query.in b/debian/a2query.in
index 19786f9..ac21c23 100755
--- a/debian/a2query.in
+++ b/debian/a2query.in
@@ -1,5 +1,42 @@
 #! /usr/bin/perl
 
+# a2query - Apache2 helper to retrieve configuration informations
+# Copyright (C) 2012 Arno Töll <debian at toell.net>
+#
+# This program is licensed at your choice under the terms of the GNU General
+# Public License vserion 2+ or under the terms of the Apache Software License
+# 2.0.
+#
+# For 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.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+# USA.
+#
+# For ASF 2.0:
+# Licensed 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.
+
+
 use feature "switch";
 use strict;
 use Getopt::Std;
diff --git a/debian/changelog b/debian/changelog
index c87f318..c62546f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -130,7 +130,9 @@ apache2 (2.4.1-1) experimental; urgency=low
     reliable way with the Apache 2 web server in maintainer scripts
   * Document programming hints how to interface with the Apache 2 web server for
   * packagers of web applications and module maintainer in
-    /usr/share/doc/apache2/PROGRAMMING
+    /usr/share/doc/apache2/PROGRAMMING.
+  * Fix the watch file, thanks to Jean-Michel Vourgère for pointing out the
+    problem.
 
   [ Stefan Fritsch ]
 
@@ -149,7 +151,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 00:24:02 +0100
+ -- Arno Töll <debian at toell.net>  Fri, 09 Mar 2012 00:41:22 +0100
 
 apache2 (2.2.22-1) unstable; urgency=low
 
diff --git a/debian/debhelper/apache2-maintscript-helper b/debian/debhelper/apache2-maintscript-helper
index 002f0a3..c57c10a 100644
--- a/debian/debhelper/apache2-maintscript-helper
+++ b/debian/debhelper/apache2-maintscript-helper
@@ -1,3 +1,16 @@
+# apache2-maintscript-helper - Apache2 helper function for maintainer scripts
+# Copyright (C) 2012 Arno Töll <debian at toell.net>
+#
+# 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.
+
+
 EXPORT_APACHE2_MAINTSCRIPT_HELPER=1
 
 #
diff --git a/debian/watch b/debian/watch
index 73d0489..2b13310 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://www.apache.org/dist/httpd/httpd-(2\.2.*)\.tar\.gz
+http://www.apache.org/dist/httpd/httpd-(\d\.[02468].*)\.tar\.gz

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