[debian-edu-commits] debian-edu/ 03/03: Makefile: append ${misc:Depends} to all generated depends

Holger Levsen holger at layer-acht.org
Thu Oct 27 12:31:05 UTC 2016 

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

holger pushed a commit to branch master
in repository debian-edu.

commit a388303f638d9f4757cb409cc2c57a1f0e5eb562
Author: Holger Levsen <holger at layer-acht.org>
Date:   Thu Oct 27 14:30:33 2016 +0200

    Makefile: append ${misc:Depends} to all generated depends
    
    Makefile: work around another deficiency in blends-dev: append
    ${misc:Depends} to all generated depends for the binary packages
    in the generated debian/control file to avoid
    https://lintian.debian.org/tags/debhelper-but-no-misc-depends.html
    lintian warnings.
---
 Makefile         |   8 ++--
 debian/changelog |   5 +++
 debian/control   | 114 +++++++++++++++++++++++++++----------------------------
 3 files changed, 67 insertions(+), 60 deletions(-)

diff --git a/Makefile b/Makefile
index 883500c..f673221 100755
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,8 @@ dist:
 	# why it should be implemented in blends-dev - also
 	# compare the following line with the second line of this target…) 
 	make -f debian/rules get-orig-source
-	# Use (= ${source:Version}) for arch:all depends
-	# there might be a better way to achieve this with the blends-dev framework…
-	sed -i 's#education-tasks (= $${binary:Version})#education-tasks (= $${source:Version})#g' debian/control
+	# The following sed command does to things:
+	# - use (= ${source:Version}) for arch:all depends
+	# - add ${misc:Depends} to all generated binary packages (needed because we use debhelper)
+	# There might be a better way to achieve this with the blends-dev framework…
+	sed -i 's#education-tasks (= $${binary:Version})#education-tasks (= $${source:Version}), $${misc:Depends}#g' debian/control
diff --git a/debian/changelog b/debian/changelog
index 373ad4f..b1c2f35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,11 @@ debian-edu (1.914) UNRELEASED; urgency=medium
 
   * Add ${misc:Depends} to binary packages depends in control.stub, thanks
     lintian.
+  * Makefile: work around another deficiency in blends-dev: append
+    ${misc:Depends} to all generated depends for the binary packages in the
+    generated debian/control file to avoid
+    https://lintian.debian.org/tags/debhelper-but-no-misc-depends.html lintian
+    warnings.
 
  -- Holger Levsen <holger at debian.org>  Thu, 27 Oct 2016 14:20:33 +0200
 
diff --git a/debian/control b/debian/control
index 0f43aad..85bc78f 100644
--- a/debian/control
+++ b/debian/control
@@ -42,7 +42,7 @@ Description: Debian Edu menu reorganization
 Package: education-astronomy
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: education-menus,
  gpredict,
  kstars,
@@ -62,7 +62,7 @@ Description: Debian Edu astronomy related applications
 Package: education-chemistry
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: chemtool,
  easychem,
  education-menus,
@@ -81,7 +81,7 @@ Description: Debian Edu chemistry related applications
 Package: education-common
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: apt-listchanges,
  bash-completion,
  bc,
@@ -196,7 +196,7 @@ Description: Debian Edu common packages
 Package: education-desktop-gnome
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: education-common,
  gdm3,
  gimp,
@@ -230,7 +230,7 @@ Description: Debian Edu GNOME desktop applications
 Package: education-desktop-kde
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: ark,
  bluedevil,
  clementine,
@@ -298,7 +298,7 @@ Description: Debian Edu KDE desktop applications
 Package: education-desktop-lxde
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: blueman,
  desktop-file-utils,
  education-common,
@@ -328,7 +328,7 @@ Description: Debian Edu LXDE desktop applications
 Package: education-desktop-mate
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: education-common,
  gimp,
  inkscape,
@@ -359,7 +359,7 @@ Description: Debian Edu MATE desktop applications
 Package: education-desktop-other
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: alsa-base,
  alsa-utils,
  avahi-daemon,
@@ -619,7 +619,7 @@ Description: Debian Edu non-GNOME- and non-KDE-specific desktop applications
 Package: education-desktop-xfce
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: blueman,
  education-common,
  lightdm,
@@ -636,7 +636,7 @@ Description: Debian Edu Xfce desktop applications
 Package: education-development
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: autoconf,
  bluefish,
  build-essential,
@@ -684,7 +684,7 @@ Description: Debian Edu software development related educational applications
 Package: education-electronics
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: education-menus,
  gpsim,
  oregano,
@@ -708,7 +708,7 @@ Description: Debian Edu electronics related applications
 Package: education-geography
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: education-menus,
  kgeography,
  marble
