[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#519644: bug#519644: openoffice.org: control file should have ‘Depends: ${misc:Depends}’ for debhelper



package openoffice.org
tags 519644 + patch
thanks

On 14-Mar-2009, Ben Finney wrote:
> Lintian warns that the control file for a debhelper-using package
> should have ‘Depends: ${misc:Depends}’ for each binary package:

The attached patch bundle (generated by ‘bzr send’ against the
<URL:http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/3.0.1/unstable/>
branch) addresses this bug.

-- 
 \        “I hate it when my foot falls asleep during the day, because |
  `\            that means it's gonna be up all night.” —Steven Wright |
_o__)                                                                  |
Ben Finney <ben@benfinney.id.au>
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: ben+debian@benfinney.id.au-20090314001224-\
#   29vq8en5eo5uc5eh
# target_branch: ../debian.unstable/
# testament_sha1: c5587569b31138bb95df25d91acd3d1af835449b
# timestamp: 2009-03-14 11:13:02 +1100
# base_revision_id: rene@debian.org-20090313100943-a367392jlmmyjc1e
# 
# Begin patch
=== modified file 'changelog'
--- changelog	2009-03-13 10:09:43 +0000
+++ changelog	2009-03-14 00:12:24 +0000
@@ -1,5 +1,12 @@
 openoffice.org (1:3.0.1-6) UNRELEASED; urgency=low
+  
+  [ Ben Finney ]
+  * debian/control*.in:
+    + ‘Depends: ${misc:Depends}’ as recommended by Lintian for
+      debhelper(7).
+      (Closes: Bug#519644)
 
+  [ Rene Engelhard ]
   * debian/rules:
     - remove ure (>= ...) from uno-libs3s Depends: (closes: #519138)
   * debian/control.in:

=== modified file 'control.in'
--- control.in	2009-03-13 10:09:43 +0000
+++ control.in	2009-03-14 00:12:24 +0000
@@ -71,7 +71,8 @@
  ${writer-w2l-dep},
  openoffice.orgVER-filter-mobiledev,
  ${lucene-depends},
- ${java-common-depends}
+ ${java-common-depends},
+ $(misc:Depends}
 Recommends: ${ooo-binfilter-dep},
  ttf-liberation | msttcorefonts
 Suggests: hunspell-dictionary,
@@ -143,7 +144,8 @@
 Section: editors
 Priority: extra
 Architecture: all
-Depends: openoffice.orgVER, openoffice.orgVER-l10n-pt-br, openoffice.orgVER-help-pt-br, myspell-pt-br
+Depends: openoffice.orgVER, openoffice.orgVER-l10n-pt-br, openoffice.orgVER-help-pt-br, myspell-pt-br,
+ $(misc:Depends}
 Description: BrOffice.org office suite
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
@@ -156,7 +158,8 @@
 Section: editors
 Priority: optional
 Architecture: all
-Depends: openoffice.orgVER, openoffice.orgVER-l10n-af, openoffice.orgVER-l10n-en-za, openoffice.orgVER-l10n-nr, openoffice.orgVER-l10n-ns, openoffice.orgVER-l10n-ss, openoffice.orgVER-l10n-st, openoffice.orgVER-l10n-tn, openoffice.orgVER-l10n-ts, openoffice.orgVER-l10n-ve, openoffice.orgVER-l10n-xh, openoffice.orgVER-l10n-zu
+Depends: openoffice.orgVER, openoffice.orgVER-l10n-af, openoffice.orgVER-l10n-en-za, openoffice.orgVER-l10n-nr, openoffice.orgVER-l10n-ns, openoffice.orgVER-l10n-ss, openoffice.orgVER-l10n-st, openoffice.orgVER-l10n-tn, openoffice.orgVER-l10n-ts, openoffice.orgVER-l10n-ve, openoffice.orgVER-l10n-xh, openoffice.orgVER-l10n-zu,
+ $(misc:Depends}
 Description: South African language packages for OpenOffice.org
  OpenOffice.org is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
@@ -168,7 +171,8 @@
 Section: editors
 Priority: optional
 Architecture: all
-Depends: openoffice.orgVER, openoffice.orgVER-l10n-as-in, openoffice.orgVER-l10n-bn, openoffice.orgVER-l10n-gu-in, openoffice.orgVER-l10n-hi-in, openoffice.orgVER-l10n-ml-in, openoffice.orgVER-l10n-mr-in, openoffice.orgVER-l10n-or-in, openoffice.orgVER-l10n-pa-in, openoffice.orgVER-l10n-ta-in, openoffice.orgVER-l10n-te-in
+Depends: openoffice.orgVER, openoffice.orgVER-l10n-as-in, openoffice.orgVER-l10n-bn, openoffice.orgVER-l10n-gu-in, openoffice.orgVER-l10n-hi-in, openoffice.orgVER-l10n-ml-in, openoffice.orgVER-l10n-mr-in, openoffice.orgVER-l10n-or-in, openoffice.orgVER-l10n-pa-in, openoffice.orgVER-l10n-ta-in, openoffice.orgVER-l10n-te-in,
+ $(misc:Depends}
 Recommends: ttf-indic-fonts
 Description: Indic language packages for OpenOffice.org
  OpenOffice.org is a full-featured office productivity suite that provides
@@ -183,7 +187,8 @@
  ttf-opensymbol,
  ${shlibs:Depends},
  fontconfig,
- ${mozilla-nss-depends}
+ ${mozilla-nss-depends},
+ $(misc:Depends}
 Conflicts: openoffice.org-thesaurus, 
  openoffice.orgVER-unbundled,
  openoffice.orgVER-l10n-1.9.108,
@@ -257,7 +262,8 @@
 
 Package: openoffice.orgVER-common
 Architecture: all
-Depends: openoffice.orgVER-style-galaxy
+Depends: openoffice.orgVER-style-galaxy,
+ $(misc:Depends}
 Suggests: openoffice.orgVER-style-industrial,
  openoffice.orgVER-style-hicontrast
 Recommends: openoffice.orgVER-style-tango,
@@ -301,7 +307,8 @@
 Package: openoffice.orgVER-java-common
 Architecture: all
 Depends: openoffice.orgVER-common, 
- ${java-common-java-depends}
+ ${java-common-java-depends},
+ $(misc:Depends}
 Suggests: ${common-bsh-depends}
 Replaces: openoffice.orgVER-common (<< 2.0.3-4), 
  openoffice.org2-java-common
@@ -322,7 +329,8 @@
 Architecture: %OOO_ARCHS%
 Depends: openoffice.orgVER-core (= ${Source-Version}),
  openoffice.orgVER-base-core (= ${Source-Version}),
- ${shlibs:Depends}
+ ${shlibs:Depends},
+ $(misc:Depends}
 Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends}, ${java-common-depends}, ${writer-w2l-dep}, openoffice.orgVER-emailmerge, openoffice.orgVER-math
 Replaces: openoffice.org (<< 1.9), 
  openoffice.org-debian-files,
@@ -345,7 +353,8 @@
 Depends: openoffice.orgVER-core (= ${Source-Version}),
  openoffice.orgVER-base-core (= ${Source-Version}),
  ${shlibs:Depends},
- ${lpsolve-dep}, ${scsolver-shlibs:Depends}
+ ${lpsolve-dep}, ${scsolver-shlibs:Depends},
+ $(misc:Depends}
 Replaces: openoffice.org2-core (<< 1.9.113-0pre1), 
  openoffice.org (<< 1.9),
  openoffice.org-debian-files,
@@ -366,7 +375,8 @@
 Architecture: %OOO_ARCHS%
 Depends: openoffice.orgVER-core (= ${Source-Version}),
  openoffice.orgVER-draw (= ${Source-Version}),
- ${shlibs:Depends}
+ ${shlibs:Depends},
+ $(misc:Depends}
 Replaces: openoffice.org (<< 1.9), 
  openoffice.org-debian-files,
  openoffice.org2-impress (<< ${Source-Version}),
@@ -383,7 +393,8 @@
 Package: openoffice.orgVER-draw
 Architecture: %OOO_ARCHS%
 Depends: openoffice.orgVER-core (= ${Source-Version}),
- ${shlibs:Depends}
+ ${shlibs:Depends},
+ $(misc:Depends}
 Replaces: openoffice.org (<< 1.9), 
  openoffice.org-debian-files,
  openoffice.org2-draw (<< ${Source-Version}),
@@ -401,7 +412,8 @@
 Package: openoffice.orgVER-math
 Architecture: %OOO_ARCHS%
 Depends: openoffice.orgVER-core (= ${Source-Version}),
- ${shlibs:Depends}
+ ${shlibs:Depends},
+ $(misc:Depends}
 Replaces: openoffice.org (<< 1.9), 
  openoffice.org-debian-files,
  openoffice.org2-math (<< ${Source-Version}),
@@ -417,7 +429,9 @@
 
 Package: openoffice.orgVER-base-core
 Architecture: %OOO_ARCHS%
-Depends: openoffice.orgVER-core (= ${Source-Version}), ${shlibs:Depends}
+Depends: openoffice.orgVER-core (= ${Source-Version}),
+ ${shlibs:Depends},
+ $(misc:Depends}
 Replaces: openoffice.org-base (<< 1:2.3.1)
 Suggests: openoffice.orgVER-base
 Description: OpenOffice.org office suite -- libdba
@@ -437,7 +451,8 @@
  ${shlibs:Depends},
  ${java-runtime-depends},
  ${base-hsqldb-depends},
- ${java-common-depends}
+ ${java-common-depends},
+ $(misc:Depends}
 Suggests: unixodbc, 
  libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools,
  libmysql-java | libpg-java,
@@ -483,7 +498,8 @@
 
 Package: openoffice.orgVER-style-crystal
 Architecture: all
-Depends: openoffice.orgVER-common (= ${Source-Version})
+Depends: openoffice.orgVER-common (= ${Source-Version}),
+ $(misc:Depends}
 Suggests: kde-icons-crystal, crystalcursors
 Replaces: openoffice.orgVER-common (<< 2.1~m190)
 Description: Crystal symbol style for OpenOffice.org
@@ -494,7 +510,8 @@
 
 Package: openoffice.orgVER-style-industrial
 Architecture: all
-Depends: openoffice.orgVER-common (= ${Source-Version})
+Depends: openoffice.orgVER-common (= ${Source-Version}),
+ $(misc:Depends}
 Suggests: gtk2-engines, gnome-themes, industrial-cursor-theme
 Replaces: openoffice.orgVER-common (<< 2.1~m190)
 Description: Industrial symbol style for OpenOffice.org
@@ -505,7 +522,8 @@
 
 Package: openoffice.orgVER-style-tango
 Architecture: all
-Depends: openoffice.orgVER-common (= ${Source-Version})
+Depends: openoffice.orgVER-common (= ${Source-Version}),
+ $(misc:Depends}
 Suggests: tango-icon-theme
 Replaces: openoffice.orgVER-common (<< 2.1~m190)
 Description: Tango symbol style for OpenOffice.org
@@ -517,7 +535,8 @@
 
 Package: openoffice.orgVER-style-hicontrast
 Architecture: all
-Depends: openoffice.orgVER-common (= ${Source-Version})
+Depends: openoffice.orgVER-common (= ${Source-Version}),
+ $(misc:Depends}
 Suggests: gtk2-engines
 Replaces: openoffice.orgVER-common (<< 2.1~m190)
 Description: Hicontrast symbol style for OpenOffice.org
@@ -529,7 +548,8 @@
 
 Package: openoffice.orgVER-style-galaxy
 Architecture: all
-Depends: openoffice.orgVER-common (= ${Source-Version})
+Depends: openoffice.orgVER-common (= ${Source-Version}),
+ $(misc:Depends}
 Replaces: openoffice.orgVER-common (<< 2.1~m190), openoffice.orgVER-style-default, openoffice.org-style-andromeda
 Conflicts: openoffice.orgVER-style-default
 Provides: openoffice.orgVER-style-default
@@ -543,7 +563,8 @@
 
 Package: openoffice.orgVER-style-andromeda
 Architecture: all
-Depends: openoffice.orgVER-common (= ${Source-Version})
+Depends: openoffice.orgVER-common (= ${Source-Version}),
+ $(misc:Depends}
 Replaces: openoffice.orgVER-common (<< 2.1~m190)
 Description: Andromeda (Classic) symbol style for OpenOffice.org
  OpenOffice.org is a full-featured office productivity suite that provides
@@ -558,7 +579,8 @@
 Architecture: %OOO_ARCHS%
 Depends: openoffice.orgVER-core (= ${Source-Version}),
  openoffice.orgVER-style-crystal,
- ${shlibs:Depends}
+ ${shlibs:Depends},
+ $(misc:Depends}
 Suggests: konqueror,
  kmail,
  openoffice.orgVER-kab
@@ -582,7 +604,8 @@
 Architecture: %OOO_ARCHS%
 Depends: openoffice.orgVER-core (= ${Source-Version}),
  openoffice.orgVER-style-tango,
- ${shlibs:Depends}
+ ${shlibs:Depends},
+ $(misc:Depends}
 Section: gnome
 Enhances: openoffice.orgVER
 Replaces: openoffice.org-gnome (<< 2.0.4~rc1-0),
@@ -600,8 +623,9 @@
 Architecture: %OOO_ARCHS%
 Depends: openoffice.orgVER-core (= ${Source-Version}),
  openoffice.orgVER-gtk,
+ gconf2,
  ${shlibs:Depends},
- gconf2
+ $(misc:Depends}
 Suggests: openoffice.orgVER-evolution
 Section: gnome
 Enhances: openoffice.orgVER
@@ -627,7 +651,8 @@
 Section: gnome
 Depends: openoffice.orgVER-core (= ${Source-Version}),
  openoffice.orgVER-base,
- ${shlibs:Depends}
+ ${shlibs:Depends},
+ $(misc:Depends}
 Recommends: evolution
 Conflicts: openoffice.org2-evolution (<< ${Source-Version})
 Provides: openoffice.org2-evolution
@@ -642,7 +667,8 @@
 Package: openoffice.orgVER-kab
 Architecture: %OOO_ARCHS%
 Depends: openoffice.orgVER-core (= ${Source-Version}),
- ${shlibs:Depends}
+ ${shlibs:Depends},
+ $(misc:Depends}
 Recommends: kaddressbook
 Replaces: openoffice.org-kde (<= 1:3.0.0~beta2-1)
 Description: KDE Adressbook support for OpenOffice.org
@@ -654,7 +680,8 @@
 
 Package: openoffice.orgVER-emailmerge
 Architecture: all
-Depends: ${python:Depends}, python-uno
+Depends: ${python:Depends}, python-uno,
+ $(misc:Depends}
 Enhances: openoffice.orgVER-writer
 Replaces: python-uno (<< 1:2.4.1-5)
 Description: E-Mail Mailmerge component for OpenOffice.org
@@ -672,7 +699,8 @@
 Enhances: openoffice.orgVER
 Depends: openoffice.orgVER-core (= ${Source-Version}),
  ${python:Depends},
- ${shlibs:Depends}
+ ${shlibs:Depends},
+ $(misc:Depends}
 Replaces: openoffice.orgVER-common (<< 1.9.82)
 Description: Python interface for OpenOffice.org
  The Python-UNO bridge allows use of the standard OpenOffice.org API 
@@ -688,7 +716,8 @@
 Depends: openoffice.orgVER-core (= ${Source-Version}),
  ${shlibs:Depends},
  ${java-runtime-depends},
- ${java-common-depends}
+ ${java-common-depends},
+ $(misc:Depends}
 Replaces: openoffice.orgVER-common (<< 1.9.113-0pre1), openoffice.org2-officebean
 Provides: openoffice.org2-officebean
 Conflicts: openoffice.org2-officebean
@@ -703,7 +732,8 @@
 Section: misc
 Architecture: %OOO_BINFILTER_ARCHS%
 Depends: openoffice.orgVER-core (= ${Source-Version}),
- ${shlibs:Depends}
+ ${shlibs:Depends},
+ $(misc:Depends}
 Replaces: openoffice.org2-core (<= 1.9.108-1), 
  openoffice.orgVER-math (<< 1.9.113-0pre1),
  openoffice.orgVER-calc (<< 1.9.113-0pre1),
@@ -727,7 +757,8 @@
 Section: misc
 Architecture: all
 Depends: ${java-runtime-depends},
- ${java-common-depends}
+ ${java-common-depends},
+ $(misc:Depends}
 Replaces: openoffice.org-java-common (<< 2.0.3+2.0.4m178), openoffice.org-common (<< 2.0.3+2.0.4m178)
 Description: Mobile Devices Filters for OpenOffice.org
  OpenOffice.org is a full-featured office productivity suite that provides
@@ -755,7 +786,8 @@
 Package: openoffice.orgVER-dtd-officedocument1.0
 Section: text
 Priority: extra
-Depends: xml-core
+Depends: xml-core,
+ $(misc:Depends}
 Architecture: all
 Replaces: openoffice.org-common (<< 2.0.4~ood680)
 Conflicts: openoffice.org-common (<< 2.0.4~ood680)

# Begin bundle
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
KEhlTMfngA==

Attachment: signature.asc
Description: Digital signature


Reply to: