Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

4 files changed, 9 insertions, 4 deletions

diff --git a/ubuntu/maverick/tdebase/debian/80ubuntu-xmodmap b/ubuntu/maverick/tdebase/debian/80ubuntu-xmodmap
index 27a318d73..7774dd9b8 100644
--- a/ubuntu/maverick/tdebase/debian/80ubuntu-xmodmap
+++ b/ubuntu/maverick/tdebase/debian/80ubuntu-xmodmap
@@ -2,11 +2,13 @@
 #
 # This file is sourced by Xsession(5), not executed.
 # The "|| true" is to ensure that the Xsession script does not terminate on error
-/usr/bin/xmodmap /usr/share/apps/kxkb/ubuntu.xmodmap || true
 
 USRMODMAP="$HOME/.Xmodmap"
 
 if [ -x /usr/bin/xmodmap ]; then
+        if [ -f /usr/share/apps/kxkb/ubuntu.xmodmap ]; then
+                /usr/bin/xmodmap /usr/share/apps/kxkb/ubuntu.xmodmap || true
+        fi
         if [ -f "$USRMODMAP" ]; then
                 /usr/bin/xmodmap "$USRMODMAP" || true
         fi
diff --git a/ubuntu/maverick/tdebase/debian/control b/ubuntu/maverick/tdebase/debian/control
index fededdb54..663827759 100644
--- a/ubuntu/maverick/tdebase/debian/control
+++ b/ubuntu/maverick/tdebase/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs4c2a-trinity, libogg-dev, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libdbus-1-tqt-dev, libart-2.0-dev (>= 2.3.17), libtool, libltdl-dev, cmake
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs4c2a-trinity, libogg-dev, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libdbus-1-tqt-dev, libart-2.0-dev (>= 2.3.17), libtool, libltdl-dev, binutils-dev, cmake
 Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc
 Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
 Standards-Version: 3.8.4
diff --git a/ubuntu/maverick/tdebase/debian/rules b/ubuntu/maverick/tdebase/debian/rules
index 1ddae9c58..a1e9c65f7 100755
--- a/ubuntu/maverick/tdebase/debian/rules
+++ b/ubuntu/maverick/tdebase/debian/rules
@@ -34,6 +34,9 @@ DEB_FIXPERMS_EXCLUDE := \
 
 DEB_DH_STRIP_ARGS  := --dbg-package=tdebase-trinity-dbg
 
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
+
 DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter tdesu knetattach kioslave kxkb kdebugdialog kdcop
 
 PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity tdebase-trinity-bin kicker-trinity konqueror-trinity ksplash-trinity \
diff --git a/ubuntu/maverick/tdebase/debian/source/options b/ubuntu/maverick/tdebase/debian/source/options
index 9d7c8e036..72f1f5450 100644
--- a/ubuntu/maverick/tdebase/debian/source/options
+++ b/ubuntu/maverick/tdebase/debian/source/options
@@ -1,5 +1,5 @@
-# Use bzip2 instead of gzip
-compression = "bzip2"
+# Use xz instead of gzip
+compression = "xz"
 compression-level = 9
 
 # Don't run differences