[linux] 02/05: split docs package to a different template

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit e3d56724e48bb3404c0703cdb35f4bb2593861e1
Author: Yves-Alexis Perez <corsac at debian.org>
Date:   Tue Nov 10 18:42:38 2015 +0100

    split docs package to a different template
    
    only include them in the control file if docs are enabled in the config
---
 debian/bin/gencontrol.py                           |  5 ++++
 .../templates/{control.main.in => control.docs.in} | 26 -----------------
 debian/templates/control.main.in                   | 33 ----------------------
 3 files changed, 5 insertions(+), 59 deletions(-)

diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index e1881d0..a1a4f95 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -41,6 +41,9 @@ class Gencontrol(Base):
         'xen': {
             'flavours': config.SchemaItemList(),
             'versions': config.SchemaItemList(),
+        },
+        'docs': {
+            'enabled': config.SchemaItemBoolean(),
         }
     }
 
@@ -113,6 +116,8 @@ class Gencontrol(Base):
 
     def do_main_packages(self, packages, vars, makeflags, extra):
         packages.extend(self.process_packages(self.templates["control.main"], self.vars))
+        if self.config.merge('docs', None, None).get('enabled', True):
+            packages.extend(self.process_packages(self.templates["control.docs"], self.vars))
 
     arch_makeflags = (
         ('kernel-arch', 'KERNEL_ARCH', False),
diff --git a/debian/templates/control.main.in b/debian/templates/control.docs.in
similarity index 55%
copy from debian/templates/control.main.in
copy to debian/templates/control.docs.in
index d301618..c773bf5 100644
--- a/debian/templates/control.main.in
+++ b/debian/templates/control.docs.in
@@ -1,18 +1,3 @@
-Package: @source_package at -source-@version@
-Build-Profiles: <!stage1>
-Architecture: all
-Section: kernel
-Depends: binutils, xz-utils, ${misc:Depends}
-Recommends: libc6-dev | libc-dev, gcc, make, bc
-Suggests: libncurses-dev | ncurses-dev, libqt4-dev, pkg-config
-Multi-Arch: foreign
-Description: Linux kernel source for version @version@ with Debian patches
- This package provides source code for the Linux kernel version @version at .
- This source closely tracks official Linux kernel releases.  Debian's
- modifications to that source consist of security fixes, bug fixes, and
- features that have already been (or are believed to be) accepted by the
- upstream maintainers.
-
 Package: @source_package at -doc-@version@
 Build-Profiles: <!stage1>
 Architecture: all
@@ -46,14 +31,3 @@ Description: Linux kernel API manual pages for version @version@
  may be installed at a time.  The linux-doc package containing the
  documentation in other formats is free from such restriction.
 
-Package: @source_package at -support-@abiname@
-Build-Profiles: <!stage1>
-Architecture: all
-Section: devel
-Depends: ${python3:Depends}, ${misc:Depends}
-Multi-Arch: foreign
-Description: Support files for Linux @upstreamversion@
- This package provides support files for the Linux kernel build,
- e.g. scripts to handle ABI information and for generation of
- build system meta data.
-
diff --git a/debian/templates/control.main.in b/debian/templates/control.main.in
index d301618..80794db 100644
--- a/debian/templates/control.main.in
+++ b/debian/templates/control.main.in
@@ -13,39 +13,6 @@ Description: Linux kernel source for version @version@ with Debian patches
  features that have already been (or are believed to be) accepted by the
  upstream maintainers.
 
-Package: @source_package at -doc-@version@
-Build-Profiles: <!stage1>
-Architecture: all
-Depends: ${misc:Depends}
-Section: doc
-Multi-Arch: foreign
-Description: Linux kernel specific documentation for version @version@
- This package provides the various README files and HTML documentation for
- the Linux kernel version @version at .  Plenty of information, including the
- descriptions of various kernel subsystems, filesystems, driver-specific
- notes and the like.  Consult the file
- /usr/share/doc/linux-doc- at version@/Documentation/00-INDEX
- for the detailed description of the contents.
-
-Package: @source_package at -manual-@version@
-Build-Profiles: <!stage1>
-Architecture: all
-Depends: ${misc:Depends}
-Section: doc
-Provides: linux-manual
-Conflicts: linux-manual
-Replaces: linux-manual
-Multi-Arch: foreign
-Description: Linux kernel API manual pages for version @version@
- This package provides the Kernel Hacker's Guide in the form of
- manual pages, describing the kernel API functions.  They
- are installed into section 9 of the manual.
- .
- As the files containing manual pages for different kernel versions
- are installed in the same location, only one linux-manual package
- may be installed at a time.  The linux-doc package containing the
- documentation in other formats is free from such restriction.
-
 Package: @source_package at -support-@abiname@
 Build-Profiles: <!stage1>
 Architecture: all

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git