[Piuparts-commits] [piuparts] 06/06: changelog updates, copyright bumps, typo fixes
Holger Levsen
holger at moszumanska.debian.org
Mon Aug 10 08:43:14 UTC 2015
This is an automated email from the git hooks/post-receive script.
holger pushed a commit to branch develop
in repository piuparts.
commit 2184eeb5de92e46d650ca9b18c7a710592a0182c
Author: Andreas Beckmann <anbe at debian.org>
Date: Mon Aug 10 01:51:30 2015 +0200
changelog updates, copyright bumps, typo fixes
Signed-off-by: Andreas Beckmann <anbe at debian.org>
---
bug-templates/copyright_file_missing_after_upgrade.mail | 2 +-
bug-templates/unhandled_symlink_to_directory_conversion.mail | 2 +-
custom-scripts/scripts/pre_remove_40_find_obsolete_conffiles | 2 +-
debian/changelog | 7 ++++---
debian/control | 4 ++--
piuparts-master-backend.py | 2 +-
piuparts-slave.py | 2 +-
piuparts.py | 2 +-
piupartslib/packagesdb.py | 2 +-
9 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/bug-templates/copyright_file_missing_after_upgrade.mail b/bug-templates/copyright_file_missing_after_upgrade.mail
index 869c90a..0d153d8 100644
--- a/bug-templates/copyright_file_missing_after_upgrade.mail
+++ b/bug-templates/copyright_file_missing_after_upgrade.mail
@@ -32,7 +32,7 @@ https://www.debian.org/doc/debian-policy/ch-maintainerscripts.html#s-unpackphase
It is recommended to use the dpkg-maintscript-helper commands
'dir_to_symlink' and 'symlink_to_dir' (available since dpkg 1.17.14)
-to perform the conversion, ideally using d/$PACKAGE.mainstscript.
+to perform the conversion, ideally using d/$PACKAGE.maintscript.
Do not forget to add 'Pre-Depends: ${misc:Pre-Depends}' in d/control.
See dpkg-maintscript-helper(1) and dh_installdeb(1) for details.
diff --git a/bug-templates/unhandled_symlink_to_directory_conversion.mail b/bug-templates/unhandled_symlink_to_directory_conversion.mail
index 557cfaf..eac08f4 100644
--- a/bug-templates/unhandled_symlink_to_directory_conversion.mail
+++ b/bug-templates/unhandled_symlink_to_directory_conversion.mail
@@ -35,7 +35,7 @@ https://www.debian.org/doc/debian-policy/ch-maintainerscripts.html#s-unpackphase
It is recommended to use the dpkg-maintscript-helper commands
'dir_to_symlink' and 'symlink_to_dir' (available since dpkg 1.17.14)
-to perform the conversion, ideally using d/$PACKAGE.mainstscript.
+to perform the conversion, ideally using d/$PACKAGE.maintscript.
Do not forget to add 'Pre-Depends: ${misc:Pre-Depends}' in d/control.
See dpkg-maintscript-helper(1) and dh_installdeb(1) for details.
diff --git a/custom-scripts/scripts/pre_remove_40_find_obsolete_conffiles b/custom-scripts/scripts/pre_remove_40_find_obsolete_conffiles
index d1fb9cd..5a5e069 100755
--- a/custom-scripts/scripts/pre_remove_40_find_obsolete_conffiles
+++ b/custom-scripts/scripts/pre_remove_40_find_obsolete_conffiles
@@ -10,7 +10,7 @@ do
info="OBSOLETE CONFFILE $file REGISTERED BY $pkg"
query=$(dpkg-query -S $file)
owner=${query%: ${file}}
- if [ "$owner" != "$pkg" ]; then
+ if [ "${owner%:*}" != "$pkg" ]; then
info="${info} OWNER CHANGED TO $owner"
fi
if [ ! -f "$file" ]; then
diff --git a/debian/changelog b/debian/changelog
index 5e437d5..a0f7e65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ piuparts (0.65) UNRELEASED; urgency=medium
- Ensure /etc/mtab exists in the chroot.
- Create sources.list entries for --testdebs-repo with '[ trusted=yes ]'
to avoid needing --do-not-verify-signatures which would act globally.
- - Add --fake-essential-packages option to include packages to the base
+ - Add --fake-essential-packages option to include packages in the base
chroot that are not removed after the test. These are available during
purge and for checking against mistreatment.
- Increase permitted command output volume from 3 MB to 4 MB (for daptup).
@@ -18,14 +18,15 @@ piuparts (0.65) UNRELEASED; urgency=medium
- Put package in 'dependency-does-not-exist' state if a pass/ log exists
but a dependency has been removed from the archive since then.
- Prepare improvements for handling foreign arch dependencies.
- * piupartslib/open_packages_url(): support uncompressed Packages files.
+ * piupartslib/open_packages_url(): Support uncompressed Packages files.
* piuparts-master-backend.py:
- Catch URLError, log it and abort without backtrace.
* scripts/post_distupgrade_exceptions:
- Fix the /etc/nsswitch.conf wheezy -> jessie upgrade handling.
- * Add bug template for wheezy -> jessie -> stretch upgrades.
* scripts/pre_remove_40_find_unowned_lib_links: Ignore some symlinks caused
by mpi-default-dev and libglide2/libglide3.
+ * Add/adjust some exceptions for ancient packages.
+ * Add bug template for wheezy -> jessie -> stretch upgrades.
-- Holger Levsen <holger at debian.org> Fri, 12 Jun 2015 13:43:42 +0200
diff --git a/debian/control b/debian/control
index d56041b..97bf15c 100644
--- a/debian/control
+++ b/debian/control
@@ -83,7 +83,7 @@ Description: piuparts master components
as it is done on https://piuparts.debian.org/.
.
This package provides the piuparts-master, which needs one or more slaves to
- operate. It also contains piuparts-reports to generate web pages with the
+ operate. It also contains piuparts-report to generate web pages with the
testing results as well as documentation.
Package: piuparts-slave
@@ -124,7 +124,7 @@ Breaks:
Replaces:
piuparts (<= 0.44)
Description: common piuparts components
- piupartslib, common library used by piuparts-master, -reports, -analyze and
+ piupartslib, common library used by piuparts-master, -report, -analyze and
-slave.
.
See https://piuparts.debian.org or the piuparts package to learn more about
diff --git a/piuparts-master-backend.py b/piuparts-master-backend.py
index e560adf..3e87c41 100644
--- a/piuparts-master-backend.py
+++ b/piuparts-master-backend.py
@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
#
# Copyright 2005 Lars Wirzenius (liw at iki.fi)
-# Copyright © 2011-2013 Andreas Beckmann (anbe at debian.org)
+# Copyright © 2011-2015 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
diff --git a/piuparts-slave.py b/piuparts-slave.py
index 0312a05..9b14752 100644
--- a/piuparts-slave.py
+++ b/piuparts-slave.py
@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
#
# Copyright 2005 Lars Wirzenius (liw at iki.fi)
-# Copyright © 2011-2013 Andreas Beckmann (anbe at debian.org)
+# Copyright © 2011-2015 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
diff --git a/piuparts.py b/piuparts.py
index f4b4bd1..b0491cc 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
#
# Copyright 2005 Lars Wirzenius (liw at iki.fi)
-# Copyright © 2010-2014 Andreas Beckmann (anbe at debian.org)
+# Copyright © 2010-2015 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
diff --git a/piupartslib/packagesdb.py b/piupartslib/packagesdb.py
index 1b41bbf..fb2b770 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-2014 Andreas Beckmann (anbe at debian.org)
+# Copyright © 2011-2015 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