-
Committer:
Bazaar Package Importer
-
Author(s):
Alessandro Ghersi
-
Date:
2009-06-03 19:41:13 UTC
-
mfrom:
(1.2.10 upstream)
(2.1.4 sid)
-
Revision ID:
james.westby@ubuntu.com-20090603194113-deyyck10gghrc5p1
Tags: 1.2~alpha3-1ubuntu1.1~ppa1
* Merge from Debian Unstable, remaining changes:
- use include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk
- use /usr/share/cdbs/1/rules/debhelper.mk
- add include /usr/share/cdbs/1/rules/patchsys-quilt.mk
- add kubuntu/default_channels.diff, disable debian/default_channel.diff
- change xpm/README.scripts path slightly to accomidate our differing
build systems
- Use the Kubuntu docpath (/usr/share/doc/kde)
- build-depend on cdbs
- Do not call debhelper with --with quilt for backportability reasons