[Piuparts-commits] [piuparts] 04/05: fixup package dependencies and lintian issues

[Holger Levsen]

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

holger pushed a commit to branch develop
in repository piuparts.

commit 95f544e55d43945ccf07a26f4fcb847046402343
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sun Aug 6 04:40:51 2017 +0200

    fixup package dependencies and lintian issues
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 debian/control   | 20 +++++++++++---------
 debian/copyright |  4 ++--
 piuparts.1.txt   |  2 +-
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/debian/control b/debian/control
index d58a822..e1ddf3e 100644
--- a/debian/control
+++ b/debian/control
@@ -17,11 +17,11 @@ Build-Depends:
  python-yaml,
  python-mox3,
  python-lzma,
- golang-any
+ golang-any,
 Build-Depends-Indep:
  asciidoc,
  git,
- xmlto
+ xmlto,
 Homepage: https://piuparts.debian.org
 Vcs-Git: https://anonscm.debian.org/git/piuparts/piuparts.git
 Vcs-Browser: https://anonscm.debian.org/git/piuparts/piuparts.git
@@ -38,8 +38,8 @@ Depends:
  lsb-release,
  lsof,
  python-debian,
+ ${python:Depends},
  ${misc:Depends},
- ${python:Depends}
 Recommends:
  adequate
 Suggests:
@@ -58,16 +58,18 @@ Description: .deb package installation, upgrading, and removal testing tool
 Package: piuparts-master
 Architecture: any
 Depends:
- piuparts-common (= ${binary:Version}),
+ piuparts-common (>= ${source:Version}),
+ piuparts-common (<< ${source:Version}+),
  adduser,
  openssh-server,
  python-debianbts,
  tango-icon-theme,
  xz-utils,
  python-yaml,
- ${misc:Depends},
  python (>= 2.7),
- ${python:Depends}
+ ${python:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends},
 Recommends:
  apache2 | httpd,
  ghostscript,
@@ -99,9 +101,9 @@ Depends:
  openssh-client,
  screen,
  sudo,
- ${misc:Depends},
  python (>= 2.7),
- ${python:Depends}
+ ${python:Depends},
+ ${misc:Depends},
 Suggests:
  schroot
 Breaks:
@@ -123,8 +125,8 @@ Depends:
  python-apt,
  python-distro-info,
  python-lzma,
+ ${python:Depends},
  ${misc:Depends},
- ${python:Depends}
 Breaks:
  piuparts (<= 0.44)
 Replaces:
diff --git a/debian/copyright b/debian/copyright
index e430c2d..9889345 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -35,14 +35,14 @@ License: GPL-2+
  License version 2 can be found in the file
  '/usr/share/common-licenses/GPL-2'.
 
-Files: */debian.png */openlogo-ng-50.png
+Files: htdocs/images/debian.png htdocs/images/openlogo-nd-50.png
 Copyright: 1999 Software in the Public Interest
 License: Free
  This logo or a modified version may be used by anyone to refer to the Debian project, but does not indicate endorsement by the project.
  .
  Note: we would appreciate that you make the image a link to https://www.debian.org/ if you use it on a web page.
 
-Files: */valid-html401.png */w3c-valid-css.png
+Files: htdocs/images/valid-html401.png htdocs/images/w3c-valid-css.png
 Copyright: 2009 W3C
 License: FreeUse
  In most cases, W3C logos and icons may be used without requesting permission
diff --git a/piuparts.1.txt b/piuparts.1.txt
index 6be9286..9440324 100644
--- a/piuparts.1.txt
+++ b/piuparts.1.txt
@@ -132,7 +132,7 @@ The tarball can be created with the '-s' option, or you can use one that *pbuild
   This option can be used as many times as necessary.
 
 *--install-purge-install*::
-  Purge package after installation and reinstall. All depedencies are installed during purge.
+  Purge package after installation and reinstall. All dependencies are available during purge.
 
 *--install-recommends*::
   Enable installation of Recommends.

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