@@ -730,7 +730,7 @@ Description: Debian Edu applications for geography
 Package: education-graphics
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: dia-gnome,
  education-menus,
  gimp,
@@ -750,7 +750,7 @@ Description: Debian Edu graphics related applications
 Package: education-lang-da
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: debian-edu-doc-da,
  myspell-da
 Description: Debian Edu applications for Danish installs
@@ -760,7 +760,7 @@ Description: Debian Edu applications for Danish installs
 Package: education-lang-da-desktop
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: firefox-esr-l10n-da,
  gcompris-sound-da,
  libreoffice-help-da,
@@ -773,14 +773,14 @@ Description: Debian Edu Desktop applications for Danish installs
 Package: education-lang-da-desktop-kde
 Section: kde
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Description: Danish Debian Edu KDE desktop applications
  This task localises the KDE desktop in Danish.
 
 Package: education-lang-de
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: debian-edu-doc-de,
  hunspell-de-at,
  hunspell-de-ch,
@@ -792,7 +792,7 @@ Description: Debian Edu applications for German installs
 Package: education-lang-de-desktop
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Suggests: icedove-l10n-de
 Description: Debian Edu Desktop applications for German installs
  This subtask depends on various office and desktop applications
@@ -801,14 +801,14 @@ Description: Debian Edu Desktop applications for German installs
 Package: education-lang-de-desktop-kde
 Section: kde
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Description: German Debian Edu KDE desktop applications
  This task localises the KDE desktop in German.
 
 Package: education-lang-es
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: debian-edu-doc-es,
  manpages-es-extra,
  myspell-es
@@ -819,7 +819,7 @@ Description: Debian Edu applications for Spanish installs
 Package: education-lang-es-desktop
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: firefox-esr-l10n-es-es,
  gcompris-sound-es,
  gimp-help-es,
@@ -833,14 +833,14 @@ Description: Debian Edu Desktop applications for Spanish installs
 Package: education-lang-es-desktop-kde
 Section: kde
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Description: Spanish Debian Edu KDE desktop applications
  This task localises the KDE desktop in Spanish.
 
 Package: education-lang-fr
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: debian-edu-doc-fr,
  manpages-fr-extra,
  myspell-fr
@@ -851,7 +851,7 @@ Description: Debian Edu applications for French installs
 Package: education-lang-fr-desktop
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Suggests: aptitude-doc-fr,
  icedove-l10n-fr
 Description: Debian Edu Desktop applications for French installs
@@ -861,14 +861,14 @@ Description: Debian Edu Desktop applications for French installs
 Package: education-lang-fr-desktop-kde
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Description: French Debian Edu KDE desktop applications
  This task localises the KDE desktop in French.
 
 Package: education-lang-he
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Description: Debian Edu applications for Hebrew installs
  This metapackage depends on various office and desktop applications
  that are useful for teachers and their students.
@@ -876,7 +876,7 @@ Description: Debian Edu applications for Hebrew installs
 Package: education-lang-he-desktop
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Suggests: icedove-l10n-he
 Description: Debian Edu Desktop applications for Hebrew installs
  This metapackage depends on various office and desktop applications
@@ -885,14 +885,14 @@ Description: Debian Edu Desktop applications for Hebrew installs
 Package: education-lang-he-desktop-kde
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Description: Hebrew Debian Edu KDE desktop applications
  This task provide files to localises the KDE desktop in Hebrew.
 
 Package: education-lang-it
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: debian-edu-doc-it,
  myspell-it
 Description: Debian Edu applications for Italian installs
@@ -902,7 +902,7 @@ Description: Debian Edu applications for Italian installs
 Package: education-lang-it-desktop
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: firefox-esr-l10n-it,
  gcompris-sound-it,
  gimp-help-it,
@@ -916,14 +916,14 @@ Description: Debian Edu Desktop applications for Italian installs
 Package: education-lang-it-desktop-kde
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Description: Italian Debian Edu KDE desktop applications
  This task localises the KDE desktop in Italian.
 
 Package: education-lang-ja
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: debian-edu-doc-ja
 Description: Debian Edu applications for Japanese installs
  This metapackage depends on various office and desktop applications
@@ -932,7 +932,7 @@ Description: Debian Edu applications for Japanese installs
 Package: education-lang-ja-desktop
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Suggests: aptitude-doc-ja,
  icedove-l10n-ja
 Description: Debian Edu Desktop applications for Japanese installs
@@ -942,14 +942,14 @@ Description: Debian Edu Desktop applications for Japanese installs
 Package: education-lang-ja-desktop-kde
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Description: Japanese Debian Edu KDE desktop applications
  This task provide files to localises the KDE desktop in Japanese.
 
 Package: education-lang-no
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: debian-edu-doc-nb
 Suggests: aspell-no,
  myspell-nb,
