-
Committer:
Package Import Robot
-
Author(s):
Steve Langasek
-
Date:
2013-05-15 04:07:27 UTC
-
Revision ID:
package-import@ubuntu.com-20130515040727-tqedq21jcw7i9tp2
Tags: 4.1+Debian9ubuntu1
* Merge from Debian unstable:
- lsb-desktop no longer depends on transitional libqt4-gui. LP: #339501.
- lsb-invalid-mta includes /usr/lib/sendmail as a symlink. LP: #580914.
- fixes a typo in the package description. LP: #1177473.
* Remaining changes:
- Mark lsb-core Multi-Arch: foreign.
- Use python3 instead of python2.
- Fix status_of_proc returning incorrect error code; and when a pidfile
is specified, return "unknown" if it exists but isn't readable (as
would be the case for non-root with a root-only pidfile), and return
"not running" if the pidfile otherwise doesn't provide a useful PID.
This issue may also be fixed now in the Debian version, but someone
needs to compare the differing implementations to verify before this
delta can be dropped.
- Correct duplicate reference to log_action_end_msg_post in
debian/lsb-base.README.Debian.
- lsb_release: Add -Es to #! line for Python.
* Dropped changes, included in Debian:
- Mark lsb-release and lsb-base Multi-Arch: foreign.
- Drop Qt3 from lsb-desktop depends and add lsb-desktop.NEWS to explain
its absence
- Depend on libgl1-mesa-glx rather than libgl1-mesa as preferred libgl1
alternative.
- Use dpkg --print-architecture rather than
--print-installation-architecture.
- Use $DPKG_MAINTSCRIPT_ARCH in the maintainer scripts to decide the
correct symlinks to set up, instead of going by the dpkg built-in
architecture.
- Don't conflict with python (>= 2.6).
- Use dh_python2
- lsb_release.py: Ensure that files are closed promptly; Python 3.2
prints ResourceWarning noise otherwise.
- Skip calling apt-cache if /etc/lsb-release contains everything we need.
- sendmail, debian/control, debian/rules, debian/lsb-invalid-mta.dirs:
include new "lsb-invalid-mta" package.
- Remove /usr/lib/pymodules/python2.6/lsb_release.py on upgrades; this
was a karmic-only upgrade issue that we could have removed the
handling for back in maverick, better late than never.
- Add Ubuntu logging functions.
- Added ghostscript-cups dependency.
- Made lsb-printing required by the lsb package, not just suggested.
* lsb-languages must depend on python, not on python3, as /usr/bin/python is
the interface guaranteed by this submodule.
* Fix debian/copyright to list the correct Canonical copyright for the
Ubuntu logging functions.
* Revert wrongheaded calls to /bin/echo whenever -n is used; 'echo -n' is
guaranteed by Debian policy, we don't want a bunch of extra forks here
for no reason.
* Port initdutils.py to python3 so that the tests will pass at build time.
* Call 2to3 correctly so that the scripts in /usr/lib/lsb are usable under
python3. LP: #798192.