-
Committer:
Iain Lane
-
Date:
2009-08-18 14:56:29 UTC
-
mfrom:
(1.1.6 sid)
-
Revision ID:
laney@ubuntu.com-20090818145629-is00aedyupgjm3m5
Tags: 0.4.59ubuntu1
* Merge from debian unstable (LP: #414791), remaining changes:
- 1/class/autotools-files.mk.in: Add -i option when calling libtoolize to
install missing files. (Debian #525849)
- 1/class/gnome.mk.in:
+ Include langpack.mk.
+ Check if $DEB_BUILDDIR actually exists before cd'ing to it.
- Add 1/class/kde4.mk.in: Generic KDE4 build rules. Install it in
Makefile.am.
- 1/class/kde.mk.in:
+ Call dh_icons and bump autogenerated debhelper build dependency
appropriately.
+ Add --without-arts to standard configure flags, since it is
deprecated.
+ build POT file, and add X-Ubuntu-Gettext-Domain to .desktop files.
- 1/class/python-distutils.mk.in:
+ Supply --install-layout=deb install argument, to install files into
/usr instead of /usr/local/.
+ Rename dist-packages/ to site-packages/ again, so that packages which
expect setup.py to install to site-packages/ and depend on that in
their dh_install files don't break. dh_py* will take care of the final
renaming.
- Add 1/rules/clean-la.mk.in: Remove dependency_libs lines from .la files.
Install it in Makefile.am.
- 1/rules/debhelper.mk.in:
+ Do not install upstream changelogs by default. They are huge and thus
waste a lot of archive and CD space, quite uninteresting for ordinary
users, and easy to get by downloading the source package or visiting the
upstream page pointed out in copyright.
+ Symlink /usr/share/doc/ files to identical versions in any depending
package which is built by the source package (except copyright, to
adhere to Debian Policy). This can be disabled by setting
$CDBS_NO_DOC_SYMLINKING.
+ Symlink identical Gnome help files (like untranslated images). This
can be disabled by setting $CDBS_NO_GNOME_HELP_SYMLINKING. Add fdupes
dependency for this.
- Add 1/rules/langpack.mk.in: Generic langpack related tasks: Build POT
files and add X-Ubuntu-Gettext-Domain to .desktop/.server/.directory
files. Install file in Makefile.am. Add intltool dependency for this.
- 1/rules/simple-patchsys.mk.in: Revert the change for Debian bug #387103
that causes patches to be unapplied before cleaning the build directory;
the original issue was addressed more thoroughly in 0.4.49 with a fix
for Debian bug #424080, and unpatch-before-clean breaks some relevant
use cases that involve patching of build systems. (Debian #494254)
- scripts/cdbs-edit-patch: Add fallback if DEB_TAR_SRCDIR contains
variables.
* Revert changes in Debian r383 (relaxed versioned build-deps when satisfied
in Lenny) - some of these build-deps are still required for Dapper.