@@ -961,7 +961,7 @@ Description: Debian Edu applications for Norwegian installs
 Package: education-lang-no-desktop
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Suggests: icedove-l10n-nb-no,
  icedove-l10n-nn-no
 Description: Debian Edu Desktop applications for Norwegian installs
@@ -971,14 +971,14 @@ Description: Debian Edu Desktop applications for Norwegian installs
 Package: education-lang-no-desktop-kde
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Description: Norwegian (Bokmaal and Nynorsk) Debian Edu KDE desktop applications
  This task provide files to localises the KDE desktop in Norwegian.
 
 Package: education-lang-se
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Description: Debian Edu applications for North Sami installs
  This subtask depends on various packages to install when the North
  Sami language is selected during installation.
@@ -986,7 +986,7 @@ Description: Debian Edu applications for North Sami installs
 Package: education-lang-zh-tw
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: fonts-arphic-ukai
 Description: Debian Edu applications for Traditional Chinese installs
  This metapackage depends on various office and desktop applications
@@ -995,7 +995,7 @@ Description: Debian Edu applications for Traditional Chinese installs
 Package: education-lang-zh-tw-desktop
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: fonts-arphic-uming,
  ibus-array,
  ibus-chewing,
@@ -1012,14 +1012,14 @@ Description: Debian Edu Desktop applications for Traditional Chinese installs
 Package: education-lang-zh-tw-desktop-kde
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Description: Traditional Chinese Debian Edu KDE desktop applications
  This task localises the KDE desktop in Traditional Chinese.
 
 Package: education-language
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: aspell,
  dict,
  education-menus,
@@ -1046,7 +1046,7 @@ Description: Debian Edu language related educational applications
 Package: education-laptop
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: bluedevil,
  kde-config-touchpad,
  laptop-mode-tools,
@@ -1064,7 +1064,7 @@ Description: Debian Edu laptop packages
 Package: education-logic-games
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: atomix,
  blinken,
  cgoban,
@@ -1083,7 +1083,7 @@ Description: Debian Edu logic games
 Package: education-main-server
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version}), gosa-plugin-netgroups,
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}, gosa-plugin-netgroups,
 Recommends: apache2,
  atftpd | tftpd-hpa,
  avahi-daemon,
@@ -1170,7 +1170,7 @@ Description: Debian Edu main server packages
 Package: education-mathematics
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: cantor,
  education-menus,
  geogebra,
@@ -1213,7 +1213,7 @@ Description: Debian Edu mathematical applications
 Package: education-misc
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: childsplay,
  education-menus,
  gcompris,
@@ -1237,7 +1237,7 @@ Description: Debian Edu miscellaneous applications for education
 Package: education-music
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: audacious,
  audacity,
  education-menus,
@@ -1273,7 +1273,7 @@ Description: Debian Edu music and sound applications
 Package: education-networked
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: education-networked-common,
  gosa-desktop,
  libpam-krb5,
@@ -1287,7 +1287,7 @@ Description: Debian Edu network packages
 Package: education-networked-common
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: autofs-ldap | autofs5-ldap,
  education-common,
  killer,
@@ -1325,7 +1325,7 @@ Description: Debian Edu common networking packages
 Package: education-physics
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: education-menus,
  planets,
  step
@@ -1341,7 +1341,7 @@ Description: Debian Edu physics related applications
 Package: education-roaming-workstation
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: education-desktop-other,
  education-networked-common,
  krb5-auth-dialog,
@@ -1359,7 +1359,7 @@ Description: Debian Edu networked roaming workstation packages
 Package: education-services
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: dansguardian
 Suggests: wims
 Description: Debian Edu services for educational institutions
@@ -1371,7 +1371,7 @@ Description: Debian Edu services for educational institutions
 Package: education-standalone
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: education-common,
  education-desktop-other,
  libnss-mdns,
@@ -1384,7 +1384,7 @@ Description: Debian Edu standalone workstation packages
 Package: education-thin-client
 Section: metapackages
 Architecture: amd64 i386 powerpc
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: acpi-support-base,
  alsa-base,
  alsa-utils,
@@ -1399,7 +1399,7 @@ Description: Debian Edu networked thin client packages
 Package: education-thin-client-server
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: atftpd | tftpd-hpa,
  education-workstation,
  iptables,
@@ -1429,7 +1429,7 @@ Description: Debian Edu networked thin client server packages
 Package: education-workstation
 Section: metapackages
 Architecture: any
-Depends: education-tasks (= ${source:Version})
+Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: education-desktop-other,
  education-networked,
  jxplorer,

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

More information about the debian-edu-commits mailing list