[Pkg-apache-commits] r1043 - in /trunk/apache2: changelog control source.lintian-overrides

[sf at alioth.debian.org]

Author: sf
Date: Sat Sep  5 06:59:46 2009
New Revision: 1043

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1043
Log:
Switch apache2.2-common and the four mpm packages from architecture all to
any. This is stupid but makes apache2 binNMUable again 

Modified:
    trunk/apache2/changelog
    trunk/apache2/control
    trunk/apache2/source.lintian-overrides

Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=1043&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Sat Sep  5 06:59:46 2009
@@ -2,6 +2,8 @@
 
   * Add Build-Conflicts: autoconf2.13 (closes: #541536).
   * Adjust priority of apache2-mpm-itk to extra.
+  * Switch apache2.2-common and the four mpm packages from architecture all to
+    any. This is stupid but makes apache2 binNMUable again (closes: #544509).
 
  -- Stefan Fritsch <sf at debian.org>  Sat, 05 Sep 2009 08:50:51 +0200
 

Modified: trunk/apache2/control
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/control?rev=1043&op=diff
==============================================================================
--- trunk/apache2/control (original)
+++ trunk/apache2/control Sat Sep  5 06:59:46 2009
@@ -11,7 +11,7 @@
 Homepage: http://httpd.apache.org/
 
 Package: apache2.2-common
-Architecture: all
+Architecture: any
 Depends: apache2.2-bin (= ${binary:Version}), apache2-utils, libmagic1, mime-support, lsb-base, procps [!hurd-i386], perl
 Recommends: ssl-cert
 Suggests: www-browser, apache2-doc, apache2-suexec | apache2-suexec-custom
@@ -42,7 +42,7 @@
  may bring their own Apache configuration, though.
 
 Package: apache2-mpm-worker
-Architecture: all
+Architecture: any
 Depends: apache2.2-common (= ${binary:Version}), apache2.2-bin (= ${binary:Version})
 Provides: apache2-mpm, apache2, httpd, httpd-cgi
 Conflicts: apache2-mpm, apache2-common
@@ -56,7 +56,7 @@
  and has a smaller memory footprint than the traditional prefork MPM.
 
 Package: apache2-mpm-prefork
-Architecture: all
+Architecture: any
 Depends: apache2.2-common (= ${binary:Version}), apache2.2-bin (= ${binary:Version})
 Provides: apache2-mpm, apache2, httpd, httpd-cgi
 Conflicts: apache2-mpm, apache2-common
@@ -73,7 +73,7 @@
  other.
 
 Package: apache2-mpm-event
-Architecture: all
+Architecture: any
 Depends: apache2.2-common (= ${binary:Version}), apache2.2-bin (= ${binary:Version})
 Provides: apache2-mpm, apache2, httpd, httpd-cgi
 Conflicts: apache2-mpm, apache2-common
@@ -92,7 +92,7 @@
 Depends: apache2.2-common (= ${binary:Version}), apache2.2-bin (= ${binary:Version})
 Provides: apache2-mpm, apache2, httpd, httpd-cgi
 Conflicts: apache2-mpm, apache2-common
-Architecture: all
+Architecture: any
 Priority: extra
 Description: multiuser MPM for Apache 2.2
  The ITK Multi-Processing Module (MPM) works in about the same way as the
@@ -152,7 +152,7 @@
 
 Package: apache2
 Architecture: all
-Depends: apache2-mpm-worker (>= ${source:Version}) | apache2-mpm-prefork (>= ${source:Version}) | apache2-mpm-event (>= ${source:Version}) | apache2-mpm-itk (>= ${source:Version}), apache2.2-common (= ${binary:Version})
+Depends: apache2-mpm-worker (>= ${source:Version}) | apache2-mpm-prefork (>= ${source:Version}) | apache2-mpm-event (>= ${source:Version}) | apache2-mpm-itk (>= ${source:Version})
 Description: Apache HTTP Server metapackage         
  The Apache Software Foundation's goal is to build a secure, efficient and
  extensible HTTP server as standards-compliant open source software. The

Modified: trunk/apache2/source.lintian-overrides
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/source.lintian-overrides?rev=1043&op=diff
==============================================================================
--- trunk/apache2/source.lintian-overrides (original)
+++ trunk/apache2/source.lintian-overrides Sat Sep  5 06:59:46 2009
@@ -1,9 +1,2 @@
 apache2 source: ancient-autotools-helper-file srclib/apr-util/xml/expat/conftools/config.sub 2002-03-07
 apache2 source: ancient-autotools-helper-file srclib/apr-util/xml/expat/conftools/config.guess 2002-03-20
-apache2 source: not-binnmuable-all-depends-any apache2-mpm-event -> apache2.2-bin
-apache2 source: not-binnmuable-all-depends-any apache2.2-common -> apache2.2-bin
-apache2 source: not-binnmuable-any-depends-all apache2-threaded-dev -> apache2.2-common
-apache2 source: not-binnmuable-any-depends-all apache2-prefork-dev -> apache2.2-common
-apache2 source: not-binnmuable-all-depends-any apache2-mpm-prefork -> apache2.2-bin
-apache2 source: not-binnmuable-all-depends-any apache2-mpm-worker -> apache2.2-bin
-apache2 source: not-binnmuable-all-depends-any apache2-mpm-itk -> apache2.2-bin