diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index 33e6715ee..817d00739 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -177,6 +177,9 @@ class Gencontrol(Base): if self.config.merge('packages').get('tools-versioned', True): packages.extend(self.process_packages( self.templates["control.tools-versioned"], self.vars)) + if self.config.merge('packages').get('source', True): + packages.extend(self.process_packages( + self.templates["control.sourcebin"], self.vars)) self._substitute_file('perf.lintian-overrides', self.vars, 'debian/linux-perf-%s.lintian-overrides' % diff --git a/debian/changelog b/debian/changelog index 41a6f08f4..d1a140c3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +linux (4.19.16-2) UNRELEASED; urgency=medium + + * Do not generate linux-source-$ver stanza in debian/control if + source is set to disabled in debian/config/defines. + + -- Luca Boccassi Fri, 18 Jan 2019 19:09:06 +0000 + linux (4.19.16-1) unstable; urgency=medium * New upstream stable update: diff --git a/debian/templates/control.main.in b/debian/templates/control.main.in index cca790d3c..aa092b025 100644 --- a/debian/templates/control.main.in +++ b/debian/templates/control.main.in @@ -1,19 +1,3 @@ -Package: @source_basename@-source-@version@ -Build-Profiles: -Architecture: all -Section: kernel -Build-Depends: patchutils -Depends: binutils, xz-utils, ${misc:Depends} -Recommends: libc6-dev | libc-dev, gcc, make, bc, @source_basename@-config-@version@ -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@. - 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_basename@-support-@abiname@ Build-Profiles: Architecture: all diff --git a/debian/templates/control.sourcebin.in b/debian/templates/control.sourcebin.in new file mode 100644 index 000000000..d268a7ad9 --- /dev/null +++ b/debian/templates/control.sourcebin.in @@ -0,0 +1,15 @@ +Package: @source_basename@-source-@version@ +Build-Profiles: +Architecture: all +Section: kernel +Build-Depends: patchutils +Depends: binutils, xz-utils, ${misc:Depends} +Recommends: libc6-dev | libc-dev, gcc, make, bc, @source_basename@-config-@version@ +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@. + 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.