[SCM] Debian Qt/KDE packaging tools branch, kubuntu_utopic_archive, created. debian/0.15.15-2-gc4beac8
Jonathan Riddell
jriddell-guest at moszumanska.debian.org
Fri Sep 26 13:11:17 UTC 2014
The branch, kubuntu_utopic_archive has been created
at c4beac84184a88cc48cb53f0cbac05084fe26748 (commit)
- Shortlog ------------------------------------------------------------
commit c4beac84184a88cc48cb53f0cbac05084fe26748
Author: Jonathan Riddell <jr at jriddell.org>
Date: Fri Sep 26 15:05:18 2014 +0200
Merge with debian, remaining changes:
* Merge with debian, remaining changes:
- Add kf5 debhelper module for KDE Frameworks 5 (perllib/Debian/Debhelper/*/kf5.pm)
- Add scripts to build KDE Frameworks 5 & Plasma 5 (qt-kde-team/3/*)
- qt-kde-team/1/debian-qt-kde.mk: distribution text = "Kubuntu packages"
- debian/rules: add rules to sync l10n
- add debian/KUBUNTU-BZR-WORKFLOW
- Add l10n scripts in kubuntu/
- debian/install: install kubuntu/ files
- qt-kde-team/{1,2}/policy.mk: remove maintainer checking
- qt-kde-team/2/debian-qt-kde.mk: run list-missing after the binary target
- qt-kde-team/2/list-missing.mk: print marker before and after list-missing
output for script parsing
- Add qt-kde-team/2/lintian.mk and call it in qt-kde-team/2/debian-qt-kde.mk
- Depend on python and docbook-to-man, recommend lintian
* Drop xz.pm and lzma.pm, dpkg >= 1.17.0 has xz compression by default
* Merge with Debian git, remaining changes:
- qt-kde-team/1/debian-qt-kde.mk: distribution text = "Kubuntu packages"
- debian/rules: add rules to sync l10n
- add debian/KUBUNTU-BZR-WORKFLOW
- Add l10n scripts in kubuntu/
- debian/install: install kubuntu/ files
- makefiles/1/cdbs, qt-kde-team/1/debian-qt-kde.mk:
compress packages with LZMA
- add perllib/Debian/Debhelper/Sequence/lzma.pm and xz.pm
- perllib/Debian/Debhelper/Sequence/kde.pm: include xz sequences
- qt-kde-team/{1,2}/policy.mk: remove maintainer checking
- qt-kde-team/2/debian-qt-kde.mk: run list-missing after the binary target
- qt-kde-team/2/list-missing.mk: print marker before and after list-missing
output for script parsing
- Add qt-kde-team/2/lintian.mk and call it in qt-kde-team/2/debian-qt-kde.mk
- Depend on python and docbook-to-man, recommend lintian
* Merge from Debian unstable, remaining changes:
- qt-kde-team/1/debian-qt-kde.mk: distribution text = "Kubuntu packages"
- debian/rules: add rules to sync l10n
- add debian/KUBUNTU-BZR-WORKFLOW
- Add l10n scripts in kubuntu/
- debian/install: install kubuntu/ files
- makefiles/1/cdbs, qt-kde-team/1/debian-qt-kde.mk:
compress packages with LZMA
- add perllib/Debian/Debhelper/Sequence/lzma.pm and xz.pm
- perllib/Debian/Debhelper/Sequence/kde.pm: include xz sequences
- qt-kde-team/{1,2}/policy.mk: remove maintainer checking
- qt-kde-team/2/debian-qt-kde.mk: run list-missing after the binary target
- qt-kde-team/2/list-missing.mk: print marker before and after list-missing
output for script parsing
- Add qt-kde-team/2/lintian.mk and call it in qt-kde-team/2/debian-qt-kde.mk
- Depend on python and docbook-to-man, recommend lintian
- TypeSubst.pm: Anchor architecture matches to the ends of the string, to
avoid erroneously mapping qreal to float on arm64.
- TypeSubst.pm: Add arm64 and ppc64el to the 64-bit matches.
* perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm:
- Anchor architecture matches to the ends of the string, to avoid
erroneously mapping qreal to float on arm64.
- Add arm64 and ppc64el to the 64-bit matches.
* Merge from Debian unstable (LP: #1219695), remaining changes:
- qt-kde-team/1/debian-qt-kde.mk: distribution text = "Kubuntu packages"
- debian/rules: add rules to sync l10n
- add debian/KUBUNTU-BZR-WORKFLOW
- Add l10n scripts in kubuntu/
- debian/install: install kubuntu/ files
- makefiles/1/cdbs, qt-kde-team/1/debian-qt-kde.mk:
compress packages with LZMA
- add perllib/Debian/Debhelper/Sequence/lzma.pm and xz.pm
- perllib/Debian/Debhelper/Sequence/kde.pm: include xz squences
- qt-kde-team/{1,2}/policy.mk: remove maintainer checking
- qt-kde-team/2/debian-qt-kde.mk: run list-missing after the binary target
- qt-kde-team/2/list-missing.mk: print marker before and after list-missing
output for script parsing
- Add qt-kde-team/2/lintian.mk and call it in qt-kde-team/2/debian-qt-kde.mk
- Depend on python and docbook-to-man, recommend lintian
* Re-enable lintian but only recommend it
* Remove lintian dependency from pkg-kde-tools as it's too heavy and don't
run the lintian target in debian-qt-kde.mk
* qt-kde-team/*/debian-qt-kde.mk uses docbook-to-man, so depend on it
* Merge from Debian unstable. Remaining changes:
- qt-kde-team/1/debian-qt-kde.mk: distribution text = "Kubuntu packages"
- debian/rules: add rules to sync l10n
- add debian/KUBUNTU-BZR-WORKFLOW
- Add l10n scripts in kubuntu/
- debian/install: install kubuntu/ files
- makefiles/1/cdbs, qt-kde-team/1/debian-qt-kde.mk:
compress packages with LZMA
- add perllib/Debian/Debhelper/Sequence/lzma.pm and xz.pm
- perllib/Debian/Debhelper/Sequence/kde.pm: include xz squences
- qt-kde-team/{1,2}/policy.mk: remove maintainer checking
- qt-kde-team/2/debian-qt-kde.mk: run list-missing after the binary target
- qt-kde-team/2/list-missing.mk: print marker before and after list-missing
output for script parsing
- Add qt-kde-team/2/lintian.mk and call it in qt-kde-team/2/debian-qt-kde.mk
* Merge with Debian unstable, remaining changes:
- qt-kde-team/1/debian-qt-kde.mk: distribution text = "Kubuntu packages"
- debian/rules: add rules to sync l10n
- add debian/KUBUNTU-BZR-WORKFLOW
- Add l10n scripts in kubuntu/
- debian/install: install kubuntu/ files
- makefiles/1/cdbs, qt-kde-team/1/debian-qt-kde.mk:
compress packages with LZMA
- add perllib/Debian/Debhelper/Sequence/lzma.pm and xz.pm
- perllib/Debian/Debhelper/Sequence/kde.pm: include xz squences
- qt-kde-team/{1,2}/policy.mk: remove maintainer checking
- qt-kde-team/2/debian-qt-kde.mk: run list-missing after the binary target
- qt-kde-team/2/list-missing.mk: print marker before and after list-missing
output for script parsing
- Add qt-kde-team/2/lintian.mk and call it in qt-kde-team/2/debian-qt-kde.mk
* Remove incorrect Vcs lines in debian/control
* In extract-messages.sh don't include .pc directories from quilt
* Add python as dep of pkg-kde-tools.
upstream's msgsplit script for l10n uses python
* Add envrionment variables to dh_kubuntu_l10n_* for use in the package
kubuntu-patched-l10n which processes other packages so it needs to force
a check regardless of any preconditions the scripts would usually expect.
- KUBUNTU_L10N_FORCE_RUN - Forces a run of the pot creation.
- KUBUNTU_L10N_NO_DESKTOP - Skips desktop file portion.
Desktop file changes are not supported through kubuntu-patched-l10n so
processing them could lead to unintended results.
* If preconditions are met, create the sources on all architectures.
Otherwise we can run into funny results when a desktop file is in an
arch: any package and then ends up without ubuntu domain key on amd64.
* dhmk related l10n fixes. dhmk expects sequence introduced binarys to be
a name rather than a path, in particular making it a path will make dhmk
fall over its on stupidity and fail to generate pseudo-targets thus causing
FTBFS
* Rename kubuntu-debhelper-*.sh to dh_kubuntu_l10n_*
* Restructure kubuntu/ dir to contain subdirectories bin/ and lib/
+ Change .install to install bin/* to usr/bin and lib/* to usr/lib/kubuntu-l10n
+ Scripts from upstream are now in lib/libexec (due to their rather random
names they ought not be in usr/bin)
+ dh_kubuntu scripts add libexec to their PATH to pick up the upstream
tooling
* Remove kubuntu.mk used in dhmk1 and cdbs. Those build systems are now
unsupported as far as l10n goes. All packages that want l10n need to use
either dhmk2 or the debhelper kde sequence or the debhelper kubuntu-l10n
sequence.
* Re-add createdesktopcontext.pl to sync (needed for Kubuntu specific stuff
to build a pot of desktop files).
* Include kubuntu/debhelper/finddesktopfiles.sh which is a simpler version
of the previously used findfiles from upstream. In particular it only
runs a find for all known desktopfile-like file endings and writes
those to a file to be picked bup createdesktopcontext.pl later.
* Convert kdesdk-script sync to use git (recently moved there)
* Make git based sync use proper git with a shallow single-branch clone of
the respective release tag (as fast as possible, also as reliable as
possible).
* Drop sync note about findfiles script which is no longer present
* Drop the SVNREV variable in rules as we either sync from a git tag or
SVN's stable branch now.
* Set path in i18n scripts to avoid having to define the absolute path
(resolving the absolute path of $script and using that would be even
neater).
* Abort langpack helper execution iff not building for archive or it was
not explicitly enabled. Previously it would not build when not building
for archive or not targetting main. As now most of Kubuntu is in universe
and we do not use launchpad for upstream software all packages that need
launchpad translations need to explicitly opt-in by adding
'X-Ubuntu-Use-Langpack: yes' to their control file. Since mangling for
Kubuntu only makes sense in an archive context this restriction remains.
* Drop auto-l10n from kde dh buildsystem and move it to the sequence instead.
* Sync l10n scripts from upstream.
* qt-kde-team/2/lintian.mk: Generate a temporary .changes file for the
lintian check as the final one is generated later.
* Add support to show lintian warnings during build:
- debian/control: Add dependency on lintian
- qt-kde-team/2/debian-qt-kde.mk: run lintian after the binary target
- qt-kde-team/2/lintian.mk: print lintian output with markers to make
script parsing easier.
* Merge with Debian unstable, remaining changes:
- qt-kde-team/1/debian-qt-kde.mk: distribution text = "Kubuntu packages"
- debian/rules: add rules to sync l10n
- debian/install: install kubuntu/ files
- makefiles/1/cdbs, qt-kde-team/1/debian-qt-kde.mk:
add "include /usr/lib/kubuntu-desktop-i18n/kubuntu.mk" and compress
packages with LZMA
- add perlib/Debian/Debhelper/lzma.pm and xz.pm
- perlib/Debian/Debhelper/kde.pm: include xz squences
- qt-kde-team/{1,2}/policy.mk: remove maintainer checking
- perlib/Debian/Debhelper/Buildsystem: add sub clean and sub install
for i18n
- qt-kde-team/2/debian-qt-kde.mk: run list-missing after the binary target
- qt-kde-team/2/list-missing.mk: print marker before and after list-missing
output for script parsing
* Remove incorrect Vcs lines in debian/control
* Merge with Debian unstable, remaining changes:
- qt-kde-team/1/debian-qt-kde.mk: distribution text = "Kubuntu packages"
- debian/rules: add rules to sync l10n
- debian/install: install kubuntu/ files
- makefiles/1/cdbs, qt-kde-team/1/debian-qt-kde.mk:
add "include /usr/lib/kubuntu-desktop-i18n/kubuntu.mk" and compress
packages with LZMA
- add perlib/Debian/Debhelper/lzma.pm and xz.pm
- perlib/Debian/Debhelper/kde.pm: include xz squences
- qt-kde-team/{1,2}/policy.mk: remove maintainer checking
- perlib/Debian/Debhelper/Buildsystem: add sub clean and sub install
for i18n
* qt-kde-team/2/debian-qt-kde.mk: don't pass -Zxz to dh_builddeb as we
already do that in the kde debhelper addon
* qt-kde-team/2/debian-qt-kde.mk: run list-missing after the binary target
* qt-kde-team/2/list-missing.mk: print marker before and after list-missing
output
* Merge with Debian unstable, remaining changes:
- qt-kde-team/1/debian-qt-kde.mk: distribution text = "Kubuntu packages"
- debian/rules: add rules to sync l10n
- debian/install: install kubuntu/ files
- makefiles/1/cdbs, qt-kde-team/1/debian-qt-kde.mk:
add "include /usr/lib/kubuntu-desktop-i18n/kubuntu.mk" and compress
packages with LZMA
- add perlib/Debian/Debhelper/lzma.pm
- perlib/Debian/Debhelper/kde.pm: include lzma squences
- qt-kde-team/{1,2}/policy.mk: remove maintainer checking
- perlib/Debian/Debhelper/Buildsystem: add sub clean and sub install
for i18n
* Add "xz" debhelper addons that compresses packages using the XZ algorithm.
* Make the kde debhelper addon use xz instad of lzma.
* Enable xz compression on all architectures.
* Merge with Debian git snapshot, remaining changes:
- qt-kde-team/1/debian-qt-kde.mk: distribution text = "Kubuntu packages"
- debian/install: install kubuntu/ files
- makefiles/1/cdbs, qt-kde-team/1/debian-qt-kde.mk:
add "include /usr/lib/kubuntu-desktop-i18n/kubuntu.mk" and compress
packages with LZMA
- add perlib/Debian/Debhelper/lzma.pm
- perlib/Debian/Debhelper/kde.pm: include lzma squences
- qt-kde-team/{1,2}/policy.mk: remove maintainer checking
- perlib/Debian/Debhelper/Buildsystem: add sub clean and sub install
for i18n
* debian/rules: add rules to sync l10n
* Run syncl10n.
* Drop code that sets KUBUNTU_DESKTOP_POT which isn't used anymore.
* Update kubuntu-debhelper-langpack-generate.sh to not fail when no
.pot files are generated
* In kubuntu-debhelper-langpack-clean.sh fix syntax on variable name
* Add calls to kubuntu i18n scripts back to
perllib/Debian/Debhelper/Buildsystem/kde.pm, makefiles/1/cdbs/kde.mk and qt-kde-team/1/debian-qt-kde.mk,
needed for .pot generation
* Add back kubuntu.mk, debhelper/kubuntu.mk and debhelper/ scripts to to .pot generation
* Add to pkg-kde-tools.install
* Mark pkg-kde-tools Multi-Arch: foreign.
* Merge with Debian unstable, remaining changes:
- qt-kde-team/1/debian-qt-kde.mk: distribution text = "Kubuntu packages"
- debian/install: install kubuntu/ files
- makefiles/1/cdbs, qt-kde-team/1/debian-qt-kde.mk:
compress packages with LZMA
- add perlib/Debian/Debhelper/lzma.pm
- perlib/Debian/Debhelper/kde.pm: include lzma squences
- qt-kde-team/{1,2}/policy.mk: remove maintainer checking
- perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm:
add ppc64 support
* Stop stripping translations from desktop files as per discussion on
kubuntu-devel mailing list.
- Keep desktop-template-list for compatibility with current kde-l10n
packages.
- Keep /usr/bin scripts for now. We should look into moving them back to
kdesdk-scripts next cycle.
* Merge with Debian unstable, remaining changes:
- qt-kde-team/1/debian-qt-kde.mk: distribution text = "Kubuntu packages"
- debian/rules: add rules to sync l10n
- debian/install: install kubuntu/ files
- debian/control: add python to build-dependencies
- makefiles/1/cdbs, qt-kde-team/1/debian-qt-kde.mk:
add "include /usr/lib/kubuntu-desktop-i18n/kubuntu.mk" and compress
packages with LZMA
- perlib/Debian/Debhelper/Buildsystem: add sub clean and sub install
for i18n
- add perlib/Debian/Debhelper/lzma.pm
- perlib/Debian/Debhelper/kde.pm: include lzma squences
- qt-kde-team/{1,2}/policy.mk: remove maintainer checking
- perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm:
add ppc64 support
* Run syncl10n and merge findfiles from KDE 4.7.
* Clean package after running syncl10n.
* When processing .desktop files add the X-Ubuntu-Gettext-Domain key to the
[Desktop Entry] group instead of always appending it to the end of the
file. (LP: #794320)
* Merge with Debian unstable, remaining changes:
- qt-kde-team/1/debian-qt-kde.mk: distribution text = "Kubuntu packages"
- debian/rules: add rules to sync l10n
- debian/install: install kubuntu/ files
- debian/control: add python to build-dependencies
- makefiles/1/cdbs, qt-kde-team/1/debian-qt-kde.mk:
add "include /usr/lib/kubuntu-desktop-i18n/kubuntu.mk" and compress
packages with LZMA
- perlib/Debian/Debhelper/Buildsystem: add sub clean and sub install
for i18n
- add perlib/Debian/Debhelper/lzma.pm
- perlib/Debian/Debhelper/kde.pm: include lzma squences
- qt-kde-team/{1,2}/policy.mk: remove maintainer checking
- perllib/Debian/PkgKde/SymbolsHelper/Substs/{TypeSubst,VirtTable}.pm:
add ppc64 support
* Drop scour as it has proven to cause bugs (see #786192).
Packages that are known to work fine can still directly use the scour
sequence.
* Depend on python-rsvg and python-cairo so that dh_scour can do the
correctness test.
* Merge with Debian unstable, remaining changes:
- qt-kde-team/1/debian-qt-kde.mk: distribution text = "Kubuntu packages"
- debian/rules: add rules to sync l10n
- debian/install: install kubuntu/ files
- debian/control: add python to build-dependencies
- makefiles/1/cdbs, qt-kde-team/1/debian-qt-kde.mk:
add "include /usr/lib/kubuntu-desktop-i18n/kubuntu.mk" and compress
packages with LZMA
- perlib/Debian/Debhelper/Buildsystem: add sub clean and sub install
for i18n
- add perlib/Debian/Debhelper/lzma.pm
- perlib/Debian/Debhelper/kde.pm: include lzma and scour squences
+ add python and python-scour to Depends
- qt-kde-team/{1,2}/policy.mk: remove maintainer checking
- perllib/Debian/PkgKde/SymbolsHelper/Substs/{TypeSubst,VirtTable}.pm:
add ppc64 support
* lzma.pm: Use dpkg_architecture_value() instead of relying on the
DEB_HOST_ARCH env variable.
* Re-enable Scour as python-scour has dropped the problematic dependencies.
* Temporarily comment out Scour in perllib/Debian/Debhelper/Sequence/kde.pm
and drop python-scour from depends due to powerpc breakage
* Revert last upload now that gcc4.5 is fixed
* Force gcc-4.4 on ARM while we are waiting for a gcc-4.5 fix to segfault
in a Qt inline function, see #705689.
Respectively changed files:
- 1/debian-qt-kde.mk
- cdbs/kde.mk
- Sequence/lzma.pm
* Add ppc64 support.
* Revert the last upload. -mimplicit-it=thumb on armel no longer works and
there will be a proper IT patch for qt4-x11 shortly
* Add CXXFLAGS += -Wa,-mimplicit-it=thumb on armel to work around
lack of native Thumb2 support in qt4-x11 to qt-kde-team/1/debian-qt-kde.mk
and makefiles/1/cdbs/kde.mk
* Add depends on python-scour
* In kde.pm run with scour Debhelper
* Merge with Debian unstable, remaining changes:
- datalib/kde4_flags: distribution text = "Kubuntu packages"
- debian/rules: add rules to sync l10n
- debian/install: install kubuntu/ files
- debian/control: add python to build-dependencies
- makefiles/1/cdbs, qt-kde-team/1/debian-qt-kde.mk:
add "include /usr/lib/kubuntu-desktop-i18n/kubuntu.mk" and compress
packages with LZMA
- perlib/Debian/Debhelper/Buildsystem: add sub clean and sub install
for i18n
- add perlib/Debian/Debhelper/lzma.pm
- perlib/Debian/Debhelper/kde.pm:
add require Debian::Debhelper::Sequence::lzma
- qt-kde-team/1/policy.mk: remove maintainer checking
* qt-kde-team/1/policy.mk: remove maintainer checking to fix FTBS when
maintainer is not Debian qt-kde team
* Revert -u to -- change from previous uploaded.
Caues issues with arguments to dpkg-deb somehow.
* Prevent tests from failing by using require instead of use, since use
invokes require inside a block there is a bit of a scope mess it seems
* Update lzma.pm to attach -- -Zlzma rather than -u -Zlzma to dh_builddeb,
-u is considered deprecate
* Add lzma sequence to debhelper
+ This enables Qt-only packages to simply build with "--with lzma" if
they use dh
* Use that new sequence in the KDE one
* In both kubuntu.mk files set KUBUNTU_DESKTOP_POT at makefile scope to
avoid running into shell scope issues causing desktop_.pot files.
* Set DEB_BUILD_ARCH manually in the CDBS kubuntu.mk too to ensure that it
is set when the pot hook gets executed.
* Update the README.l10n with information about syncl10n and the fact that
there is a need to sync with KDE every once in a while.
* Add descriptions to the variables in debian/rules to make it more obvious
what to do.
* Syncl10n + merge findfiles (with a no-change for us but necessary to keep
the relation to KDE's file more obvious)
* Trying to repair the logic of the l10n restriction to i386.
The gettext domain does still needs to be added and removed, regardless
of the architecture, but the actual template creation only ought to
happen on i386.
Due to increasingly more complex code this is indeed likely to break things
OTOH the restriction as seen in ubuntu7&8 are breaking translations on
everything but i386.
* Slightly adjust the syntax for DEB_NO_COMPRESSION to avoid warnings.
* Restrict l10n to i386 - This is the final stage, l10n magic will only
happen for proper archive builds targetting main or restricted on i386.
* Add support for DEB_NO_COMPRESSION, in combiniation with DEB_NO_LZMA
this enables builds without any deb compression whatsoever.
(Note: former only works if latter is also set to 1!)
* Add kdevelop to kubuntu/desktop-template-list
* Add choqok in desktop-template-list
* Add rekonq in desktop-template-list
* Fix kubuntu-debhelper-langpack-clean.sh, remove excessive dollar
sign
* Add kubuntu/README.l10n explaining when l10n is built and when not.
* Fix l10n for dh7 builds, as broken in the previous upload
* Enhance l10n restrictions to main|restricted builds
* Only set the Ubuntu-Gettext when we do a build for the regular Ubuntu
archives. This is determined by looking for /CurrentlyBuilding as created
by the buildd's. Only if this file contains Purpose: Primary the domains
will be set appropriately. Please note that no POT creation will happen
if this check fails.
* Merge with Debian unstable, remaining changes:
- Set -DKDE_DISTRIBUTION_TEXT="Kubuntu packages"
- Add kubuntu/ files and edit debian/install
- debian-qt-kde.mk: include kubuntu.mk
- debian-qt-kde.mk: use LZMA compression unless DEB_NO_LZMA=1 or armel
- cdbs/kde.mk: include kubuntu.mk
- cdbs/kde.mk: use LZMA compression unless DEB_NO_LZMA=1 or armel
- qt-kde-team/1/policy.mk: remove maintainer checking to fix FTBS when
maintainer is not Debian qt-kde team
- Add kubuntu-debhelper-langpack-generate.sh and clean scripts and call
them in kde.pm for .pot generation in pure Debhelper 7 packages
- Add python in dependencies
* Merge with Debian unstable, remaining changes:
- Set -DKDE_DISTRIBUTION_TEXT="Kubuntu packages"
- Add kubuntu/ files and edit debian/install
- debian-qt-kde.mk: include kubuntu.mk
- debian-qt-kde.mk: use LZMA compression unless DEB_NO_LZMA=1 or armel
- cdbs/kde.mk: include kubuntu.mk
- cdbs/kde.mk: use LZMA compression unless DEB_NO_LZMA=1 or armel
- qt-kde-team/1/policy.mk: remove maintainer checking to fix FTBS when
maintainer is not Debian qt-kde team
- Add kubuntu-debhelper-langpack-generate.sh and clean scripts and call
them in kde.pm for .pot generation in pure Debhelper 7 packages
- Add python in dependencies
- Add libdpkg-perl (>= 1.15.6~) in build-depends to pass tests
* Use the new dpkg-perl api in dh_sameversiondep as the required dpkg
version is in the archive.
* Add libwww-perl to build-deps and re-enable the tests.
* Add python to the dependencies as it is required by the msgsplit script.
* Add shebang line to kubuntu-debhelper-langpack-generate.sh and
kubuntu-debhelper-langpack-clean.sh.
* Remove executable flags from all files that don't need it.
* Merge with Debian unstable remaining changes:
- Use /usr/share/doc/kde/HTML for docs
- Set -DKDE_DISTRIBUTION_TEXT="Kubuntu packages"
- Add kubuntu/ files and edit debian/install
- debian-qt-kde.mk: include kubuntu.mk
- debian-qt-kde.mk: include quilt only if there are patches
- debian-qt-kde.mk: use LZMA compression unless DEB_NO_LZMA=1 or armel
- cdbs/kde.mk: include kubuntu.mk
- cdbs/kde.mk: use LZMA compression unless DEB_NO_LZMA=1 or armel
- qt-kde-team/1/policy.mk: remove maintainer checking to fix FTBS when
maintainer is not Debian qt-kde team
- Change docs path to /usr/share/doc/kde/ not /usr/share/doc/kde4/ in
debian-qt-kde.mk rules
- Add kubuntu-debhelper-langpack-generate.sh and clean scripts and call
them in kde.pm for .pot generation in pure Debhelper 7 packages
- Disable tests as a temporary workaround against FTBFS
* Use old dpkg-perl api for dh_sameversiondep since we don't have a newer
dpkg yet. Once it's uploaded this delta should be instantly dropped.
* Bump down the dpkg build-depends and breaks versions fof the above.
* Make dh7 only do pot creation/cleanup on packages other than *-l10n-*
* Update SVNREV in debian/rules to that of KDE 4.4.2
+ Instead of using the tag date, use the precise revision!
* Sync l10n scripts with 4.4.2
* Add syncing of l10n scritps with KDE SVN to debian/rules (syncl10n)
+ this can be invoked via make -f debian/rules syncl10n
+ sync scripts, to fix POT creation (LP: #529483)
* Manually merge kubuntu/findfiles + introduce merge history in the file
* Import current kubuntu/msgsplit from KDE SVN
* Import current kubuntu/extract-messages.sh from KDE SVN
* Also use LZMA compression for dh7 builds
* Merge with Debian unstable remaining changes:
- Use /usr/share/doc/kde/HTML for docs
- Set -DKDE_DISTRIBUTION_TEXT="Kubuntu packages"
- Add kubuntu/ files and edit debian/install
- debian-qt-kde.mk: include kubuntu.mk
- debian-qt-kde.mk: include quilt only if there are patches
- debian-qt-kde.mk: use LZMA compression unless DEB_NO_LZMA=1 or armel
- cdbs/kde.mk: include kubuntu.mk
- debhelper/kde.mk: include debhelper/kubuntu.mk
- kde.mk: use LZMA compression unless DEB_NO_LZMA=1 or armel
- qt-kde-team/1/policy.mk: remove maintainer checking to fix FTBS when
maintainer is not Debian qt-kde team
- Change docs path to /usr/share/doc/kde/ not /usr/share/doc/kde4/ in
debian-qt-kde.mk rules
- Add kubuntu-debhelper-langpack-generate.sh and clean scripts and call
them in kde.pm for .pot generation in pure Debhelper 7 packages
* When generating .desktop translation templates do not include
.pc directory made by Quilt
* Merge with Debian testing, remaining changes:
- Use /usr/share/doc/kde/HTML for docs
- Set -DKDE_DISTRIBUTION_TEXT="Kubuntu packages"
- Add kubuntu/ files and edit debian/install (dh_sameversiondeps removed now, unused)
- debian-qt-kde.mk: include kubuntu.mk
- debian-qt-kde.mk: include quilt only if there are patches
- debian-qt-kde.mk: use LZMA compression unless DEB_NO_LZMA=1 or armel
- cdbs/kde.mk: include kubuntu.mk
- debhelper/kde.mk: include debhelper/kubuntu.mk
- kde.mk: use LZMA compression unless DEB_NO_LZMA=1 or armel
- qt-kde-team/1/policy.mk: remove maintainer checking to fix FTBS when
maintainer is not Debian qt-kde team
- Change docs path to /usr/share/doc/kde/ not /usr/share/doc/kde4/ in
debian-qt-kde.mk rules
* Add kubuntu-debhelper-langpack-generate.sh and clean scripts and call
them in kde.pm for .pot generation in pure Debhelper 7 packages
* Change docs path to /usr/share/doc/kde/ not /usr/share/doc/kde4/ in
debian-qt-kde.mk rules
* Merge with Debian unstable, remaining changes:
- Use /usr/share/doc/kde/HTML for docs
- Set -DKDE_DISTRIBUTION_TEXT="Kubuntu packages"
- Add kubuntu/ files and edit debian/install (dh_sameversiondeps removed now, unused)
- debian-qt-kde.mk: include kubuntu.mk
- debian-qt-kde.mk: include quilt only if there are patches
- debian-qt-kde.mk: use LZMA compression unless DEB_NO_LZMA=1 or armel
- cdbs/kde.mk: include kubuntu.mk
- debhelper/kde.mk: include debhelper/kubuntu.mk
* kde.mk: use LZMA compression unless DEB_NO_LZMA=1 or armel
* qt-kde-team/1/policy.mk: remove maintainer checking to fix FTBS when
maintainer is not Debian qt-kde team
* Also add dh_clean to override
* Re-add dh_installdocs back to override rule
* Improvements to kubuntu/debhelper/kubuntu.mk from Fathi Boudra
* Add kubuntu/debhelper/kubuntu.mk
* Make makefiles/1/debhelper/kde.mk include it
* Add include /usr/lib/kubuntu-desktop-i18n/kubuntu.mk to
makefiles/1/debhelper/kde.mk
* qt-kde-team/1/policy.mk: remove maintainer checking to fix FTBS when
maintainer is not Debian qt-kde team
* Test build in Karmic PPA
* Drop Kubuntu's disabled cdbs/symbolshelper.mk as dpkg 1.15 is in karmic
* Merge from debian unstable, remaining changes:
- Add scripts for i18n in kubuntu/ directory
- variables.mk: /usr/share/doc/kde/HTML for docs path, Kubuntu packages
- kde.mk: include kubuntu.mk
- debian-qt-kde.mk: include kubuntu.mk
- debian-qt-kde.mk: include quilt only if there are patches
- debian-qt-kde.mk: use LZMA compression unless DEB_NO_LZMA=1 or armel
* Do not compress using LZMA on armel
* Separate .pot generation into kubuntu.mk and include it in
kde.mk and debian-qt-kde.mk
* Add playground-base to desktop-template-list for knetworkmanager
* Really add extract-xml.sh to pot creation
* Import extract-xml.sh from KDE SVN
* Add extract-xml.sh to the pot creation in kde.mk
* Compress packages with LZMA via DEB_DH_BUILDDEB_ARGS += -- -Zlzma if this
should cause any problems it is advisable to wrap it in some if $package =
$enabeled_packages. This can be deactivated by exporting DEB_NO_LZMA=1
* Add a KUBUNTU_NO_DELETE_POT variable for packages which moan if you delete their .pot file
* Applied magic from cdbs' kde4.mk to qt-kde-team/1/debian-qt-kde.mk so it
doesn't insist on quilt being installed
* Change docs path to /usr/share/doc/kde/HTML, this makes KDE 3 docs readable
in the help centre
* Don't call symbolshelper.mk from debian-qt-kde.mk and remove conflicts with
old dpkg
* Merge with Debian, remaining changes:
- Add scripts for i18n in kubuntu/ directory
- Add i18n code to kde.mk and variables.mk
* Update extract-messages.sh
* Refine desktop-template-list
* Add playground-sysadmin (kpackagekit) to pkg-kde-tools
* Add desktop-template-list with the list of .desktop file translation
templates we need for packages in main. Used by kde-l10n-xx to refresh
it's translations from upstream.
* Merge from debian unstable, remaining changes:
- Add extractrc and extractattr from kdesdk-scripts
- Replace kdesdk-scripts (<< 4:4.1.80-0ubuntu2), previous versions contain
the same scripts.
- Add dh_sameversiondeps and i18n scripts from kdesdk-scripts into
kubuntu/ directory, stops circular dependency on kdesdk-scripts.
- DKDE_DISTRIBUTION_TEXT="Kubuntu packages"
- DKDE_DEFAULT_HOME=.kde
- Add .pot generation to kde.mk for Launchpad
- Change debian-qt-kde.mk to just include the Kubuntu kde4.mk from CDBS so
KDE4 debian/rules from Debian will work in Kubuntu (Still need to look
at what of the debian-qt-kde.mk should get integrated into kde4.mk or if
Kubuntu should change to use debian-qt-kde.mk for Karmic and later)
* Add extractrc and extractattr from kdesdk-scripts
* Replace kdesdk-scripts (<< 4:4.1.80-0ubuntu2), previous versions contain
the same scripts.
* Add dh_sameversiondeps and i18n scripts from kdesdk-scripts into
kubuntu/ directory, stops circular dependency on kdesdk-scripts.
* Initial Kubuntu upload
-DKDE_DISTRIBUTION_TEXT="Kubuntu packages"
-DKDE_DEFAULT_HOME=.kde
* Add .pot generation to kde.mk for Launchpad
-----------------------------------------------------------------------
--
Debian Qt/KDE packaging tools
More information about the pkg-kde-commits
mailing list