[Piuparts-commits] [piuparts] 03/06: changelog and other minor cleanups, copyright bumps
Holger Levsen
holger at moszumanska.debian.org
Wed Feb 5 10:24:37 UTC 2014
This is an automated email from the git hooks/post-receive script.
holger pushed a commit to branch develop
in repository piuparts.
commit 8daf33bba24b33163bdbd065eb05322d67abcc2d
Author: Andreas Beckmann <anbe at debian.org>
Date: Thu Jan 30 18:18:24 2014 +0100
changelog and other minor cleanups, copyright bumps
Signed-off-by: Andreas Beckmann <anbe at debian.org>
---
debian/changelog | 5 ++++-
debian/copyright | 4 ++--
piuparts.py | 4 ++--
piupartslib/packagesdb.py | 2 +-
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b8691c0..c7c8a6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
piuparts (0.57) UNRELEASED; urgency=low
[ Ivo De Decker ]
- * piuparts-report.py: use source info from final_distro for logging.
+ * piuparts-report.py: Use source version from final_distro.
(Closes: #733900)
[ Matthias Schmitz ]
@@ -36,6 +36,9 @@ piuparts (0.57) UNRELEASED; urgency=low
- Exclude virtual packages provided by the real package (but not the dummy
package) from the Conflicts of piuparts-depends-dummy.deb.
* piupartslib/packagesdb.py:
+ - load_alternate_versions_from_packages_urls(): New method to load
+ alternate version numbers from a different set of URLs (e.g.
+ final_distro).
- get_best_package_state(): New method that considers successfully tested
providers of a virtual package if the real package of the same name
failed. Used for dependency resolution.
diff --git a/debian/copyright b/debian/copyright
index 12946ce..6dcca42 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Upstream-Contact: Holger Levsen <holger at debian.org>
Source: http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git
Copyright: 2005-2008 Lars Wirzenius
2008-2011 Holger Levsen
- © 2011-2013 Andreas Beckmann
+ © 2011-2014 Andreas Beckmann
Comment: Original author is also Lars Wirzenius <liw at iki.fi>
Upstream is bunch of lunatics who don't make release tarballs publicly
available. The Debian .orig.tar.gz is what would be released, though.
@@ -12,7 +12,7 @@ Comment: Original author is also Lars Wirzenius <liw at iki.fi>
Files: *
Copyright: 2005-2008 Lars Wirzenius <liw at iki.fi>
2008-2011 Holger Levsen <holger at debian.org>
- © 2011-2013 Andreas Beckmann <anbe at debian.org>
+ © 2011-2014 Andreas Beckmann <anbe at debian.org>
License: GPL-2+
This program is free software; you can redistribute it
and/or modify it under the terms of the GNU General Public
diff --git a/piuparts.py b/piuparts.py
index 28c85e7..bfa0048 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
#
# Copyright 2005 Lars Wirzenius (liw at iki.fi)
-# Copyright © 2010-2013 Andreas Beckmann (anbe at debian.org)
+# Copyright © 2010-2014 Andreas Beckmann (anbe at debian.org)
#
# This program is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
@@ -1147,7 +1147,7 @@ class Chroot:
packages = [p.split("=", 1)[0].strip() for p in packages if not p.endswith("=None")]
if packages and settings.adequate and os.path.isfile('/usr/bin/adequate'):
(status, output) = run(["dpkg-query", "-f", "${Version}\n", "-W", "adequate"], ignore_errors=True)
- logging.info("Running adequate version %s now." % output)
+ logging.info("Running adequate version %s now." % output.strip())
adequate_tags = [
'bin-or-sbin-binary-requires-usr-lib-library',
'library-not-found',
diff --git a/piupartslib/packagesdb.py b/piupartslib/packagesdb.py
index d3b7084..bb2ee31 100644
--- a/piupartslib/packagesdb.py
+++ b/piupartslib/packagesdb.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Copyright 2005 Lars Wirzenius (liw at iki.fi)
-# Copyright © 2011-2013 Andreas Beckmann (anbe at debian.org)
+# Copyright © 2011-2014 Andreas Beckmann (anbe at debian.org)
#
# This program is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git
More information about the Piuparts-commits
mailing list