[SCM] Debian package checker branch, master, updated. 2.5.12-84-gc7b3bcc

["Niels Thykier" <niels@thykier.net>]

The following commit has been merged in the master branch:
commit c7b3bcc4e3229cecd9ddfc1fb0802db720c2a131
Author: Niels Thykier <niels@thykier.net>
Date:   Sun May 19 19:15:25 2013 +0200

    d/main.profile: Include the apache2 check
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/debian/changelog b/debian/changelog
index 50561a5..40dd257 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -116,9 +116,14 @@ lintian (2.5.13) UNRELEASED; urgency=low
       The latter has slightly different return values in some
       cases.
 
+  * profiles/debian/extra-apache2.profile:
+    + [NT] Removed, merged into debian/main.profile.
   * profiles/debian/ftp-master-auto-reject.profile:
     + [NT] Include md5sums-mismatch as an overridable tag.
       (See #688300)
+  * profiles/debian/main.profile:
+    + [NT] Include the apache2 check.  Thanks to Arno Töll for
+      the report.  (Closes: #708943)
 
   * reporting/harness:
     + [NT] Stop exporting ENV variables that lintian no longer
diff --git a/private/generate-profiles.pl b/private/generate-profiles.pl
index 387d7a7..c0e666a 100755
--- a/private/generate-profiles.pl
+++ b/private/generate-profiles.pl
@@ -35,8 +35,7 @@ foreach my $check (glob ("$root/checks/*.desc")){
     my ($header, undef) = read_dpkg_control($check);
     my $cname = $header->{'check-script'};
     fail "$check missing check-script\n" unless defined $cname;
-    # FIXME, enable apache2 when apache2.4 is uploaded to sid.
-    push @checks, $cname unless $cname eq 'apache2';
+    push @checks, $cname;
 }
 
 @fatal = read_tags ('private/build-time-data/ftp-master-fatal');
@@ -57,11 +56,6 @@ generate_profile('debian/extra-hardening', {
     'Enable-Tags' => ['hardening-no-stackprotector']
     });
 
-generate_profile('debian/extra-apache2', {
-    'Extends' => 'debian/main',
-    'Enable-Tags-From-Check' => ['apache2'],
-    });
-
 generate_profile('debian/ftp-master-auto-reject', {
     # "lintian" is enabled by default, so we explicitly disable it.
     'Disable-Tags-From-Check' => ['lintian'],
diff --git a/profiles/debian/extra-apache2.profile b/profiles/debian/extra-apache2.profile
deleted file mode 100644
index 264afc9..0000000
--- a/profiles/debian/extra-apache2.profile
+++ /dev/null
@@ -1,5 +0,0 @@
-# This profile is auto-generated
-Profile: debian/extra-apache2
-Extends: debian/main
-Enable-Tags-From-Check: apache2
-
diff --git a/profiles/debian/main.profile b/profiles/debian/main.profile
index 5b6d67f..c17f856 100644
--- a/profiles/debian/main.profile
+++ b/profiles/debian/main.profile
@@ -1,11 +1,11 @@
 # This profile is auto-generated
 Profile: debian/main
 Extends: debian/ftp-master-auto-reject
-Enable-Tags-From-Check: binaries, changelog-file, changes-file, conffiles, control-file,
- control-files, copyright-file, cruft, deb-format, debconf, debhelper,
- debian-readme, debian-source-dir, description, duplicate-files, fields,
- filename-length, files, group-checks, huge-usr-share, infofiles, init.d, java,
- lintian, manpages, md5sums, menu-format, menus, nmu, ocaml, patch-systems,
+Enable-Tags-From-Check: apache2, binaries, changelog-file, changes-file, conffiles,
+ control-file, control-files, copyright-file, cruft, deb-format, debconf,
+ debhelper, debian-readme, debian-source-dir, description, duplicate-files,
+ fields, filename-length, files, group-checks, huge-usr-share, infofiles, init.d,
+ java, lintian, manpages, md5sums, menu-format, menus, nmu, ocaml, patch-systems,
  po-debconf, rules, scripts, shared-libs, source-copyright, standards-version,
  symlinks, testsuite, version-substvars, watch-file
 Disable-Tags: hardening-no-stackprotector
diff --git a/t/tests/apache2-modules-general/desc b/t/tests/apache2-modules-general/desc
index 1ee10ab..420a0e3 100644
--- a/t/tests/apache2-modules-general/desc
+++ b/t/tests/apache2-modules-general/desc
@@ -1,7 +1,6 @@
 Testname: apache2-modules-general
 Sequence: 6000
 Version: 1.0
-Profile: debian/extra-apache2
 Description: Several tests related to Apache2 module packages
 Test-For:
  apache2-module-depends-on-real-apache2-package
diff --git a/t/tests/apache2-webapplications-general/desc b/t/tests/apache2-webapplications-general/desc
index 150eb29..0ba9ba0 100644
--- a/t/tests/apache2-webapplications-general/desc
+++ b/t/tests/apache2-webapplications-general/desc
@@ -1,7 +1,6 @@
 Testname: apache2-webapplications-general
 Sequence: 6000
 Version: 1.0
-Profile: debian/extra-apache2
 Description: Several tests related to Apache2 web application packages
 Test-For:
  non-standard-apache2-configuration-name

-- 
Debian package checker