diff options
Diffstat (limited to 'debian')
815 files changed, 5251 insertions, 931 deletions
diff --git a/debian/lenny/applications/abakus/debian/rules b/debian/lenny/applications/abakus/debian/rules index d0a475105..c856f7cae 100755 --- a/debian/lenny/applications/abakus/debian/rules +++ b/debian/lenny/applications/abakus/debian/rules @@ -22,6 +22,9 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS - DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. DEB_BUILD_PARALLEL = true diff --git a/debian/lenny/applications/adept/debian/rules b/debian/lenny/applications/adept/debian/rules index ee86e8e4f..742307eb6 100755 --- a/debian/lenny/applications/adept/debian/rules +++ b/debian/lenny/applications/adept/debian/rules @@ -14,6 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_MAKE_CHECK_TARGET := check DEB_CONFIGURE_EXTRA_FLAGS += --enable-adept --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # Enable us to locate the old libept-trinity library and includes CPPFLAGS += -I/opt/trinity/include LDFLAGS += -L/opt/trinity/lib -lept diff --git a/debian/lenny/applications/amarok/debian/rules b/debian/lenny/applications/amarok/debian/rules index deb43ebf7..77b0e3159 100755 --- a/debian/lenny/applications/amarok/debian/rules +++ b/debian/lenny/applications/amarok/debian/rules @@ -12,6 +12,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + ### VARIABLES # Exempt amarok engines from being handled as proper public libraries # by dh_makeshlibs diff --git a/debian/lenny/applications/basket/debian/rules b/debian/lenny/applications/basket/debian/rules index 46b74ab7e..d3cf5255e 100755 --- a/debian/lenny/applications/basket/debian/rules +++ b/debian/lenny/applications/basket/debian/rules @@ -10,6 +10,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -101,7 +104,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/lenny/applications/bibletime/debian/rules b/debian/lenny/applications/bibletime/debian/rules index ea4b62326..4106bf0f4 100755 --- a/debian/lenny/applications/bibletime/debian/rules +++ b/debian/lenny/applications/bibletime/debian/rules @@ -19,6 +19,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + binary-install/bibletime-trinity:: chmod 644 debian/bibletime-trinity/opt/trinity/share/apps/bibletime/pics/* chmod 644 debian/bibletime-trinity/opt/trinity/share/apps/bibletime/bibletimeui.rc diff --git a/debian/lenny/applications/compizconfig-backend-kconfig/debian/rules b/debian/lenny/applications/compizconfig-backend-kconfig/debian/rules index c5dd59ccb..85efaa2fa 100755 --- a/debian/lenny/applications/compizconfig-backend-kconfig/debian/rules +++ b/debian/lenny/applications/compizconfig-backend-kconfig/debian/rules @@ -13,6 +13,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/lenny/applications/desktop-effects-tde/debian/rules b/debian/lenny/applications/desktop-effects-tde/debian/rules index 7bf3e3306..d494616db 100755 --- a/debian/lenny/applications/desktop-effects-tde/debian/rules +++ b/debian/lenny/applications/desktop-effects-tde/debian/rules @@ -9,5 +9,8 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + binary-install/desktop-effects-tde-trinity:: dh_pycentral -pdesktop-effects-tde-trinity diff --git a/debian/lenny/applications/digikam/debian/rules b/debian/lenny/applications/digikam/debian/rules index 4edd6e763..76fa321bc 100755 --- a/debian/lenny/applications/digikam/debian/rules +++ b/debian/lenny/applications/digikam/debian/rules @@ -15,6 +15,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine TARBALL_EXT=tar.bz2 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_CONFIGURE_EXTRA_FLAGS := --without-included-sqlite3 --prefix=/opt/trinity --disable-static DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" diff --git a/debian/lenny/applications/dolphin/debian/rules b/debian/lenny/applications/dolphin/debian/rules index 1534d2f29..66ea98891 100755 --- a/debian/lenny/applications/dolphin/debian/rules +++ b/debian/lenny/applications/dolphin/debian/rules @@ -18,6 +18,9 @@ include debian/cdbs/debian-qt-kde.mk DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + binary-install/dolphin-trinity:: mkdir -p debian/dolphin-trinity/opt/trinity/bin ln -s d3lphin debian/dolphin-trinity/opt/trinity/bin/dolphin diff --git a/debian/lenny/applications/filelight-l10n/debian/rules b/debian/lenny/applications/filelight-l10n/debian/rules index 9255102ce..84a2f4975 100755 --- a/debian/lenny/applications/filelight-l10n/debian/rules +++ b/debian/lenny/applications/filelight-l10n/debian/rules @@ -19,6 +19,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/usr/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/lenny/applications/filelight/debian/rules b/debian/lenny/applications/filelight/debian/rules index 247e26b9d..efa61f0f7 100755 --- a/debian/lenny/applications/filelight/debian/rules +++ b/debian/lenny/applications/filelight/debian/rules @@ -20,6 +20,9 @@ DEB_DH_ALWAYS_EXCLUDE=.svn DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --disable-debug +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/lenny/applications/fusion-icon/debian/rules b/debian/lenny/applications/fusion-icon/debian/rules index 5d3ed1e14..8c79610db 100755 --- a/debian/lenny/applications/fusion-icon/debian/rules +++ b/debian/lenny/applications/fusion-icon/debian/rules @@ -7,6 +7,9 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/python-distutils-custom.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + binary-install/fusion-icon-trinity:: mkdir -p debian/fusion-icon-trinity/usr/local/lib cp -Rp debian/fusion-icon-trinity/usr/local/* debian/fusion-icon-trinity/usr/ diff --git a/debian/lenny/applications/gtk-qt-engine/debian/rules b/debian/lenny/applications/gtk-qt-engine/debian/rules index 20c8468ec..8c78b986c 100755 --- a/debian/lenny/applications/gtk-qt-engine/debian/rules +++ b/debian/lenny/applications/gtk-qt-engine/debian/rules @@ -27,6 +27,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + binary-install/gtk-qt-engine-trinity:: mkdir -p $(CURDIR)/debian/gtk-qt-engine-trinity/opt/trinity/share/kgtk/ cp -Rp $(CURDIR)/debian/.gtkrc-2.0-kde4 $(CURDIR)/debian/gtk-qt-engine-trinity/opt/trinity/share/kgtk/ diff --git a/debian/lenny/applications/gtk3-tqt-engine/debian/rules b/debian/lenny/applications/gtk3-tqt-engine/debian/rules index 242fb2c84..9bed17b05 100755 --- a/debian/lenny/applications/gtk3-tqt-engine/debian/rules +++ b/debian/lenny/applications/gtk3-tqt-engine/debian/rules @@ -11,6 +11,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/lenny/applications/gwenview-i18n/debian/rules b/debian/lenny/applications/gwenview-i18n/debian/rules index ef4e97ec1..3070a9c9d 100755 --- a/debian/lenny/applications/gwenview-i18n/debian/rules +++ b/debian/lenny/applications/gwenview-i18n/debian/rules @@ -9,6 +9,9 @@ include /usr/share/cdbs/1/rules/utils.mk -include debian/debiandirs +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_INSTALL_DOCS_ALL := DOC_LANGS = da de et fr it nl pl pt ru sv pt_BR diff --git a/debian/lenny/applications/gwenview/debian/rules b/debian/lenny/applications/gwenview/debian/rules index 447938cef..d6423c512 100755 --- a/debian/lenny/applications/gwenview/debian/rules +++ b/debian/lenny/applications/gwenview/debian/rules @@ -18,6 +18,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := --enable-kipi --enable-final --prefix=/opt/trinity DEB_INSTALL_DOCS_ALL := DEB_INSTALL_CHANGELOGS_ALL := NEWS +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_DH_MAKESHLIBS_ARGS_ALL := -V DEB_SHLIBDEPS_INCLUDE = debian/gwenview-trinity/opt/trinity/lib diff --git a/debian/lenny/applications/k3b-i18n/debian/rules b/debian/lenny/applications/k3b-i18n/debian/rules index 2048362b9..1e6d35926 100755 --- a/debian/lenny/applications/k3b-i18n/debian/rules +++ b/debian/lenny/applications/k3b-i18n/debian/rules @@ -15,6 +15,9 @@ DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_INFODIR := /opt/trinity/share/info +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -102,7 +105,7 @@ binary-indep: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb -- -Z bzip2 + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture-dependent files here. binary-arch: build install diff --git a/debian/lenny/applications/k3b-i18n/debian/source/options b/debian/lenny/applications/k3b-i18n/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/lenny/applications/k3b-i18n/debian/source/options +++ b/debian/lenny/applications/k3b-i18n/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 diff --git a/debian/lenny/applications/k3b/debian/control b/debian/lenny/applications/k3b/debian/control index 20733a1f0..d15a1e0fe 100644 --- a/debian/lenny/applications/k3b/debian/control +++ b/debian/lenny/applications/k3b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Francois Marier <francois@debian.org>, Fathi Boudra <fabo@debian.org> -Build-Depends: libdvdread4, libdvdread-dev, alsa, libasound2-dev, lame, libmp3lame-dev, debhelper (>= 6), cdbs (>= 0.4.52ubuntu18), tdelibs4-trinity-dev (>= 3.5.0), libflac++-dev (>= 1.1.2), flac, libdbus-tqt-1-dev, libhal-dev (>= 0.5.5.1), libhal-storage-dev (>= 0.5.5.1), libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmusicbrainz4-dev (>= 2.1.1-4.1), libmad0-dev, chrpath, libavformat-dev, libavcodec-dev, libvorbis-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: libdvdread4, libdvdread-dev, alsa, libasound2-dev, lame, libmp3lame-dev, debhelper (>= 6), cdbs (>= 0.4.52ubuntu18), tdelibs4-trinity-dev (>= 3.5.0), libflac++-dev (>= 1.1.2), flac, libdbus-tqt-1-dev, libhal-dev (>= 0.5.5.1), libhal-storage-dev (>= 0.5.5.1), libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmad0-dev, chrpath, libavformat-dev, libavcodec-dev, libvorbis-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://www.k3b.org diff --git a/debian/lenny/applications/k3b/debian/rules b/debian/lenny/applications/k3b/debian/rules index 3a19a0ec8..cc895cd83 100755 --- a/debian/lenny/applications/k3b/debian/rules +++ b/debian/lenny/applications/k3b/debian/rules @@ -17,6 +17,9 @@ DEB_INSTALL_MANPAGES_k3b = debian/k3b.1 DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/tmp/ +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/lenny/applications/k9copy/debian/rules b/debian/lenny/applications/k9copy/debian/rules index 0887c2d07..5f97b6de2 100755 --- a/debian/lenny/applications/k9copy/debian/rules +++ b/debian/lenny/applications/k9copy/debian/rules @@ -15,6 +15,9 @@ DEB_INSTALL_MANPAGES_k9copy = k9copy-trinity.1 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/lenny/applications/kaffeine-mozilla/debian/rules b/debian/lenny/applications/kaffeine-mozilla/debian/rules index 80fe9807b..c04c761e2 100755 --- a/debian/lenny/applications/kaffeine-mozilla/debian/rules +++ b/debian/lenny/applications/kaffeine-mozilla/debian/rules @@ -14,6 +14,9 @@ export DH_OPTIONS DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity @@ -177,7 +180,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/lenny/applications/kaffeine/debian/rules b/debian/lenny/applications/kaffeine/debian/rules index 7791988e7..9021f8fb0 100755 --- a/debian/lenny/applications/kaffeine/debian/rules +++ b/debian/lenny/applications/kaffeine/debian/rules @@ -17,6 +17,9 @@ DEB_INSTALL_MANPAGES_kaffeine-trinity := debian/kaffeine.1 DEB_FIXPERMS_EXCLUDE := install-css.sh install-codecs +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/lenny/applications/katapult/debian/rules b/debian/lenny/applications/katapult/debian/rules index 6340f855d..779671876 100755 --- a/debian/lenny/applications/katapult/debian/rules +++ b/debian/lenny/applications/katapult/debian/rules @@ -14,6 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine export KUBUNTU_DESKTOP_POT=extragear-utils_katapult DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + cleanbuilddir/katapult-trinity:: rm -f katapult.1 diff --git a/debian/lenny/applications/kbarcode/debian/rules b/debian/lenny/applications/kbarcode/debian/rules index b8267f39c..cdbae3c90 100755 --- a/debian/lenny/applications/kbarcode/debian/rules +++ b/debian/lenny/applications/kbarcode/debian/rules @@ -16,6 +16,9 @@ DEB_INSTALL_MANPAGES_kbarcode-trinity := debian/kbarcode.1 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/lenny/applications/kbfx/debian/rules b/debian/lenny/applications/kbfx/debian/rules index 2bffe9b78..97b64d997 100755 --- a/debian/lenny/applications/kbfx/debian/rules +++ b/debian/lenny/applications/kbfx/debian/rules @@ -24,6 +24,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CMAKE_EXTRA_FLAGS = -DLIB_SUFFIX="" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DCMAKE_INSTALL_PREFIX="/opt/trinity/" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + get-orig-source: @@dh_testdir @@[ -d ../tarballs/. ] @@ -74,6 +77,6 @@ binary-arch: build dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch diff --git a/debian/lenny/applications/kbookreader/debian/rules b/debian/lenny/applications/kbookreader/debian/rules index 6f4a82d1b..53794c4fe 100755 --- a/debian/lenny/applications/kbookreader/debian/rules +++ b/debian/lenny/applications/kbookreader/debian/rules @@ -13,6 +13,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/lenny/applications/kchmviewer/debian/rules b/debian/lenny/applications/kchmviewer/debian/rules index a496effa9..c22afc5a3 100755 --- a/debian/lenny/applications/kchmviewer/debian/rules +++ b/debian/lenny/applications/kchmviewer/debian/rules @@ -16,6 +16,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -114,7 +117,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/lenny/applications/kcmautostart/debian/rules b/debian/lenny/applications/kcmautostart/debian/rules index 242fb2c84..9bed17b05 100644..100755 --- a/debian/lenny/applications/kcmautostart/debian/rules +++ b/debian/lenny/applications/kcmautostart/debian/rules @@ -11,6 +11,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/lenny/applications/kcmldap/debian/changelog b/debian/lenny/applications/kcmldap/debian/changelog new file mode 100644 index 000000000..a47452e9c --- /dev/null +++ b/debian/lenny/applications/kcmldap/debian/changelog @@ -0,0 +1,5 @@ +kcontrol-ldapbonding-trinity (0.5-0ubuntu0) karmic; urgency=low + + * Karmic rebuild + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 02 July 2009 16:08:00 -0600 diff --git a/debian/lenny/applications/kcmldap/debian/compat b/debian/lenny/applications/kcmldap/debian/compat new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/debian/lenny/applications/kcmldap/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/lenny/applications/kcmldap/debian/control b/debian/lenny/applications/kcmldap/debian/control new file mode 100644 index 000000000..de711caf1 --- /dev/null +++ b/debian/lenny/applications/kcmldap/debian/control @@ -0,0 +1,13 @@ +Source: kcontrol-ldapbonding-trinity +Section: tde +Priority: optional +Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +XSBC-Original-Maintainer: Raphaël Pinson <raphink@raphink.net> +Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, libtdeldap-trinity-dev, automake, autoconf, libtool, libltdl-dev +Standards-Version: 3.8.4 + +Package: kcontrol-ldapbonding-trinity +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, libpam-krb5, libpam-ldap, nss-updatedb, libpam-ccreds +Description: LDAP control module for the TDE control center + LDAP is a TDE control center module to manage TDE connections to LDAP realms. diff --git a/debian/lenny/applications/kcmldap/debian/copyright b/debian/lenny/applications/kcmldap/debian/copyright new file mode 100644 index 000000000..540709e87 --- /dev/null +++ b/debian/lenny/applications/kcmldap/debian/copyright @@ -0,0 +1,31 @@ +This package was debianized by Timothy Pearson <kb9vqf@pearsoncomputing.net> on +Thu, 17 May 2012 19:52:51 +0100. + +It was downloaded from http://www.trinitydesktop.org + +Upstream Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> + +copyright (C) 2012 Timothy Pearson <kb9vqf@pearsoncomputing.net> + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +The Debian packaging is (C) 2012, Timothy Pearson <kb9vqf@pearsoncomputing.net> and +is licensed under the GPL, see above. + diff --git a/debian/lenny/applications/kcmldap/debian/rules b/debian/lenny/applications/kcmldap/debian/rules new file mode 100755 index 000000000..9bed17b05 --- /dev/null +++ b/debian/lenny/applications/kcmldap/debian/rules @@ -0,0 +1,27 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/debhelper.mk + +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde +DEB_CONFIGURE_MANDIR := /opt/trinity/share/man +DEB_CONFIGURE_PREFIX := /opt/trinity +DEB_CONFIGURE_INFODIR := /opt/trinity/share/info + +cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + +post-patches:: debian/stamp-bootstrap + +debian/stamp-bootstrap: + ! [ -f /usr/share/libtool/ltmain.sh ] || \ + cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh + ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ + cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh + cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in + + make -f admin/Makefile.common cvs + touch debian/stamp-bootstrap diff --git a/debian/lenny/applications/kcmldapcontroller/debian/changelog b/debian/lenny/applications/kcmldapcontroller/debian/changelog new file mode 100644 index 000000000..5ab6125c1 --- /dev/null +++ b/debian/lenny/applications/kcmldapcontroller/debian/changelog @@ -0,0 +1,5 @@ +kcontrol-ldap-controller-trinity (0.5-0ubuntu0) karmic; urgency=low + + * Karmic rebuild + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 02 July 2009 16:08:00 -0600 diff --git a/debian/lenny/applications/kcmldapcontroller/debian/compat b/debian/lenny/applications/kcmldapcontroller/debian/compat new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/debian/lenny/applications/kcmldapcontroller/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/lenny/applications/kcmldapcontroller/debian/control b/debian/lenny/applications/kcmldapcontroller/debian/control new file mode 100644 index 000000000..7cbb384bc --- /dev/null +++ b/debian/lenny/applications/kcmldapcontroller/debian/control @@ -0,0 +1,12 @@ +Source: kcontrol-ldap-controller-trinity +Section: tde +Priority: optional +Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, libldap2-dev, libtdeldap-trinity-dev, automake, autoconf, libtool, libltdl-dev +Standards-Version: 3.8.4 + +Package: kcontrol-ldap-controller-trinity +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, heimdal-kdc, slapd, libsasl2-modules-gssapi-heimdal, sasl2-bin, openssl +Description: LDAP realm controller module for the TDE control center + LDAP Controller is a TDE control center module to configure an LDAP Realm Controller diff --git a/debian/lenny/applications/kcmldapcontroller/debian/copyright b/debian/lenny/applications/kcmldapcontroller/debian/copyright new file mode 100644 index 000000000..540709e87 --- /dev/null +++ b/debian/lenny/applications/kcmldapcontroller/debian/copyright @@ -0,0 +1,31 @@ +This package was debianized by Timothy Pearson <kb9vqf@pearsoncomputing.net> on +Thu, 17 May 2012 19:52:51 +0100. + +It was downloaded from http://www.trinitydesktop.org + +Upstream Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> + +copyright (C) 2012 Timothy Pearson <kb9vqf@pearsoncomputing.net> + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +The Debian packaging is (C) 2012, Timothy Pearson <kb9vqf@pearsoncomputing.net> and +is licensed under the GPL, see above. + diff --git a/debian/lenny/applications/kcmldapcontroller/debian/rules b/debian/lenny/applications/kcmldapcontroller/debian/rules new file mode 100755 index 000000000..9bed17b05 --- /dev/null +++ b/debian/lenny/applications/kcmldapcontroller/debian/rules @@ -0,0 +1,27 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/debhelper.mk + +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde +DEB_CONFIGURE_MANDIR := /opt/trinity/share/man +DEB_CONFIGURE_PREFIX := /opt/trinity +DEB_CONFIGURE_INFODIR := /opt/trinity/share/info + +cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + +post-patches:: debian/stamp-bootstrap + +debian/stamp-bootstrap: + ! [ -f /usr/share/libtool/ltmain.sh ] || \ + cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh + ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ + cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh + cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in + + make -f admin/Makefile.common cvs + touch debian/stamp-bootstrap diff --git a/debian/lenny/applications/kcmldapmanager/debian/changelog b/debian/lenny/applications/kcmldapmanager/debian/changelog new file mode 100644 index 000000000..b73c248b8 --- /dev/null +++ b/debian/lenny/applications/kcmldapmanager/debian/changelog @@ -0,0 +1,5 @@ +kcontrol-ldap-manager-trinity (0.5-0ubuntu0) karmic; urgency=low + + * Karmic rebuild + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 02 July 2009 16:08:00 -0600 diff --git a/debian/lenny/applications/kcmldapmanager/debian/compat b/debian/lenny/applications/kcmldapmanager/debian/compat new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/debian/lenny/applications/kcmldapmanager/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/lenny/applications/kcmldapmanager/debian/control b/debian/lenny/applications/kcmldapmanager/debian/control new file mode 100644 index 000000000..b84e5e4c3 --- /dev/null +++ b/debian/lenny/applications/kcmldapmanager/debian/control @@ -0,0 +1,12 @@ +Source: kcontrol-ldap-manager-trinity +Section: tde +Priority: optional +Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, libldap2-dev, libtdeldap-trinity-dev, automake, autoconf, libtool, libltdl-dev +Standards-Version: 3.8.4 + +Package: kcontrol-ldap-manager-trinity +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients +Description: LDAP realm management module for the TDE control center + LDAP Manager is a TDE control center module to manage users, groups, and machines in LDAP realms. diff --git a/debian/lenny/applications/kcmldapmanager/debian/copyright b/debian/lenny/applications/kcmldapmanager/debian/copyright new file mode 100644 index 000000000..540709e87 --- /dev/null +++ b/debian/lenny/applications/kcmldapmanager/debian/copyright @@ -0,0 +1,31 @@ +This package was debianized by Timothy Pearson <kb9vqf@pearsoncomputing.net> on +Thu, 17 May 2012 19:52:51 +0100. + +It was downloaded from http://www.trinitydesktop.org + +Upstream Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> + +copyright (C) 2012 Timothy Pearson <kb9vqf@pearsoncomputing.net> + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +The Debian packaging is (C) 2012, Timothy Pearson <kb9vqf@pearsoncomputing.net> and +is licensed under the GPL, see above. + diff --git a/debian/lenny/applications/kcmldapmanager/debian/rules b/debian/lenny/applications/kcmldapmanager/debian/rules new file mode 100755 index 000000000..9bed17b05 --- /dev/null +++ b/debian/lenny/applications/kcmldapmanager/debian/rules @@ -0,0 +1,27 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/debhelper.mk + +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde +DEB_CONFIGURE_MANDIR := /opt/trinity/share/man +DEB_CONFIGURE_PREFIX := /opt/trinity +DEB_CONFIGURE_INFODIR := /opt/trinity/share/info + +cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + +post-patches:: debian/stamp-bootstrap + +debian/stamp-bootstrap: + ! [ -f /usr/share/libtool/ltmain.sh ] || \ + cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh + ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ + cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh + cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in + + make -f admin/Makefile.common cvs + touch debian/stamp-bootstrap diff --git a/debian/lenny/applications/kcpuload/debian/rules b/debian/lenny/applications/kcpuload/debian/rules index e13398f63..20eca167c 100755 --- a/debian/lenny/applications/kcpuload/debian/rules +++ b/debian/lenny/applications/kcpuload/debian/rules @@ -12,6 +12,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # This has to be exported to make some magic below work. export DH_OPTIONS @@ -184,7 +187,7 @@ binary-common: dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture independant packages using the common target. binary-indep: build install diff --git a/debian/lenny/applications/kdbusnotification/debian/rules b/debian/lenny/applications/kdbusnotification/debian/rules index 2acd9ab0f..94d0ad5bd 100755 --- a/debian/lenny/applications/kdbusnotification/debian/rules +++ b/debian/lenny/applications/kdbusnotification/debian/rules @@ -12,6 +12,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # This has to be exported to make some magic below work. export DH_OPTIONS @@ -173,7 +176,7 @@ binary-common: dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture independant packages using the common target. binary-indep: build install diff --git a/debian/lenny/applications/kdiff3/debian/rules b/debian/lenny/applications/kdiff3/debian/rules index bc64fcc06..19ea44a07 100755 --- a/debian/lenny/applications/kdiff3/debian/rules +++ b/debian/lenny/applications/kdiff3/debian/rules @@ -11,6 +11,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -97,7 +100,7 @@ binary-indep: build install dh_installdeb -i dh_gencontrol -i dh_md5sums -i - dh_builddeb -i + dh_builddeb -i $(DEB_DH_BUILDDEB_ARGS) # Build architecture-dependent files here. binary-arch: build install @@ -118,7 +121,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/lenny/applications/kdirstat/debian/rules b/debian/lenny/applications/kdirstat/debian/rules index b15f5a9a5..8c0a950a3 100755 --- a/debian/lenny/applications/kdirstat/debian/rules +++ b/debian/lenny/applications/kdirstat/debian/rules @@ -13,6 +13,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + LDFLAGS += -Wl,--as-needed post-patches:: debian/stamp-bootstrap diff --git a/debian/lenny/applications/kdpkg/debian/rules b/debian/lenny/applications/kdpkg/debian/rules index ff163f6a7..455414f69 100755 --- a/debian/lenny/applications/kdpkg/debian/rules +++ b/debian/lenny/applications/kdpkg/debian/rules @@ -11,6 +11,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/lenny/applications/keep/debian/rules b/debian/lenny/applications/keep/debian/rules index b6eae04ee..1b5054df6 100755 --- a/debian/lenny/applications/keep/debian/rules +++ b/debian/lenny/applications/keep/debian/rules @@ -16,6 +16,9 @@ DEB_INSTALL_MANPAGES_keep := keep.1 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/lenny/applications/kerberostray/debian/rules b/debian/lenny/applications/kerberostray/debian/rules index 242fb2c84..9bed17b05 100755 --- a/debian/lenny/applications/kerberostray/debian/rules +++ b/debian/lenny/applications/kerberostray/debian/rules @@ -11,6 +11,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/lenny/applications/kerry/debian/rules b/debian/lenny/applications/kerry/debian/rules index 7dc0fbe23..dea466c17 100755 --- a/debian/lenny/applications/kerry/debian/rules +++ b/debian/lenny/applications/kerry/debian/rules @@ -16,6 +16,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit DEB_INSTALL_MANPAGES_kerry-trinity = kerry.1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + build/kerry-trinity:: docbook2x-man debian/kerry.1.docbook diff --git a/debian/lenny/applications/kgtk-qt3/debian/rules b/debian/lenny/applications/kgtk-qt3/debian/rules index 15ab99eb2..b4cb7a953 100755 --- a/debian/lenny/applications/kgtk-qt3/debian/rules +++ b/debian/lenny/applications/kgtk-qt3/debian/rules @@ -22,6 +22,9 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS - DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. DEB_BUILD_PARALLEL = true diff --git a/debian/lenny/applications/kile/debian/rules b/debian/lenny/applications/kile/debian/rules index 3e19a08ea..d7f547296 100755 --- a/debian/lenny/applications/kile/debian/rules +++ b/debian/lenny/applications/kile/debian/rules @@ -17,6 +17,9 @@ DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp DEB_INSTALL_MANPAGES_kile := debian/kile.1 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/lenny/applications/kima/debian/rules b/debian/lenny/applications/kima/debian/rules index 519575104..45e052b96 100755 --- a/debian/lenny/applications/kima/debian/rules +++ b/debian/lenny/applications/kima/debian/rules @@ -11,6 +11,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # Add here any variable or target overrides you need. post-patches:: debian/stamp-bootstrap diff --git a/debian/lenny/applications/kio-apt/debian/rules b/debian/lenny/applications/kio-apt/debian/rules index 9b82c21ad..93f63f8ee 100755 --- a/debian/lenny/applications/kio-apt/debian/rules +++ b/debian/lenny/applications/kio-apt/debian/rules @@ -14,6 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/lenny/applications/kio-locate/debian/rules b/debian/lenny/applications/kio-locate/debian/rules index 7a837110e..ecf59da08 100755 --- a/debian/lenny/applications/kio-locate/debian/rules +++ b/debian/lenny/applications/kio-locate/debian/rules @@ -22,6 +22,9 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS - DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. DEB_BUILD_PARALLEL = true diff --git a/debian/lenny/applications/kio-umountwrapper/debian/rules b/debian/lenny/applications/kio-umountwrapper/debian/rules index ae8903f41..6672eae5b 100755 --- a/debian/lenny/applications/kio-umountwrapper/debian/rules +++ b/debian/lenny/applications/kio-umountwrapper/debian/rules @@ -13,6 +13,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/lenny/applications/kiosktool/debian/rules b/debian/lenny/applications/kiosktool/debian/rules index 4e38353a1..507e5a458 100755 --- a/debian/lenny/applications/kiosktool/debian/rules +++ b/debian/lenny/applications/kiosktool/debian/rules @@ -11,6 +11,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/lenny/applications/kmplayer/debian/rules b/debian/lenny/applications/kmplayer/debian/rules index 63bf848d1..166ca76e2 100755 --- a/debian/lenny/applications/kmplayer/debian/rules +++ b/debian/lenny/applications/kmplayer/debian/rules @@ -22,6 +22,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := --enable-maintainer-mode --prefix=/opt/trinity --wi DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp DEB_INSTALL_MANPAGES_kmplayer = kmplayer.1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/lenny/applications/kmyfirewall/debian/rules b/debian/lenny/applications/kmyfirewall/debian/rules index 8fa664c8a..28035c796 100755 --- a/debian/lenny/applications/kmyfirewall/debian/rules +++ b/debian/lenny/applications/kmyfirewall/debian/rules @@ -13,6 +13,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -126,7 +129,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/lenny/applications/kmymoney/debian/rules b/debian/lenny/applications/kmymoney/debian/rules index 192c6019c..4c3b55cb4 100755 --- a/debian/lenny/applications/kmymoney/debian/rules +++ b/debian/lenny/applications/kmymoney/debian/rules @@ -13,6 +13,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde --disable-sqlite3 --disable-pdf-docs +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + LDFLAGS += -Wl,--as-needed post-patches:: debian/stamp-bootstrap diff --git a/debian/lenny/applications/knemo/debian/rules b/debian/lenny/applications/knemo/debian/rules index fd71fe17f..4fb03f005 100755 --- a/debian/lenny/applications/knemo/debian/rules +++ b/debian/lenny/applications/knemo/debian/rules @@ -15,6 +15,9 @@ DEB_INSTALL_DOCS_knemo = -XNEWS DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/lenny/applications/knetload/debian/rules b/debian/lenny/applications/knetload/debian/rules index f5784f7ae..d955fbe4a 100755 --- a/debian/lenny/applications/knetload/debian/rules +++ b/debian/lenny/applications/knetload/debian/rules @@ -9,6 +9,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -178,7 +181,7 @@ binary-common: dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture independant packages using the common target. binary-indep: build install diff --git a/debian/lenny/applications/knetstats/debian/rules b/debian/lenny/applications/knetstats/debian/rules index 7b1522933..1a573fb20 100755 --- a/debian/lenny/applications/knetstats/debian/rules +++ b/debian/lenny/applications/knetstats/debian/rules @@ -13,6 +13,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_MANPAGES_knetstats-trinity = knetstats.1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/lenny/applications/knetworkmanager8/debian/rules b/debian/lenny/applications/knetworkmanager8/debian/rules index a4ba9688c..9c7e598e1 100755 --- a/debian/lenny/applications/knetworkmanager8/debian/rules +++ b/debian/lenny/applications/knetworkmanager8/debian/rules @@ -15,6 +15,9 @@ DEB_INSTALL_DOCS_ALL := -XNEWS -XTODO DEB_CONFIGURE_EXTRA_FLAGS := --with-openvpn --with-vpnc --with-pptp +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/lenny/applications/knetworkmanager9/debian/rules b/debian/lenny/applications/knetworkmanager9/debian/rules index c9fa2b866..00ac9877f 100755 --- a/debian/lenny/applications/knetworkmanager9/debian/rules +++ b/debian/lenny/applications/knetworkmanager9/debian/rules @@ -20,6 +20,9 @@ DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" - DEB_INSTALL_DOCS_ALL := -XNEWS -XTODO +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + binary-install/network-manager-kde-trinity:: # Install autostart file install -D -m 644 tdenetworkmanager-0.8/src/tdenetworkmanager.desktop \ diff --git a/debian/lenny/applications/knetworkmanager9/debian/source/options b/debian/lenny/applications/knetworkmanager9/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/lenny/applications/knetworkmanager9/debian/source/options +++ b/debian/lenny/applications/knetworkmanager9/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 diff --git a/debian/lenny/applications/knights/debian/rules b/debian/lenny/applications/knights/debian/rules index ab81cb6e3..f4f406c79 100755 --- a/debian/lenny/applications/knights/debian/rules +++ b/debian/lenny/applications/knights/debian/rules @@ -13,6 +13,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -107,7 +110,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/lenny/applications/knowit/debian/rules b/debian/lenny/applications/knowit/debian/rules index 3ed456df4..0a090fdb6 100755 --- a/debian/lenny/applications/knowit/debian/rules +++ b/debian/lenny/applications/knowit/debian/rules @@ -14,6 +14,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -95,7 +98,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/lenny/applications/knutclient/debian/rules b/debian/lenny/applications/knutclient/debian/rules index ad89a9108..0d07992cf 100755 --- a/debian/lenny/applications/knutclient/debian/rules +++ b/debian/lenny/applications/knutclient/debian/rules @@ -18,6 +18,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -127,7 +130,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/lenny/applications/koffice-i18n/debian/rules b/debian/lenny/applications/koffice-i18n/debian/rules index 9bb59484f..478c97b9d 100755 --- a/debian/lenny/applications/koffice-i18n/debian/rules +++ b/debian/lenny/applications/koffice-i18n/debian/rules @@ -3,6 +3,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + languages = `ls -1d *i18n*` build-stamp: @@ -81,7 +84,7 @@ binary-indep: build dh_installdeb dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep diff --git a/debian/lenny/applications/koffice/debian/rules b/debian/lenny/applications/koffice/debian/rules index b166e12e4..ed91a11c3 100755 --- a/debian/lenny/applications/koffice/debian/rules +++ b/debian/lenny/applications/koffice/debian/rules @@ -17,6 +17,9 @@ DEB_KDE_APIDOX := no DEB_DH_STRIP_ARGS := --dbg-package=koffice-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := karbon-trinity kchart-trinity kivio-trinity koffice-libs-trinity chalk-trinity kspread-trinity kugar-trinity kthesaurus-trinity DEB_INSTALL_CHANGELOGS_karbon-trinity := karbon/CHANGES diff --git a/debian/lenny/applications/konversation/debian/rules b/debian/lenny/applications/konversation/debian/rules index 359d5f809..0e973a150 100755 --- a/debian/lenny/applications/konversation/debian/rules +++ b/debian/lenny/applications/konversation/debian/rules @@ -15,6 +15,9 @@ DEB_DH_STRIP_ARGS := --dbg-package=konversation-trinity-dbg DEB_INSTALL_DOCS_ALL = DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/lenny/applications/kopete-otr/debian/rules b/debian/lenny/applications/kopete-otr/debian/rules index abfd36cfc..4edf9d96d 100755 --- a/debian/lenny/applications/kopete-otr/debian/rules +++ b/debian/lenny/applications/kopete-otr/debian/rules @@ -12,6 +12,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/lenny/applications/kpicosim/debian/rules b/debian/lenny/applications/kpicosim/debian/rules index 4a8c9dcdd..0a03f424b 100755 --- a/debian/lenny/applications/kpicosim/debian/rules +++ b/debian/lenny/applications/kpicosim/debian/rules @@ -16,6 +16,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -123,7 +126,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/lenny/applications/kpilot/debian/rules b/debian/lenny/applications/kpilot/debian/rules index abfd36cfc..4edf9d96d 100755 --- a/debian/lenny/applications/kpilot/debian/rules +++ b/debian/lenny/applications/kpilot/debian/rules @@ -12,6 +12,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/lenny/applications/kpowersave-nohal/debian/rules b/debian/lenny/applications/kpowersave-nohal/debian/rules index a2f0e66bb..262171bc3 100755 --- a/debian/lenny/applications/kpowersave-nohal/debian/rules +++ b/debian/lenny/applications/kpowersave-nohal/debian/rules @@ -14,6 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_DOCS_ALL := AUTHORS NEWS DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/lenny/applications/kpowersave-nohal/debian/source/options b/debian/lenny/applications/kpowersave-nohal/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/lenny/applications/kpowersave-nohal/debian/source/options +++ b/debian/lenny/applications/kpowersave-nohal/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 diff --git a/debian/lenny/applications/kpowersave/debian/rules b/debian/lenny/applications/kpowersave/debian/rules index 991d42479..961465395 100755 --- a/debian/lenny/applications/kpowersave/debian/rules +++ b/debian/lenny/applications/kpowersave/debian/rules @@ -14,6 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_DOCS_ALL := AUTHORS NEWS DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/lenny/applications/kradio/debian/rules b/debian/lenny/applications/kradio/debian/rules index d8c6c0226..41840eb6e 100755 --- a/debian/lenny/applications/kradio/debian/rules +++ b/debian/lenny/applications/kradio/debian/rules @@ -16,6 +16,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -121,7 +124,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/lenny/applications/krename/debian/rules b/debian/lenny/applications/krename/debian/rules index f886eacd0..4983ad699 100755 --- a/debian/lenny/applications/krename/debian/rules +++ b/debian/lenny/applications/krename/debian/rules @@ -15,6 +15,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + ### Libtool and Automake updates post-patches:: debian/stamp-autothings-update debian/stamp-autothings-update: diff --git a/debian/lenny/applications/krusader/debian/rules b/debian/lenny/applications/krusader/debian/rules index 139132dbb..b19073807 100755 --- a/debian/lenny/applications/krusader/debian/rules +++ b/debian/lenny/applications/krusader/debian/rules @@ -18,6 +18,9 @@ DEB_DESTDIR = $(CURDIR)/debian/krusader-trinity/ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/lenny/applications/ksplash-engine-moodin/debian/rules b/debian/lenny/applications/ksplash-engine-moodin/debian/rules index 047b8ca76..c41d87b76 100755 --- a/debian/lenny/applications/ksplash-engine-moodin/debian/rules +++ b/debian/lenny/applications/ksplash-engine-moodin/debian/rules @@ -11,6 +11,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -132,7 +135,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/lenny/applications/ksquirrel/debian/rules b/debian/lenny/applications/ksquirrel/debian/rules index 744a8d1e5..f59e43351 100755 --- a/debian/lenny/applications/ksquirrel/debian/rules +++ b/debian/lenny/applications/ksquirrel/debian/rules @@ -16,6 +16,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -106,7 +109,7 @@ binary-arch: build install # dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/lenny/applications/kstreamripper/debian/rules b/debian/lenny/applications/kstreamripper/debian/rules index 9f641b49a..88540f9bf 100755 --- a/debian/lenny/applications/kstreamripper/debian/rules +++ b/debian/lenny/applications/kstreamripper/debian/rules @@ -2,6 +2,9 @@ include /usr/share/cdbs/1/rules/debhelper.mk #DEB_INSTALL_MANPAGES_kstreamripper-trinity:=debian/kstreamripper.1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PATH := /opt/trinity/bin:$(PATH) build/kstreamripper-trinity:: diff --git a/debian/lenny/applications/ksystemlog/debian/rules b/debian/lenny/applications/ksystemlog/debian/rules index 12d493659..5b9d63684 100755 --- a/debian/lenny/applications/ksystemlog/debian/rules +++ b/debian/lenny/applications/ksystemlog/debian/rules @@ -15,6 +15,9 @@ DEB_INSTALL_MANPAGES_ksystemlog-trinity := ksystemlog.1 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/lenny/applications/ktechlab/debian/rules b/debian/lenny/applications/ktechlab/debian/rules index 15d1878df..227674f7f 100755 --- a/debian/lenny/applications/ktechlab/debian/rules +++ b/debian/lenny/applications/ktechlab/debian/rules @@ -12,6 +12,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -108,7 +111,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install unpatch diff --git a/debian/lenny/applications/ktorrent/debian/rules b/debian/lenny/applications/ktorrent/debian/rules index 5590816c2..d0046eb44 100755 --- a/debian/lenny/applications/ktorrent/debian/rules +++ b/debian/lenny/applications/ktorrent/debian/rules @@ -15,6 +15,9 @@ DEB_INSTALL_MANPAGES_ktorrent = ktorrent.1 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + build/ktorrent-trinity:: docbook2x-man debian/ktorrent.1.docbook diff --git a/debian/lenny/applications/kuickshow/debian/rules b/debian/lenny/applications/kuickshow/debian/rules index ee4456494..46fe966da 100755 --- a/debian/lenny/applications/kuickshow/debian/rules +++ b/debian/lenny/applications/kuickshow/debian/rules @@ -14,6 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/lenny/applications/kvirc/debian/rules b/debian/lenny/applications/kvirc/debian/rules index 665c61d25..fd45d5925 100755 --- a/debian/lenny/applications/kvirc/debian/rules +++ b/debian/lenny/applications/kvirc/debian/rules @@ -49,6 +49,9 @@ endif # DEB_COMPRESS_EXCLUDE := .kvs +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # # Run dh_shlibdeps with the correct options # diff --git a/debian/lenny/applications/kvkbd/debian/rules b/debian/lenny/applications/kvkbd/debian/rules index 305c1e4df..0f564108e 100755 --- a/debian/lenny/applications/kvkbd/debian/rules +++ b/debian/lenny/applications/kvkbd/debian/rules @@ -13,6 +13,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + makebuilddir/kvkbd-trinity:: make -f Makefile.cvs diff --git a/debian/lenny/applications/kvpnc/debian/rules b/debian/lenny/applications/kvpnc/debian/rules index 354c23311..f93ccb291 100755 --- a/debian/lenny/applications/kvpnc/debian/rules +++ b/debian/lenny/applications/kvpnc/debian/rules @@ -17,6 +17,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + makebuilddir/kvpnc-trinity:: cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh diff --git a/debian/lenny/applications/piklab/debian/rules b/debian/lenny/applications/piklab/debian/rules index cd16137c9..6d0a1d510 100755 --- a/debian/lenny/applications/piklab/debian/rules +++ b/debian/lenny/applications/piklab/debian/rules @@ -10,6 +10,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -111,7 +114,7 @@ binary-arch: build install dh_shlibdeps -l/opt/trinity/lib dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: config build clean binary-indep binary-arch binary install diff --git a/debian/lenny/applications/potracegui/debian/rules b/debian/lenny/applications/potracegui/debian/rules index bc559477f..4b268883c 100755 --- a/debian/lenny/applications/potracegui/debian/rules +++ b/debian/lenny/applications/potracegui/debian/rules @@ -20,6 +20,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -100,7 +103,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/lenny/applications/qt4-tqt-theme-engine/debian/rules b/debian/lenny/applications/qt4-tqt-theme-engine/debian/rules index bd271d7de..2cde95722 100755 --- a/debian/lenny/applications/qt4-tqt-theme-engine/debian/rules +++ b/debian/lenny/applications/qt4-tqt-theme-engine/debian/rules @@ -9,5 +9,8 @@ DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + QMAKE := qmake-qt4 diff --git a/debian/lenny/applications/rosegarden/debian/rules b/debian/lenny/applications/rosegarden/debian/rules index 32d10d6ff..3fc2b777e 100755 --- a/debian/lenny/applications/rosegarden/debian/rules +++ b/debian/lenny/applications/rosegarden/debian/rules @@ -22,6 +22,9 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS - DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. DEB_BUILD_PARALLEL = true @@ -56,7 +59,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install configure diff --git a/debian/lenny/applications/smartcardauth/debian/rules b/debian/lenny/applications/smartcardauth/debian/rules index a9e7e66cb..fe74e584a 100755 --- a/debian/lenny/applications/smartcardauth/debian/rules +++ b/debian/lenny/applications/smartcardauth/debian/rules @@ -9,3 +9,6 @@ CFLAGS=-g -Wall -fPIC DEB_MAKE_INSTALL_TARGET := install DESTDIR="$(DEB_DESTDIR)" DEB_INSTALL_DOCS_ALL := + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) diff --git a/debian/lenny/applications/smb4k/debian/rules b/debian/lenny/applications/smb4k/debian/rules index db6aa90dd..70b1248dc 100755 --- a/debian/lenny/applications/smb4k/debian/rules +++ b/debian/lenny/applications/smb4k/debian/rules @@ -16,6 +16,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/lenny/applications/soundkonverter/debian/rules b/debian/lenny/applications/soundkonverter/debian/rules index 831240224..d3eac8d3b 100755 --- a/debian/lenny/applications/soundkonverter/debian/rules +++ b/debian/lenny/applications/soundkonverter/debian/rules @@ -23,6 +23,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS = --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + install/soundkonverter-trinity:: install -D -p -m0644 debian/soundkonverter-trinity.lintian-overrides \ debian/soundkonverter-trinity/usr/share/lintian/overrides/soundkonverter-trinity diff --git a/debian/lenny/applications/tde-guidance/debian/rules b/debian/lenny/applications/tde-guidance/debian/rules index 996ad6a4d..614fdb4a9 100755 --- a/debian/lenny/applications/tde-guidance/debian/rules +++ b/debian/lenny/applications/tde-guidance/debian/rules @@ -15,6 +15,9 @@ PYSUPPORT_PATH = $(DEB_DESTDIR)/opt/trinity/share/python-support DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde LDFLAGS_APPEND := -L/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + install/tde-guidance-trinity:: # install icons to right place install -D -p -m0644 $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/hi32-app-daemons.png \ diff --git a/debian/lenny/applications/tde-style-lipstik/debian/rules b/debian/lenny/applications/tde-style-lipstik/debian/rules index f24b21716..eb9de9610 100755 --- a/debian/lenny/applications/tde-style-lipstik/debian/rules +++ b/debian/lenny/applications/tde-style-lipstik/debian/rules @@ -16,6 +16,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -122,7 +125,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/lenny/applications/tde-style-qtcurve/debian/rules b/debian/lenny/applications/tde-style-qtcurve/debian/rules index c61c340ae..685703a85 100755 --- a/debian/lenny/applications/tde-style-qtcurve/debian/rules +++ b/debian/lenny/applications/tde-style-qtcurve/debian/rules @@ -24,6 +24,9 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS - DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. DEB_BUILD_PARALLEL = true diff --git a/debian/lenny/applications/tde-systemsettings/debian/rules b/debian/lenny/applications/tde-systemsettings/debian/rules index 8110845eb..ed2e13a90 100755 --- a/debian/lenny/applications/tde-systemsettings/debian/rules +++ b/debian/lenny/applications/tde-systemsettings/debian/rules @@ -15,6 +15,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/lenny/applications/tdesudo/debian/rules b/debian/lenny/applications/tdesudo/debian/rules index 5a63a69a9..443a43aed 100755 --- a/debian/lenny/applications/tdesudo/debian/rules +++ b/debian/lenny/applications/tdesudo/debian/rules @@ -15,6 +15,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit DEB_INSTALL_MANPAGES_tdesudo-trinity = tdesudo-trinity.1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + build/tdesudo-trinity:: docbook2x-man debian/tdesudo-trinity.1.docbook mv tdesudo.1 tdesudo-trinity.1 diff --git a/debian/lenny/applications/tdesvn/debian/rules b/debian/lenny/applications/tdesvn/debian/rules index d3e870fba..37d2a944b 100755 --- a/debian/lenny/applications/tdesvn/debian/rules +++ b/debian/lenny/applications/tdesvn/debian/rules @@ -22,6 +22,9 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS - DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. DEB_BUILD_PARALLEL = true diff --git a/debian/lenny/applications/tdmtheme/debian/rules b/debian/lenny/applications/tdmtheme/debian/rules index 8e74fc2cb..0fc4f4aa4 100755 --- a/debian/lenny/applications/tdmtheme/debian/rules +++ b/debian/lenny/applications/tdmtheme/debian/rules @@ -15,6 +15,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/lenny/applications/tellico/debian/rules b/debian/lenny/applications/tellico/debian/rules index 84b8312a4..9e404eabf 100755 --- a/debian/lenny/applications/tellico/debian/rules +++ b/debian/lenny/applications/tellico/debian/rules @@ -12,6 +12,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -149,7 +152,7 @@ binary-indep: build install dh_installdeb -i dh_gencontrol -i dh_md5sums -i - dh_builddeb -i + dh_builddeb -i $(DEB_DH_BUILDDEB_ARGS) # Build architecture-dependent files here. binary-arch: build install @@ -171,7 +174,7 @@ binary-arch: build install dh_shlibdeps -a dh_gencontrol -a dh_md5sums -a - dh_builddeb -a + dh_builddeb -a $(DEB_DH_BUILDDEB_ARGS) binary: binary-arch binary-indep .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/lenny/applications/twin-style-crystal/debian/rules b/debian/lenny/applications/twin-style-crystal/debian/rules index 8cda3384a..4fb0c5bb5 100755 --- a/debian/lenny/applications/twin-style-crystal/debian/rules +++ b/debian/lenny/applications/twin-style-crystal/debian/rules @@ -13,6 +13,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/lenny/applications/wlassistant/debian/rules b/debian/lenny/applications/wlassistant/debian/rules index abada8378..1a8fdeafb 100755 --- a/debian/lenny/applications/wlassistant/debian/rules +++ b/debian/lenny/applications/wlassistant/debian/rules @@ -22,6 +22,9 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS - DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. DEB_BUILD_PARALLEL = true diff --git a/debian/lenny/applications/yakuake/debian/rules b/debian/lenny/applications/yakuake/debian/rules index f5bd922f5..aa22c8b59 100755 --- a/debian/lenny/applications/yakuake/debian/rules +++ b/debian/lenny/applications/yakuake/debian/rules @@ -15,6 +15,9 @@ INSTALL_DOCS_ALL := DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + ### Libtool and Automake updates post-patches:: debian/stamp-autothings-update debian/stamp-autothings-update: diff --git a/debian/lenny/defaultsettings b/debian/lenny/defaultsettings new file mode 120000 index 000000000..86062d702 --- /dev/null +++ b/debian/lenny/defaultsettings @@ -0,0 +1 @@ +../../ubuntu/maverick/defaultsettings
\ No newline at end of file diff --git a/debian/lenny/dependencies/arts/debian/rules b/debian/lenny/dependencies/arts/debian/rules index b0a724e1a..9c9730bda 100755 --- a/debian/lenny/dependencies/arts/debian/rules +++ b/debian/lenny/dependencies/arts/debian/rules @@ -23,6 +23,9 @@ DEB_BUILD_PARALLEL = true DEB_DH_STRIP_ARGS := --dbg-package=arts-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := libarts1c2a-trinity libartsc0-trinity DEB_DH_MAKESHLIBS_ARGS_ALL := -V diff --git a/debian/lenny/dependencies/avahi-tqt/debian/control b/debian/lenny/dependencies/avahi-tqt/debian/control index 8b0c55500..b4838d2b0 100644 --- a/debian/lenny/dependencies/avahi-tqt/debian/control +++ b/debian/lenny/dependencies/avahi-tqt/debian/control @@ -5,6 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> Uploaders: Timothy Pearson <kb9vqf@pearsoncomputing.net> Build-Depends: debhelper, + cdbs, pkg-config, python-support (>= 0.6), libglib2.0-dev (>= 2.4), diff --git a/debian/lenny/dependencies/avahi-tqt/debian/rules b/debian/lenny/dependencies/avahi-tqt/debian/rules index c3ea0343f..54a22a44f 100755 --- a/debian/lenny/dependencies/avahi-tqt/debian/rules +++ b/debian/lenny/dependencies/avahi-tqt/debian/rules @@ -1,17 +1,24 @@ #!/usr/bin/make -f -%: - dh $@ +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk # Ensure at build time that the library has no dependencies on undefined # symbols, and speed up loading. export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,-z,defs -Wl,-O1 -override_dh_auto_configure: - ./autogen.sh - dh_auto_configure -- $(CONFFLAGS) \ +DEB_CONFIGURE_EXTRA_FLAGS += \ --enable-compat-libdns_sd \ --disable-mono --disable-monodoc \ --disable-gtk3 \ --with-systemdsystemunitdir=/lib/systemd/system +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + +post-patches:: debian/stamp-bootstrap + +debian/stamp-bootstrap: + ./autogen.sh + rm ./ChangeLog + touch debian/stamp-bootstrap diff --git a/debian/lenny/dependencies/dbus-1-tqt/debian/rules b/debian/lenny/dependencies/dbus-1-tqt/debian/rules index b7aa427f8..3b86de7db 100755 --- a/debian/lenny/dependencies/dbus-1-tqt/debian/rules +++ b/debian/lenny/dependencies/dbus-1-tqt/debian/rules @@ -4,3 +4,6 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) diff --git a/debian/lenny/dependencies/dbus-tqt/debian/rules b/debian/lenny/dependencies/dbus-tqt/debian/rules index 894533134..a59bed76e 100755 --- a/debian/lenny/dependencies/dbus-tqt/debian/rules +++ b/debian/lenny/dependencies/dbus-tqt/debian/rules @@ -10,3 +10,6 @@ include /usr/share/cdbs/1/class/cmake.mk # Strict library versioning DEB_DH_MAKESHLIBS_ARGS_ALL := -V + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) diff --git a/debian/lenny/dependencies/libart-lgpl/debian/rules b/debian/lenny/dependencies/libart-lgpl/debian/rules index 4390434f7..2751eb1f2 100755 --- a/debian/lenny/dependencies/libart-lgpl/debian/rules +++ b/debian/lenny/dependencies/libart-lgpl/debian/rules @@ -20,3 +20,5 @@ GNOME_MODULE := libart_lgpl DEB_DH_MAKESHLIBS_ARGS_$(libart-2.0-N) += -V '$(libart-2.0-N)(>= 2.3.18)' +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) diff --git a/debian/lenny/dependencies/libcaldav/debian/rules b/debian/lenny/dependencies/libcaldav/debian/rules index 0dda6ea24..fb72a35e7 100755 --- a/debian/lenny/dependencies/libcaldav/debian/rules +++ b/debian/lenny/dependencies/libcaldav/debian/rules @@ -5,6 +5,9 @@ include /usr/share/quilt/quilt.make # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # This has to be exported to make some magic below work. export DH_OPTIONS @@ -86,7 +89,7 @@ binary-common: dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture independent packages using the common target. binary-indep: build install diff --git a/debian/lenny/dependencies/libcarddav/debian/rules b/debian/lenny/dependencies/libcarddav/debian/rules index 124929739..24bdcbc93 100755 --- a/debian/lenny/dependencies/libcarddav/debian/rules +++ b/debian/lenny/dependencies/libcarddav/debian/rules @@ -5,6 +5,9 @@ include /usr/share/quilt/quilt.make # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # This has to be exported to make some magic below work. export DH_OPTIONS @@ -86,7 +89,7 @@ binary-common: dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture independent packages using the common target. binary-indep: build install diff --git a/debian/lenny/dependencies/python-tqt/debian/rules b/debian/lenny/dependencies/python-tqt/debian/rules index ebb91c6e4..86eca95c9 100755 --- a/debian/lenny/dependencies/python-tqt/debian/rules +++ b/debian/lenny/dependencies/python-tqt/debian/rules @@ -3,6 +3,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + export DH_OPTIONS -include /usr/share/python/python.mk @@ -158,7 +161,7 @@ endif dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture independant packages using the common target. binary-indep: install-indep diff --git a/debian/lenny/dependencies/qt3/debian/control b/debian/lenny/dependencies/qt3/debian/control index 8b1654d79..e10fbcab1 100644 --- a/debian/lenny/dependencies/qt3/debian/control +++ b/debian/lenny/dependencies/qt3/debian/control @@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1- libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, libxcursor-dev, libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg62-dev, libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev, - libfreetype6-dev, libxft-dev, unixodbc-dev, uuid-dev, + libfreetype6-dev, libxft-dev, unixodbc-dev, uuid-dev, libglib2.0-dev, libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcups2-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev, firebird2.1-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc] | firebird2-dev [i386 amd64] diff --git a/debian/lenny/dependencies/qt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff b/debian/lenny/dependencies/qt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff deleted file mode 100644 index 3c6394f33..000000000 --- a/debian/lenny/dependencies/qt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff +++ /dev/null @@ -1,32 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## kubuntu_06_fglrx_0_size_screen.diff.dpatch by <jr@pechin3> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad qt-x11-free-3.3.8really3.3.7~/src/kernel/qpaintdevice_x11.cpp qt-x11-free-3.3.8really3.3.7/src/kernel/qpaintdevice_x11.cpp ---- qt-x11-free-3.3.8really3.3.7~/src/kernel/qpaintdevice_x11.cpp 2007-04-02 20:06:28.000000000 +0100 -+++ qt-x11-free-3.3.8really3.3.7/src/kernel/qpaintdevice_x11.cpp 2007-04-02 20:12:10.000000000 +0100 -@@ -526,11 +526,16 @@ - Q_CHECK_PTR( dpisX ); - Q_CHECK_PTR( dpisY ); - for ( i = 0; i < screens; i++ ) { -- dpisX[ i ] = (DisplayWidth(dpy,i) * 254 + DisplayWidthMM(dpy,i)*5) -- -- / (DisplayWidthMM(dpy,i)*10); -- dpisY[ i ] = (DisplayHeight(dpy,i) * 254 + DisplayHeightMM(dpy,i)*5) -- / (DisplayHeightMM(dpy,i)*10); -+ if (DisplayWidthMM(dpy,i) < 1) -+ dpisX[ i ] = 75; // default the dpi to 75. -+ else -+ dpisX[ i ] = (DisplayWidth(dpy,i) * 254 + DisplayWidthMM(dpy,i)*5) -+ / (DisplayWidthMM(dpy,i)*10); -+ if (DisplayHeightMM(dpy,i) < 1) -+ dpisY[ i ] = 75; // default the dpi to 75. -+ else -+ dpisY[ i ] = (DisplayHeight(dpy,i) * 254 + DisplayHeightMM(dpy,i)*5) -+ / (DisplayHeightMM(dpy,i)*10); - } - } - diff --git a/debian/lenny/dependencies/qt3/debian/patches/series b/debian/lenny/dependencies/qt3/debian/patches/series index 7377c84c1..e6bdb92af 100644 --- a/debian/lenny/dependencies/qt3/debian/patches/series +++ b/debian/lenny/dependencies/qt3/debian/patches/series @@ -1,4 +1,3 @@ 06_disable_rpath.diff 09_amd64_lib64.diff 72_dont_trust_uname-m_use_dpkg-arch_instead.diff -kubuntu_06_fglrx_0_size_screen.diff diff --git a/debian/lenny/dependencies/qt3/debian/rules b/debian/lenny/dependencies/qt3/debian/rules index 09b237823..7ede42ad9 100755 --- a/debian/lenny/dependencies/qt3/debian/rules +++ b/debian/lenny/dependencies/qt3/debian/rules @@ -11,6 +11,9 @@ export LD_LIBRARY_PATH=$(QTDIR)/lib:$(OLD_LD_LIBRARY_PATH) OLD_PATH := $(PATH) export PATH=$(QTDIR)/bin:$(OLD_PATH) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) @@ -96,6 +99,7 @@ CONFIGURE_OPTS = \ \ -lfontconfig \ -inputmethod \ + -glibmainloop \ # End of CONFIGURE_OPTS interbase_archs := i386 amd64 sparc powerpc @@ -326,7 +330,7 @@ binary-indep: build install dh_gencontrol -i dh_md5sums -i - dh_builddeb -i + dh_builddeb -i $(DEB_DH_BUILDDEB_ARGS) binary-arch: build install @@ -468,7 +472,7 @@ binary-arch: build install dh_gencontrol -a $(IBASE) dh_md5sums -a $(IBASE) - dh_builddeb -a $(IBASE) + dh_builddeb -a $(IBASE) $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build binary-indep binary-arch binary install clean patch unpatch diff --git a/debian/lenny/dependencies/sip4-tqt/debian/rules b/debian/lenny/dependencies/sip4-tqt/debian/rules index 0dd14099f..2286739d5 100755 --- a/debian/lenny/dependencies/sip4-tqt/debian/rules +++ b/debian/lenny/dependencies/sip4-tqt/debian/rules @@ -2,6 +2,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + export DH_OPTIONS INSTDIR=$(CURDIR)/debian @@ -134,7 +137,7 @@ endif dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture independant packages using the common target. binary-indep: diff --git a/debian/lenny/dependencies/tqca-tls/debian/rules b/debian/lenny/dependencies/tqca-tls/debian/rules index 4ffaf90dc..fc9e58e55 100755 --- a/debian/lenny/dependencies/tqca-tls/debian/rules +++ b/debian/lenny/dependencies/tqca-tls/debian/rules @@ -6,6 +6,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) @@ -104,7 +107,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/lenny/dependencies/tqscintilla/debian/rules b/debian/lenny/dependencies/tqscintilla/debian/rules index 36df66cc9..8dfaa3377 100755 --- a/debian/lenny/dependencies/tqscintilla/debian/rules +++ b/debian/lenny/dependencies/tqscintilla/debian/rules @@ -5,6 +5,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # This is the debhelper compatibility version to use. export QTDIR=/usr/share/tqt3 export QMAKESPEC=$(QTDIR)/mkspecs/linux-g++ @@ -82,7 +85,7 @@ binary-indep: build install dh_installdeb -i dh_gencontrol -i dh_md5sums -i - dh_builddeb -i + dh_builddeb -i $(DEB_DH_BUILDDEB_ARGS) # Build architecture-dependent files here. binary-arch: build install @@ -100,7 +103,7 @@ binary-arch: build install dh_shlibdeps -a dh_gencontrol -a dh_md5sums -a - dh_builddeb -a + dh_builddeb -a $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install configure diff --git a/debian/lenny/dependencies/tqt3/debian/control b/debian/lenny/dependencies/tqt3/debian/control index b784036f1..75c905a54 100644 --- a/debian/lenny/dependencies/tqt3/debian/control +++ b/debian/lenny/dependencies/tqt3/debian/control @@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1- libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, libxcursor-dev, libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg-dev, libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev, - libfreetype6-dev, libxft-dev, unixodbc-dev, uuid-dev, + libfreetype6-dev, libxft-dev, unixodbc-dev, uuid-dev, libglib2.0-dev, libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcups2-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev, firebird2.1-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc] | firebird2-dev [i386 amd64] diff --git a/debian/lenny/dependencies/tqt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff b/debian/lenny/dependencies/tqt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff deleted file mode 100644 index 3c6394f33..000000000 --- a/debian/lenny/dependencies/tqt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff +++ /dev/null @@ -1,32 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## kubuntu_06_fglrx_0_size_screen.diff.dpatch by <jr@pechin3> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad qt-x11-free-3.3.8really3.3.7~/src/kernel/qpaintdevice_x11.cpp qt-x11-free-3.3.8really3.3.7/src/kernel/qpaintdevice_x11.cpp ---- qt-x11-free-3.3.8really3.3.7~/src/kernel/qpaintdevice_x11.cpp 2007-04-02 20:06:28.000000000 +0100 -+++ qt-x11-free-3.3.8really3.3.7/src/kernel/qpaintdevice_x11.cpp 2007-04-02 20:12:10.000000000 +0100 -@@ -526,11 +526,16 @@ - Q_CHECK_PTR( dpisX ); - Q_CHECK_PTR( dpisY ); - for ( i = 0; i < screens; i++ ) { -- dpisX[ i ] = (DisplayWidth(dpy,i) * 254 + DisplayWidthMM(dpy,i)*5) -- -- / (DisplayWidthMM(dpy,i)*10); -- dpisY[ i ] = (DisplayHeight(dpy,i) * 254 + DisplayHeightMM(dpy,i)*5) -- / (DisplayHeightMM(dpy,i)*10); -+ if (DisplayWidthMM(dpy,i) < 1) -+ dpisX[ i ] = 75; // default the dpi to 75. -+ else -+ dpisX[ i ] = (DisplayWidth(dpy,i) * 254 + DisplayWidthMM(dpy,i)*5) -+ / (DisplayWidthMM(dpy,i)*10); -+ if (DisplayHeightMM(dpy,i) < 1) -+ dpisY[ i ] = 75; // default the dpi to 75. -+ else -+ dpisY[ i ] = (DisplayHeight(dpy,i) * 254 + DisplayHeightMM(dpy,i)*5) -+ / (DisplayHeightMM(dpy,i)*10); - } - } - diff --git a/debian/lenny/dependencies/tqt3/debian/patches/series b/debian/lenny/dependencies/tqt3/debian/patches/series index 7377c84c1..e6bdb92af 100644 --- a/debian/lenny/dependencies/tqt3/debian/patches/series +++ b/debian/lenny/dependencies/tqt3/debian/patches/series @@ -1,4 +1,3 @@ 06_disable_rpath.diff 09_amd64_lib64.diff 72_dont_trust_uname-m_use_dpkg-arch_instead.diff -kubuntu_06_fglrx_0_size_screen.diff diff --git a/debian/lenny/dependencies/tqt3/debian/rules b/debian/lenny/dependencies/tqt3/debian/rules index 39a2ee31c..d2d66f6a7 100755 --- a/debian/lenny/dependencies/tqt3/debian/rules +++ b/debian/lenny/dependencies/tqt3/debian/rules @@ -11,6 +11,9 @@ export LD_LIBRARY_PATH=$(QTDIR)/lib:$(OLD_LD_LIBRARY_PATH) OLD_PATH := $(PATH) export PATH=$(QTDIR)/bin:$(OLD_PATH) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) @@ -100,6 +103,7 @@ CONFIGURE_OPTS = \ \ -lfontconfig \ -inputmethod \ + -glibmainloop \ # End of CONFIGURE_OPTS interbase_archs := i386 amd64 sparc powerpc @@ -330,7 +334,7 @@ binary-indep: build install dh_gencontrol -i dh_md5sums -i - dh_builddeb -i + dh_builddeb -i $(DEB_DH_BUILDDEB_ARGS) binary-arch: build install @@ -461,7 +465,7 @@ binary-arch: build install dh_gencontrol -a $(IBASE) dh_md5sums -a $(IBASE) - dh_builddeb -a $(IBASE) + dh_builddeb -a $(IBASE) $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build binary-indep binary-arch binary install clean patch unpatch diff --git a/debian/lenny/dependencies/tqtinterface/debian/rules b/debian/lenny/dependencies/tqtinterface/debian/rules index f05e2fadd..5d8f4cb4c 100755 --- a/debian/lenny/dependencies/tqtinterface/debian/rules +++ b/debian/lenny/dependencies/tqtinterface/debian/rules @@ -14,6 +14,9 @@ DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) DEB_CMAKE_EXTRA_FLAGS := -DPKGCONFIG_INSTALL_DIR="/usr/lib/pkgconfig" -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/usr" -DCMAKE_LIBRARY_PATH="/usr/lib" -DCMAKE_INCLUDE_PATH="/usr/include" -DCMAKE_VERBOSE_MAKEFILE="ON" -DWITH_QT3="ON" -DQTDIR="/usr/share/qt3" -DQT_LIBRARY_DIRS="/usr/share/qt3/lib" -DBUILD_ALL="ON" -DUSE_QT3="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. DEB_BUILD_PARALLEL = true diff --git a/debian/lenny/libraries/kipi-plugins/debian/rules b/debian/lenny/libraries/kipi-plugins/debian/rules index 5177da213..c9f8bd279 100755 --- a/debian/lenny/libraries/kipi-plugins/debian/rules +++ b/debian/lenny/libraries/kipi-plugins/debian/rules @@ -20,6 +20,9 @@ DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + clean :: rm -f po/*/*.gmo diff --git a/debian/lenny/libraries/libkdcraw/debian/rules b/debian/lenny/libraries/libkdcraw/debian/rules index 7785e4bcc..f58c12e61 100755 --- a/debian/lenny/libraries/libkdcraw/debian/rules +++ b/debian/lenny/libraries/libkdcraw/debian/rules @@ -16,3 +16,6 @@ DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--no-undefined -Wl,--as-needed" DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) diff --git a/debian/lenny/libraries/libkexiv2/debian/rules b/debian/lenny/libraries/libkexiv2/debian/rules index 28a1c06e8..705840830 100755 --- a/debian/lenny/libraries/libkexiv2/debian/rules +++ b/debian/lenny/libraries/libkexiv2/debian/rules @@ -19,6 +19,9 @@ DEB_KDE_ENABLE_FINAL = yes DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + get-orig-source: @@dh_testdir @@[ -d ../tarballs/. ]||mkdir -p ../tarballs diff --git a/debian/lenny/libraries/libkipi/debian/rules b/debian/lenny/libraries/libkipi/debian/rules index 94eb41df3..ff0f40f12 100755 --- a/debian/lenny/libraries/libkipi/debian/rules +++ b/debian/lenny/libraries/libkipi/debian/rules @@ -18,6 +18,9 @@ DEB_KDE_ENABLE_FINAL = yes DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + clean :: rm -f po/*/*.gmo diff --git a/debian/lenny/libraries/libksquirrel/debian/rules b/debian/lenny/libraries/libksquirrel/debian/rules index 4d113ccd7..f5bc572dc 100755 --- a/debian/lenny/libraries/libksquirrel/debian/rules +++ b/debian/lenny/libraries/libksquirrel/debian/rules @@ -16,6 +16,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -88,7 +91,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/lenny/libraries/libtdeldap/debian/control b/debian/lenny/libraries/libtdeldap/debian/control index 2f489d71e..cd0240ab3 100644 --- a/debian/lenny/libraries/libtdeldap/debian/control +++ b/debian/lenny/libraries/libtdeldap/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.8.4 Package: libtdeldap-trinity Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients +Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, nss-updatedb Description: LDAP interface library for TDE LDAP interface library for TDE management modules. . diff --git a/debian/lenny/libraries/libtdeldap/debian/rules b/debian/lenny/libraries/libtdeldap/debian/rules index 242fb2c84..9bed17b05 100755 --- a/debian/lenny/libraries/libtdeldap/debian/rules +++ b/debian/lenny/libraries/libtdeldap/debian/rules @@ -11,6 +11,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/lenny/libraries/libtqt-perl/debian/rules b/debian/lenny/libraries/libtqt-perl/debian/rules index 7bf57d40b..1d77c70fc 100755 --- a/debian/lenny/libraries/libtqt-perl/debian/rules +++ b/debian/lenny/libraries/libtqt-perl/debian/rules @@ -32,6 +32,9 @@ DEB_MAKE_INSTALL_TARGET := install \ PREFIX=$(CURDIR)/debian/libtqt-perl/usr \ SITEPREFIX=$(CURDIR)/debian/libtqt-perl/usr \ +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + pre-build:: pre-build-stamp pre-build-stamp: diff --git a/debian/lenny/libraries/mlt++/debian/rules b/debian/lenny/libraries/mlt++/debian/rules index 0232c83be..99606e440 100755 --- a/debian/lenny/libraries/mlt++/debian/rules +++ b/debian/lenny/libraries/mlt++/debian/rules @@ -10,6 +10,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + version := $(shell sed -n 's/Package: \(.*\)/\1/p' debian/control | head -n 1) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -88,7 +91,7 @@ binary-arch: build install dh_shlibdeps -l/opt/trinity/lib dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/lenny/libraries/mlt/debian/rules b/debian/lenny/libraries/mlt/debian/rules index 3889b6a3a..ce607fb77 100755 --- a/debian/lenny/libraries/mlt/debian/rules +++ b/debian/lenny/libraries/mlt/debian/rules @@ -10,6 +10,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + version := $(shell sed -n 's/Package: \(.*\)/\1/p' debian/control | head -n 1) NCPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1) @@ -114,7 +117,7 @@ binary-arch: build install dh_shlibdeps --exclude=libmlt --exclude=libmiracle --exclude=libvalerie dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/lenny/libraries/pytdeextensions/debian/control b/debian/lenny/libraries/pytdeextensions/debian/control index 0920e9e37..626311320 100644 --- a/debian/lenny/libraries/pytdeextensions/debian/control +++ b/debian/lenny/libraries/pytdeextensions/debian/control @@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> Build-Depends: cdbs, debhelper (>= 5), chrpath, quilt, tdelibs4c2a-trinity, libtool, libxml2-utils, libxrandr-dev, libxxf86vm-dev, pytqt-tools, python-trinity-trinity, - python-tqt-dev, python-sip4-dev, python-support (>= 0.6), python (>= 2.5), python-dev (>= 2.5) + python-tqt-dev, python-sip4-dev, python-support (>= 0.6), python (>= 2.5), python-all-dev (>= 2.5) Standards-Version: 3.8.4 Package: pytdeextensions-trinity @@ -26,7 +26,7 @@ Architecture: any Section: libdevel Replaces: libpythonize0-trinity-dev (<< 4:14.0.0) Breaks: libpythonize0-trinity-dev (<< 4:14.0.0) -Depends: libpythonize0-trinity (= ${binary:Version}), python-dev +Depends: libpythonize0-trinity (= ${binary:Version}), python-all-dev Description: Python packages to support KDE applications (development) [Trinity] PyKDE Extensions is a collection of software and Python packages to support the creation and installation of KDE applications. diff --git a/debian/lenny/libraries/pytdeextensions/debian/rules b/debian/lenny/libraries/pytdeextensions/debian/rules index 4dcfaaae8..b4ae203da 100755 --- a/debian/lenny/libraries/pytdeextensions/debian/rules +++ b/debian/lenny/libraries/pytdeextensions/debian/rules @@ -18,6 +18,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + install/pytdeextensions-trinity:: # We have no idea if the built product is site-packages or dist-packages cd debian/tmp/usr/lib/python*/ && mv site-packages/ dist-packages/ || echo "site-packages --> dist-packages" diff --git a/debian/lenny/libraries/python-trinity/debian/rules b/debian/lenny/libraries/python-trinity/debian/rules index ffa56ad63..67af8c2d8 100755 --- a/debian/lenny/libraries/python-trinity/debian/rules +++ b/debian/lenny/libraries/python-trinity/debian/rules @@ -11,6 +11,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + include /usr/share/dpatch/dpatch.make # This has to be exported to make some magic below work. export DH_OPTIONS @@ -151,7 +154,7 @@ endif dh_shlibdeps -l /opt/trinity/lib dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture independant packages using the common target. binary-indep: install-indep diff --git a/debian/lenny/metapackages/meta-tde/debian/README.Debian b/debian/lenny/metapackages/meta-tde/debian/README.Debian new file mode 100644 index 000000000..6591fa872 --- /dev/null +++ b/debian/lenny/metapackages/meta-tde/debian/README.Debian @@ -0,0 +1,14 @@ +kde -- a metapackage for KDE +kde-core -- a metapackage for KDE core +kde-devel -- a metapackage for developing KDE Applications +---------------------------------------------------------------------------- + +This package is a metapackage, meaning that its purpose is to contain +dependencies for a complete, Debian-based environment for KDE 3. + +This package also carries optional 'Recommends' and/or 'Suggests' +package suggestions. The packages listed are suggested for +installation, but not required. + +Please file a wishlist bug against the package if you feel there are +additional packages that ought to be included with this meta-package. diff --git a/debian/lenny/metapackages/meta-tde/debian/changelog b/debian/lenny/metapackages/meta-tde/debian/changelog new file mode 100644 index 000000000..7c5da1b8f --- /dev/null +++ b/debian/lenny/metapackages/meta-tde/debian/changelog @@ -0,0 +1,617 @@ +meta-kde-trinity (5:54) squeeze; urgency=low + + * Trinity version + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Mon, 05 Jul 2010 12:08:00 -0600 + +meta-kde (5:48) unstable; urgency=low + + * Remove kde-amusements. + * Update to debhelper compat 6. + * Update to Standards-Version 3.7.3, no changes required. + * Update Uploaders. + * Update copyright file. + * Move Homepage to source field. + * Update 4:3.4.3 to 4:3.5.5 now this is the KDE version in stable, + and from 1.4.2 to 1.5.5 for arts. + * Update rules file. + * Add kdbg, kdevelop (>= 4:3.3.2), kprof to kde-devel Suggests. This was + installed by, now removed, kde-devel-extras. + + -- Ana Beatriz Guerrero Lopez <ana@debian.org> Fri, 18 Jan 2008 21:14:55 +0100 + +meta-kde (5:47) unstable; urgency=low + + +++ Changes by Christopher Martin: + + * Version the metapackages' dependencies, making the metapackages + more useful for backporters. + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 11 May 2006 20:04:40 -0400 + +meta-kde (5:46) unstable; urgency=low + + +++ Changes by Christopher Martin: + + * Add kdeaccessiblity to kde's depends, and clarify the verbiage noting that + kde doesn't depend on development packages. (Closes: #353496) + + * Remove dependency on fontconfig, since libqt3-mt already depends on it. + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 10 May 2006 19:35:02 -0400 + +meta-kde (5:45) unstable; urgency=low + + +++ Changes by Christopher Martin: + + * Remove the kdelibs3-bin dummy transitional package, as Sarge is out + and thus Woody --> Sarge upgrades are no longer a concern. + (Closes: #327548) + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sat, 10 Sep 2005 18:40:13 -0400 + +meta-kde (5:44) unstable; urgency=low + + +++ Changes by Christopher Martin: + + * Overhaul the package descriptions. + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Mon, 14 Mar 2005 14:24:50 -0500 + +meta-kde (5:43) unstable; urgency=low + + * Added kdelibs3-bin dummy package to aid woody transitions. + + -- Riku Voipio <riku.voipio@iki.fi> Tue, 14 Dec 2004 00:12:46 +0200 + +meta-kde (5:42) unstable; urgency=medium + + * The "why is kde in debian still 3.1.2" Release + * Disconnect meta-kde version numbers from kde. + * Change quanta to kdewebdev (Closes: #256574) + * Fix a typo (Closes: #231491) + * Suggest x-window-system-core (Closes: #237649) + * Add myself as uploaders + + -- Riku Voipio <riku.voipio@iki.fi> Tue, 16 Nov 2004 19:10:41 +0000 + +meta-kde (4:3.1.2) unstable; urgency=low + + * Split unofficial KDE packages into meta-kde-extras source. + * Fixed a typo in description. (Closes: #190718) + + -- Christopher L Cheney <ccheney@debian.org> Tue, 6 Jan 2004 02:00:00 -0600 + +meta-kde (4:3.1.1) unstable; urgency=low + + * Fixed a typo in description. + + -- Christopher L Cheney <ccheney@debian.org> Mon, 21 Apr 2003 00:30:00 -0500 + +meta-kde (4:3.1.0) unstable; urgency=low + + * Updated for KDE 3.1.1. (Closes: #135796, #182474, #188385) + * KDM is now only Recommended. (Closes: #123466) + * Bibletime is no longer in kde-extras due to being KDE2. (Closes: #158561) + + -- Christopher L Cheney <ccheney@debian.org> Sun, 13 Apr 2003 19:00:00 -0500 + +meta-kde (4:2.2.25) unstable; urgency=high + + * Removed kyahoo from kde-extras. Closes: #144708 (RC) + Arn't meta packages fun, sigh. + + -- Joey Hess <joeyh@debian.org> Sat, 27 Apr 2002 11:39:45 -0400 + +meta-kde (4:2.2.24) unstable; urgency=high + + * Move a few more deps around + * kamera wasn't even in the list + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 14 Mar 2002 11:55:00 -0700 + +meta-kde (4:2.2.23) unstable; urgency=low + + * A few more + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 11 Mar 2002 22:00:00 -0700 + +meta-kde (4:2.2.22) unstable; urgency=low + + * knapster2, kdestudio, kdesdk, and kdepim don't build on all archs + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 11 Mar 2002 11:00:00 -0700 + +meta-kde (4:2.2.21) unstable; urgency=low + + * One more cleanup. Now we are just waiting on hppa to catch up + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 09 Mar 2002 21:40:00 -0700 + +meta-kde (4:2.2.20) unstable; urgency=low + + * Remove kfilereplace + * Move several packages to suggests as they are either buggy or not + avail on all archs + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 09 Mar 2002 02:52:00 -0700 + +meta-kde (4:2.2.19) unstable; urgency=low + + * Change maintainer + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 17 Feb 2002 18:00:00 -0700 + +meta-kde (4:2.2.18) unstable; urgency=low + + * Fix spelling (Closes: #124411, #124784) + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 17 Dec 2001 15:16:00 -0700 + +meta-kde (4:2.2.17) unstable; urgency=low + + * Allow for kde3 co-existance + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 16 Dec 2001 05:23:00 -0700 + +meta-kde (4:2.2.16) unstable; urgency=low + + * Move kdemultimedia based packages to Suggests since they are not + available for all released archs. + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 02 Dec 2001 23:46:00 -0700 + +meta-kde (4:2.2.15) unstable; urgency=low + + * Remove pointers to -cvs packages + * Don't need these versions for woody's release so get rid of them. + * Cleanup changelog + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 29 Nov 2001 06:56:00 -0700 + +meta-kde (4:2.2.14) unstable; urgency=low + + * Remove recommends of libssl as that breaks policy + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 22 Nov 2001 22:58:00 -0700 + +meta-kde (4:2.2.13) unstable; urgency=low + + * Add info on sub-pixel AA + * 2.2.2 branding + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 19 Nov 2001 23:10:00 -0700 + +meta-kde (4:2.2.12) unstable; urgency=low + + * drop back to 2.2.1 until I upload 2.2.2 just to keep things sane + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 16 Nov 2001 00:28:00 -0700 + +meta-kde (4:2.2.11) unstable; urgency=low + + * Tweak deps so that one could intermix arts stuff from kde3-cvs with kde2 + stuff + * Add libssl0.9.6 recommends just to be nice + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 10 Nov 2001 20:28:00 -0700 + +meta-kde (4:2.2.10) unstable; urgency=low + + * Updated for KDE 2.2.2 and Qt 2.3.2 + * Remove pointers to any crypto packages + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 09 Nov 2001 11:17:00 -0700 + +meta-kde (4:2.2.9) unstable; urgency=low + + * Add korinico and kreatecd + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 30 Oct 2001 22:30:00 -0700 + +meta-kde (4:2.2.8) unstable; urgency=low + + * Replace kmsn with kmerlin (Closes: #116828) + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 24 Oct 2001 10:01:00 -0700 + +meta-kde (4:2.2.7) unstable; urgency=low + + * Update versioned deps and remove unnecessary ones + * Update Standards version + * Change Build-Depends to Build-Depends-Indep since the packages being + created are indep packages and not binary specific. + * Update XftConfig example + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 20 Oct 2001 22:24:00 -0700 + +meta-kde (4:2.2.6) unstable; urgency=low + + * Update priorities + * Add ktexmaker2 (Closes: #112573) + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 17 Sep 2001 14:00:00 -0700 + +meta-kde (4:2.2.5) unstable; urgency=low + + * Updated for 2.2.1 + * Update Xft config file (Closes: #112358) + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 17 Sep 2001 11:48:00 -0700 + +meta-kde (4:2.2.4) unstable; urgency=low + + * Added knewsticker-scripts (Closes: #110315) + * Add kinkatta + * Add kcd + * Change keuklid to kgeo + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 29 Aug 2001 00:38:00 -0700 + +meta-kde (4:2.2.3) unstable; urgency=low + + * Remove kups + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 22 Aug 2001 18:45:00 -0700 + +meta-kde (4:2.2.2) unstable; urgency=low + + * Add missing packages (Closes: #109373) + * Add missing games (Closes: #109433) + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 21 Aug 2001 00:01:00 -0700 + +meta-kde (4:2.2.1) unstable; urgency=low + + * Remove skam (Closes: #109019) + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 17 Aug 2001 08:50:00 -0700 + +meta-kde (4:2.2) unstable; urgency=low + + * Update deps for final 2.2 packages - actually do version deps so that + those who just like updating the meta-package won't get hosed...this + would only be an issue for those in testing/sid land. I think for final + release I'll take out the version deps to cut down on Packages size and + all...plus there really is no need for it for the release. I can go + back to versioned deps afterwards. + * add conflicts for old task-* packages...let's make sure they get removed + * Packages removed from kde-extras: kaim + kaim had to change it's name due to AOL being stupid and claiming TM on + the name AIM and use of it. I'll add the new package name once I get + packages built for it. They plon on a 1.00 release under the new name + however it still isn't available. The new name is kinkatta. + * New packages added to kde-extras: kooka, libkscan1, kandy, kmsn, + skam, mp3kult, licq-plugin-kde, knapster2, kaptain, wordtrans-kde + * New packages added to kde-devel: kspy, kbabel + * New packages added to kde: kdelibs3-crypto, kdebase-crypto, kdessh, + aktion, kde-i18n (all as suggests) + * New packages added to kde-games: kdecarddecks + * Moved kde-games from a suggests to a recommends for kde. + * Moved plugins and artwork from kde to kde-extras + * Change dep for kdm to kdm | x-display-manager which will exist soon. + * Install the Readme into the kde-extras package like the others. + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 10 Aug 2001 03:22:00 -0700 + +meta-kde (4:2.1.44) unstable; urgency=low + + * Fix libkmid | libkmid-alsa dep (Closes: #107585) + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 03 Aug 2001 11:28:00 -0700 + +meta-kde (4:2.1.43) unstable; urgency=low + + * Fix typo (Closes: #107371) + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 01 Aug 2001 09:49:00 -0700 + +meta-kde (4:2.1.42) unstable; urgency=low + + * br translations for debconf (Closes: #107033) + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 30 Jul 2001 00:58:00 -0700 + +meta-kde (4:2.1.41) unstable; urgency=low + + * Remove kamera...got ahead of myself + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 27 Jul 2001 20:27:00 -0700 + +meta-kde (4:2.1.40) unstable; urgency=low + + * Remove ksysctrl + * Update note about NVidia drivers in howto + * Add kamera + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 27 Jul 2001 00:49:00 -0700 + +meta-kde (4:2.1.39) unstable; urgency=low + + * Remove old dep on ktimemon + * Update descriptions + * Fix deps (Closes: #106425) + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 25 Jul 2001 03:37:00 -0700 + +meta-kde (4:2.1.38) unstable; urgency=low + + * Set some versioning for certain key packages + * add some or's (Closes: #96809) + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 19 Jul 2001 14:36:00 -0700 + +meta-kde (4:2.1.37) unstable; urgency=low + + * Get rid of task- prefixes since they are closer to meta packages than + tasks and tasks are handled differently now + * Change source package name to meta-kde to avoid confusion + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 17 Jul 2001 13:47:00 -0700 + +task-kde (4:2.1.36) unstable; urgency=low + + * Fix typo - thanks Martin Sj|gren <md9ms@mdstud.chalmers.se> + * Swedish tranlations (Closes: #103141) + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 02 Jul 2001 23:00:00 -0700 + +task-kde (4:2.1.35) unstable; urgency=low + + * kworldwatch -> kworldclock + * add kdeartwork and the addons bits + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 29 Jun 2001 20:00:00 -0700 + +task-kde (4:2.1.34) unstable; urgency=low + + * Update for 2.2 + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 28 Jun 2001 22:15:00 -0700 + +task-kde (4:2.1.33) unstable; urgency=low + + * Add konverse (Closes: #101037) + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 18 Jun 2001 22:15:00 -0700 + +task-kde (4:2.1.32) unstable; urgency=low + + * Add kleandisk (Closes: #98175) + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 23 May 2001 12:06:00 -0700 + +task-kde (4:2.1.31) unstable; urgency=low + + * Add keuklid (Closes: #98046) + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 22 May 2001 00:35:00 -0700 + +task-kde (4:2.1.30) unstable; urgency=low + + * Fix task issue (Closes: #97308, #97309) + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 13 May 2001 02:10:00 -0700 + +task-kde (4:2.1.29) unstable; urgency=low + + * New depends: kscreensaver, kdebase-audiolibs + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 12 May 2001 01:11:00 -0700 + +task-kde (4:2.1.28) unstable; urgency=low + + * new translations for debconf (Closes: #96515) + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 06 May 2001 18:22:00 -0700 + +task-kde (4:2.1.27) unstable; urgency=low + + * Add kweather (Closes: #96370) + * Happy birthday dad! + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 05 May 2001 02:13:00 -0700 + +task-kde (4:2.1.26) unstable; urgency=low + + * More dependency updates + * Update descriptions + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 04 May 2001 03:53:00 -0700 + +task-kde (4:2.1.24) unstable; urgency=low + + * Major cleanup + Removed all |'s from task packages + Removed all Suggests from task packages + Removed all Recommends from task packages + New task-kde-extras package which will contain all non-essential kde + packages including those considered to *possibly* open up security + risks such as required a ftp server or a talkd server. + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 02 May 2001 00:27:00 -0700 + +task-kde (4:2.1.23) unstable; urgency=low + + * Change Recommends to Suggests for ktalkd (Closes: #95661) + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 28 Apr 2001 17:46:00 -0700 + +task-kde (4:2.1.22) unstable; urgency=low + + * Changing AA package name to anti-aliasing-howto to keep the task bigots + of my ass. + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 28 Apr 2001 03:22:00 -0700 + +task-kde (4:2.1.21) unstable; urgency=low + + * More dependency work + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 24 Apr 2001 17:42:00 -0700 + +task-kde (4:2.1.20) unstable; urgency=low + + * Do kdevelop | kdestudio (Closes: #94377) + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 19 Apr 2001 10:43:00 -0700 + +task-kde (4:2.1.19) unstable; urgency=low + + * More depends movement. + Move Recommends parts in -dev package to Depends + Move koffice to Recommends from Depends as it's not an official release + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 18 Apr 2001 01:03:00 -0700 + +task-kde (4:2.1.18) unstable; urgency=low + + * Change Depends to Recommends for xfs since it's not required + * Add in german debconf bit (Closes: #94086) + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 15 Apr 2001 20:10:00 -0700 + +task-kde (4:2.1.17) unstable; urgency=low + + * Replace individual koffice packages with single "koffice" package + * Move a few packages from Suggests to Depends + * Change Recommends to Depends for task-kde-games + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 14 Apr 2001 00:27:00 -0700 + +task-kde (4:2.1.16) unstable; urgency=low + + * Add link to Linux Planet tutorial on AA + * Add link to Keith Packard's web page + * Add in bit to XftConfig example for turning of AA for font sizes smaller + than 11pixels. Submitted by Christian Mayrhuber + * Add cervisia to task-kde-devel package + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 08 Apr 2001 04:44:00 -0700 + +task-kde (4:2.1.15) unstable; urgency=low + + * Update font pathing in XftConfig and README + * Re-arrange some of the depends for task-anti-aliasing due to some of the + items being contrib and non-free. Make all but necessary fonts Suggests. + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 08 Apr 2001 04:44:00 -0700 + +task-kde (4:2.1.14) unstable; urgency=low + + * Add kaim + * Add kyahoo + * Add aethera + * New package: task-anti-aliasing + This will depend on packages required for AA (Anti Aliasing) support + as well as other suggests/recommends. Added documentation and eventual + debconf configuration and checks to make sure basic items are setup. + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 07 Apr 2001 03:34:00 -0700 + +task-kde (4:2.1.13) unstable; urgency=low + + * Move klisa from depends to recommends + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 02 Apr 2001 10:10:00 -0700 + +task-kde (4:2.1.12) unstable; urgency=low + + * Add kcpuload to suggests (Closes: #92016) + * Rearrange kdesdk deps (Closes: #92017) + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 30 Mar 2001 21:22:00 -0700 + +task-kde (4:2.1.11) unstable; urgency=low + + * Change dependency for lisa to klisa and moving to depends + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 27 Mar 2001 03:42:00 -0700 + +task-kde (4:2.1.10) unstable; urgency=low + + * New package: task-kde-games which will act like the task-gnome-games and + will recommend all kde based games or toys + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 26 Mar 2001 11:36:00 -0700 + +task-kde (4:2.1.9) unstable; urgency=low + + * Remove old kformula + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 11 Mar 2001 23:48:00 -0700 + +task-kde (4:2.1.8) unstable; urgency=low + + * Fix task-kde-devel depends for xlib6g|xlibs + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 11 Mar 2001 07:25:00 -0700 + +task-kde (4:2.1.7) unstable; urgency=low + + * Add other non-core kde apps to Suggests + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 08 Mar 2001 02:52:00 -0700 + +task-kde (4:2.1.6) unstable; urgency=low + + * Add Recommend for kprof (Closes: #88659) + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 05 Mar 2001 23:44:00 -0700 + +task-kde (4:2.1.5) unstable; urgency=low + + * Add in suggests/recommends for some font packages and whatnot needed for + AA use. + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 01 Mar 2001 07:23:00 -0700 + +task-kde (4:2.1.4) unstable; urgency=low + + * Take into account new qt package + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 23 Feb 2001 10:15:00 -0700 + +task-kde (4:2.1.3) unstable; urgency=low + + * Adding in depends/recommends/suggests for kdesdk and kdebindings packages + that are either in now or will be with 2.1 + * Adding in missing depends for ldap and cdparanoia -dev + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 20 Feb 2001 02:37:00 -0700 + +task-kde (4:2.1.2) unstable; urgency=low + + * Updating Depends to not include some non-base type packages and putting + them in recommends/suggests + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 19 Feb 2001 00:54:00 -0700 + +task-kde (4:2.1.1) unstable; urgency=low + + * Changing depends from libqt2.2-dev to libqt-dev and from kdelibs3-dev + to kdelibs-dev + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 15 Feb 2001 03:45:00 -0700 + +task-kde (4:2.1.0) unstable; urgency=low + + * Broke out task packages + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 09 Feb 2001 02:31:00 -0700 + +task-kde (4:2.0.0) unstable; urgency=low + + * More work on nspluginscan to avoid problems with faulty plugins + * Several small bug fixes from upstream + * Adding xutils to task-kde-devel package + * Fixing conflict with kfind (Closes: #83709) + * Fixing default bs for konsole for those not using "linux" or "vt100" + (Closes: #83705) + * Adding notation to konqueror about page about kdelibs3-crypto + * Applying German debconf template (Closes: #83871) + * Should also handle upgrade cleanup better. This is across the board but + affects base more than any other package. (Closes: #83543) + * Fixes problem with symbols in konsole (Closes: #83987) + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 28 Jan 2001 01:30:00 -0700 diff --git a/debian/lenny/metapackages/meta-tde/debian/compat b/debian/lenny/metapackages/meta-tde/debian/compat new file mode 100644 index 000000000..1e8b31496 --- /dev/null +++ b/debian/lenny/metapackages/meta-tde/debian/compat @@ -0,0 +1 @@ +6 diff --git a/debian/lenny/metapackages/meta-tde/debian/control b/debian/lenny/metapackages/meta-tde/debian/control new file mode 100644 index 000000000..12ddd9aaf --- /dev/null +++ b/debian/lenny/metapackages/meta-tde/debian/control @@ -0,0 +1,60 @@ +Source: meta-kde-trinity +Section: kde +Priority: optional +Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Sune Vuorela <debian@pusling.com>, Fathi Boudra <fabo@debian.org>, Armin Berres <trigger+debian@space-based.de> +Build-Depends: debhelper (>= 6) +Standards-Version: 3.7.3 +Homepage: http://www.kde.org + +Package: kde-trinity +Architecture: all +Section: kde +Priority: optional +Depends: kde-core-trinity (>= 5:47), kde-core-trinity (>= 5:47), kdeedu-trinity (>= 4:3.5.5), kdegames-trinity (>= 4:3.5.5), kdetoys-trinity (>= 4:3.5.5), kdeaccessibility-trinity (>= 4:3.5.5), kdeaddons-trinity (>= 4:3.5.5), kdeadmin-trinity (>= 4:3.5.5), kdeartwork-trinity (>= 4:3.5.5), kdegraphics-trinity (>= 4:3.5.5), kdemultimedia-trinity (>= 4:3.5.5), kdenetwork-trinity (>= 4:3.5.5), kdepim-trinity (>= 4:3.5.5), kdeutils-trinity (>= 4:3.5.5), kdewebdev-trinity (>= 4:3.5.5), desktop-base-trinity +Suggests: kde-i18n-trinity (>= 4:3.5.5), x-window-system-core, kdesudo-trinity, debian-kgtk-trinity +Description: the K Desktop Environment official modules [Trinity] + KDE (the K Desktop Environment) is a powerful Open Source graphical + desktop environment for Unix workstations. It combines ease of use, + contemporary functionality, and outstanding graphical design with the + technological superiority of the Unix operating system. + . + This metapackage includes all the official modules released with KDE that + are not specific to development. In addition to the core KDE modules, this + includes multimedia, networking, personal information manager (PIM), + graphics, education, games, web development, system administration tools, + and other artwork and utilities. + + +Package: kde-core-trinity +Architecture: all +Section: kde +Priority: optional +Depends: arts-trinity (>= 1.5.5), kdebase-trinity (>= 4:3.5.5), kdelibs-trinity (>= 4:3.5.5), sudo-trinity +Suggests: kde-i18n-trinity (>= 4:3.5.5) +Description: the K Desktop Environment core modules [Trinity] + KDE (the K Desktop Environment) is a powerful Open Source graphical + desktop environment for Unix workstations. It combines ease of use, + contemporary functionality, and outstanding graphical design with the + technological superiority of the Unix operating system. + . + This metapackage includes the core official modules released with KDE. This + includes just the basic desktop (browser, file manager, text editor, control + center, panel, etc.) and important libraries and data, in addition to the + aRts soundserver. + +Package: kde-devel-trinity +Architecture: all +Section: kde +Priority: optional +Depends: kde-core-trinity (>= 5:48), kdesdk-trinity (>= 4:3.5.5), libartsc0-trinity-dev (>= 1.5.5), libarts1-trinity-dev (>= 1.5.5), kdelibs4-trinity-dev (>= 4:3.5.5), kdebase-trinity-dev (>= 4:3.5.5), libkonq4-trinity-dev (>= 4:3.5.5), qt3-designer +Suggests: kde-i18n-trinity (>= 4:3.5.5), kdbg-trinity, kdevelop-trinity (>= 4:3.3.5), kprof-trinity +Description: the K Desktop Environment development files and modules [Trinity] + KDE (the K Desktop Environment) is a powerful Open Source graphical + desktop environment for Unix workstations. It combines ease of use, + contemporary functionality, and outstanding graphical design with the + technological superiority of the Unix operating system. + . + This metapackage includes official KDE modules that are useful to developers, + including KDE's software development kit (SDK), Qt3's designer tool, and all + core KDE header and development packages. diff --git a/debian/lenny/metapackages/meta-tde/debian/copyright b/debian/lenny/metapackages/meta-tde/debian/copyright new file mode 100644 index 000000000..a007b7115 --- /dev/null +++ b/debian/lenny/metapackages/meta-tde/debian/copyright @@ -0,0 +1,20 @@ +This package was created by Ivan E. Moore II <rkrusty@debian.org>. + +Copyright (C) 2001 Ivan E. Moore II +Copyright (C) 2003 Christopher L. Cheney +Copyright (C) 2004-2008 Debian Qt/KDE Maintainers + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABLILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. You should have received a +copy of the GNU General Public License along with this program; if +not, write to the Free Software Foundation, Inc, 51 Franklin St, +Fifth Floor, Boston, MA 02110-1301, USA. + +Please see /usr/share/common-licenses/GPL for the full license. diff --git a/debian/lenny/metapackages/meta-tde/debian/kde-core.README.Debian b/debian/lenny/metapackages/meta-tde/debian/kde-core.README.Debian new file mode 120000 index 000000000..903888432 --- /dev/null +++ b/debian/lenny/metapackages/meta-tde/debian/kde-core.README.Debian @@ -0,0 +1 @@ +README.Debian
\ No newline at end of file diff --git a/debian/lenny/metapackages/meta-tde/debian/kde-devel.README.Debian b/debian/lenny/metapackages/meta-tde/debian/kde-devel.README.Debian new file mode 120000 index 000000000..903888432 --- /dev/null +++ b/debian/lenny/metapackages/meta-tde/debian/kde-devel.README.Debian @@ -0,0 +1 @@ +README.Debian
\ No newline at end of file diff --git a/debian/lenny/metapackages/meta-tde/debian/kde.README.Debian b/debian/lenny/metapackages/meta-tde/debian/kde.README.Debian new file mode 120000 index 000000000..903888432 --- /dev/null +++ b/debian/lenny/metapackages/meta-tde/debian/kde.README.Debian @@ -0,0 +1 @@ +README.Debian
\ No newline at end of file diff --git a/debian/lenny/metapackages/meta-tde/debian/rules b/debian/lenny/metapackages/meta-tde/debian/rules new file mode 100755 index 000000000..a3fbf99a7 --- /dev/null +++ b/debian/lenny/metapackages/meta-tde/debian/rules @@ -0,0 +1,55 @@ +#!/usr/bin/make -f + +#export DH_VERBOSE=1 + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + +configure: configure-stamp +configure-stamp: + dh_testdir + + touch configure-stamp + +build: build-stamp + +build-stamp: configure-stamp + dh_testdir + touch $@ + +clean: + dh_testdir + dh_testroot + rm -f build-arch-stamp build-indep-stamp configure-stamp + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k -i + dh_installdirs -i + + +binary-arch: build install + +binary-indep: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installexamples +# dh_install +# dh_installinfo + dh_installman + dh_link + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure diff --git a/debian/lenny/metapackages/sudo-trinity/debian/rules b/debian/lenny/metapackages/sudo-trinity/debian/rules index 087848532..f8c89d5db 100755 --- a/debian/lenny/metapackages/sudo-trinity/debian/rules +++ b/debian/lenny/metapackages/sudo-trinity/debian/rules @@ -6,3 +6,6 @@ CFLAGS=-g -Wall -fPIC DEB_MAKE_INSTALL_TARGET := install DESTDIR="$(DEB_DESTDIR)" DEB_INSTALL_DOCS_ALL := + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) diff --git a/debian/lenny/tde-i18n/debian/control b/debian/lenny/tde-i18n/debian/control index 11d0c979e..37422390f 100644 --- a/debian/lenny/tde-i18n/debian/control +++ b/debian/lenny/tde-i18n/debian/control @@ -25,7 +25,7 @@ Replaces: kde-i18n-ar-trinity (<< 4:14.0.0) Breaks: kde-i18n-ar-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde -Provides: tde-i18n-trinity-trinity +Provides: tde-i18n-trinity Description: Arabic (ar) internationalized (i18n) files for KDE This package contains the Arabic internationalized (i18n) files for all KDE core applications. @@ -505,7 +505,7 @@ Replaces: kde-i18n-nb-trinity (<< 4:14.0.0) Breaks: kde-i18n-nb-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde -Provides: tde-i18n-trinity, tde-i18n-no +Provides: tde-i18n-trinity, tde-i18n-no-trinity Description: Norwegian Bookmal (nb) internationalized (i18n) files for KDE This package contains the Norwegian Bookmal internationalized (i18n) files for all KDE core applications. diff --git a/debian/lenny/tde-i18n/debian/rules b/debian/lenny/tde-i18n/debian/rules index e275e35df..b60af22ee 100755 --- a/debian/lenny/tde-i18n/debian/rules +++ b/debian/lenny/tde-i18n/debian/rules @@ -31,6 +31,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + debian/debiandirs: scripts/admin/debianrules perl -w scripts/admin/debianrules echodirs > debian/debiandirs @@ -107,7 +110,7 @@ binary-indep: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Below here is fairly generic really diff --git a/debian/lenny/tdeaccessibility/debian/rules b/debian/lenny/tdeaccessibility/debian/rules index f5c6caf43..4fdbdb6c3 100755 --- a/debian/lenny/tdeaccessibility/debian/rules +++ b/debian/lenny/tdeaccessibility/debian/rules @@ -18,6 +18,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := \ DEB_DH_STRIP_ARGS := --dbg-package=tdeaccessibility-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := kttsd-trinity ksayit-trinity #shlibs_ver = 4:3.5.0 diff --git a/debian/lenny/tdeaddons/debian/rules b/debian/lenny/tdeaddons/debian/rules index 5d337bfab..e2158a506 100755 --- a/debian/lenny/tdeaddons/debian/rules +++ b/debian/lenny/tdeaddons/debian/rules @@ -16,6 +16,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := --without-xmms --prefix=/opt/trinity --with-extra-l DEB_DH_STRIP_ARGS := --dbg-package=tdeaddons-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DOC_HTML_PRUNE := konq-plugins-trinity/smbmounter binary-install/konq-plugins-trinity:: diff --git a/debian/lenny/tdeadmin/debian/rules b/debian/lenny/tdeadmin/debian/rules index 9c9ccadda..849de5f21 100755 --- a/debian/lenny/tdeadmin/debian/rules +++ b/debian/lenny/tdeadmin/debian/rules @@ -14,6 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_STRIP_ARGS := --dbg-package=tdeadmin-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_CONFIGURE_EXTRA_FLAGS := \ --without-rpm --with-pam=kde --with-shadow --with-nis \ --with-private-groups --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib diff --git a/debian/lenny/tdeartwork/debian/control b/debian/lenny/tdeartwork/debian/control index 514fae94e..ee0ae9ba5 100644 --- a/debian/lenny/tdeartwork/debian/control +++ b/debian/lenny/tdeartwork/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-trinity-dev, gawk, gettext, sharutils, tdebase-trinity-dev, twin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), cmake, autotools-dev, tdelibs4-trinity-dev, gawk, gettext, sharutils, tdebase-trinity-dev, twin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies, automake, autoconf, libtool, libltdl-dev Build-Conflicts: autoconf2.13, nvidia-glx Standards-Version: 3.8.4 diff --git a/debian/lenny/tdeartwork/debian/rules b/debian/lenny/tdeartwork/debian/rules index be9adbbcd..4e236c044 100755 --- a/debian/lenny/tdeartwork/debian/rules +++ b/debian/lenny/tdeartwork/debian/rules @@ -1,6 +1,7 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk @@ -14,8 +15,22 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ARTS="ON" + DEB_DH_STRIP_ARGS := --dbg-package=tdeartwork-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + clean:: rm -f IconThemes/kdeclassic/22x22/actions/kde/kde.png rm -f IconThemes/kdeclassic/32x32/actions/kde/kde.png diff --git a/debian/lenny/tdebase/debian/80ubuntu-xmodmap b/debian/lenny/tdebase/debian/80ubuntu-xmodmap index 27a318d73..7774dd9b8 100644 --- a/debian/lenny/tdebase/debian/80ubuntu-xmodmap +++ b/debian/lenny/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/debian/lenny/tdebase/debian/control b/debian/lenny/tdebase/debian/control index 8e4b8a664..8e9942bce 100644 --- a/debian/lenny/tdebase/debian/control +++ b/debian/lenny/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], libsensors-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], libsensors-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/debian/lenny/tdebase/debian/rules b/debian/lenny/tdebase/debian/rules index a5183fe19..c72887aaa 100755 --- a/debian/lenny/tdebase/debian/rules +++ b/debian/lenny/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/debian/lenny/tdebindings/debian/rules b/debian/lenny/tdebindings/debian/rules index 6a0e11dc7..b503f7580 100755 --- a/debian/lenny/tdebindings/debian/rules +++ b/debian/lenny/tdebindings/debian/rules @@ -35,6 +35,9 @@ DEB_CONFIGURE_EXTRA_FLAGS = $(WITH_JAVA) \ DEB_COMPRESS_EXCLUDE += .java .ui .js .rb .map .wav .bmp .cpp .sk +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are not all the packages with libraries, but only those that # need to be in DEB_SHLIBDEPS_INCLUDE... PACKAGES_WITH_LIBS = libqt3-jni-trinity libsmokeqt1-trinity libsmokekde1-trinity libkjsembed1-trinity diff --git a/debian/lenny/tdeedu/debian/rules b/debian/lenny/tdeedu/debian/rules index d1258cdf0..9f81df4c0 100755 --- a/debian/lenny/tdeedu/debian/rules +++ b/debian/lenny/tdeedu/debian/rules @@ -16,6 +16,9 @@ DEB_DH_INSTALL_SOURCEDIR := $(DEB_DESTDIR) DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # Ensure that kig's python scripting built successfully. common-build-arch:: test -e $(DEB_BUILDDIR)/kig/scripting/libscripting.la diff --git a/debian/lenny/tdegames/debian/rules b/debian/lenny/tdegames/debian/rules index a979e0440..085eb8404 100755 --- a/debian/lenny/tdegames/debian/rules +++ b/debian/lenny/tdegames/debian/rules @@ -26,6 +26,9 @@ DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if DEB_INSTALL_CHANGELOGS_tdegames := $(DEB_SRCDIR)/ChangeLog +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_DH_MAKESHLIBS_ARGS_libtdegames1-trinity := -V'libtdegames1-trinity' DEB_DH_MAKESHLIBS_ARGS_atlantik-trinity := -V DEB_DH_MAKESHLIBS_ARGS_kolf-trinity := -V diff --git a/debian/lenny/tdegraphics/debian/rules b/debian/lenny/tdegraphics/debian/rules index 927f3faf8..9aedb5fcf 100755 --- a/debian/lenny/tdegraphics/debian/rules +++ b/debian/lenny/tdegraphics/debian/rules @@ -24,6 +24,9 @@ DEB_BUILD_PARALLEL = true DEB_DH_STRIP_ARGS := --dbg-package=tdegraphics-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := kfaxview-trinity kghostview-trinity kmrml-trinity kpovmodeler-trinity ksvg-trinity \ kuickshow-trinity kview-trinity kviewshell-trinity libkscan1-trinity diff --git a/debian/lenny/tdelibs/debian/rules b/debian/lenny/tdelibs/debian/rules index 3c7a4b8a7..44ac6deda 100755 --- a/debian/lenny/tdelibs/debian/rules +++ b/debian/lenny/tdelibs/debian/rules @@ -36,6 +36,9 @@ DEB_FIXPERMS_EXCLUDE := \ DEB_DH_STRIP_ARGS := --dbg-package=tdelibs-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + binary-install/tdelibs-data-trinity:: install -p -D -m644 kded/applications.menu debian/tdelibs-data-trinity/opt/trinity/etc/xdg/menus/kde-applications.menu install -p -D -m644 debian/trinitylibs.conf debian/tdelibs-data-trinity/etc/ld.so.conf.d/trinitylibs.conf diff --git a/debian/lenny/tdemultimedia/debian/rules b/debian/lenny/tdemultimedia/debian/rules index 336c7e70d..1e7e0647c 100755 --- a/debian/lenny/tdemultimedia/debian/rules +++ b/debian/lenny/tdemultimedia/debian/rules @@ -23,6 +23,9 @@ DOC_HTML_PRUNE := kcontrol-trinity DEB_DH_STRIP_ARGS := --dbg-package=tdemultimedia-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := artsbuilder-trinity tdemultimedia-kio-plugins-trinity kmid-trinity kmix-trinity krec-trinity \ libarts1-akode-trinity libarts1-audiofile-trinity libarts1-mpeglib-trinity libarts1-xine-trinity \ libkcddb1-trinity mpeglib-trinity noatun-trinity diff --git a/debian/lenny/tdenetwork/debian/control b/debian/lenny/tdenetwork/debian/control index 637a8912d..a1a2dcb2b 100644 --- a/debian/lenny/tdenetwork/debian/control +++ b/debian/lenny/tdenetwork/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>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com>, Sarah Hobbs <hobbsee@ubuntu.com>, Sune Vuorela <debian@pusling.com> -Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs4-trinity-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), cmake, autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs4-trinity-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: tdenetwork-trinity @@ -149,7 +149,7 @@ Architecture: any Replaces: kopete-trinity (<< 4:14.0.0) Breaks: kopete-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} -Recommends: qca-tls +Recommends: tqca-tls Suggests: tdeartwork-emoticons-trinity, khelpcenter-trinity, imagemagick, gnupg, gnomemeeting Description: instant messenger for Trinity Kopete is an instant messenger program which can communicate with a variety diff --git a/debian/lenny/tdenetwork/debian/control.in b/debian/lenny/tdenetwork/debian/control.in index ec41ae06a..1c7fc62f9 100644 --- a/debian/lenny/tdenetwork/debian/control.in +++ b/debian/lenny/tdenetwork/debian/control.in @@ -132,7 +132,7 @@ Package: kopete Section: tde Architecture: any Depends: ${shlibs:Depends} -Recommends: qca-tls +Recommends: tqca-tls Suggests: tdeartwork-emoticons, khelpcenter, imagemagick, gnupg, gnomemeeting Replaces: konversation (<= 0.14.0-4), sim (<= 0.9.3-2) Description: instant messenger for KDE diff --git a/debian/lenny/tdenetwork/debian/rules b/debian/lenny/tdenetwork/debian/rules index bab6267ec..2579d07e3 100755 --- a/debian/lenny/tdenetwork/debian/rules +++ b/debian/lenny/tdenetwork/debian/rules @@ -13,6 +13,7 @@ export DH_OPTIONS # include debian/cdbs/buildvars.mk include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk @@ -26,8 +27,26 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_WEBCAM="ON" \ + -DWITH_ARTS="ON" \ + -DWITH_SLP="ON" \ + -DBUILD_KOPETE_PROTOCOL_ALL="ON" \ + -DBUILD_KOPETE_PLUGIN_ALL="ON" + DEB_DH_STRIP_ARGS := --dbg-package=tdenetwork-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := librss1-trinity kopete-trinity ksirc-trinity kwifimanager-trinity #shlibs_ver = 4:3.5.0-1 diff --git a/debian/lenny/tdepim/debian/rules b/debian/lenny/tdepim/debian/rules index b20b4a7b9..0e1c5356b 100755 --- a/debian/lenny/tdepim/debian/rules +++ b/debian/lenny/tdepim/debian/rules @@ -32,6 +32,9 @@ DEB_INSTALL_DOCS_ALL := DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if test -s $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; then echo $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; break; fi; done) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + shlibs_ver=4:3.5.7 DEB_DH_MAKESHLIBS_ARGS_libindex0-trinity := -V'libindex0-trinity (>= $(shlibs_ver))' DEB_DH_MAKESHLIBS_ARGS_libkcal2b-trinity := -V'libkcal2b-trinity (>= $(shlibs_ver))' diff --git a/debian/lenny/tdesdk/debian/control b/debian/lenny/tdesdk/debian/control index 16d2c2e6b..5305f7b08 100644 --- a/debian/lenny/tdesdk/debian/control +++ b/debian/lenny/tdesdk/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>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, +Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), cmake, autotools-dev, gawk, gettext, pkg-config, tdelibs4-trinity-dev, binutils-dev, bison, flex, tdepim-trinity-dev, libapr1-dev, libkcal2-trinity-dev, libktnef1-trinity-dev, libsvn-dev, libdb-dev, diff --git a/debian/lenny/tdesdk/debian/rules b/debian/lenny/tdesdk/debian/rules index 66b946ca7..b7a449e9e 100755 --- a/debian/lenny/tdesdk/debian/rules +++ b/debian/lenny/tdesdk/debian/rules @@ -1,6 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk @@ -14,8 +15,23 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_STRIP_ARGS := --dbg-package=tdesdk-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_DBSEARCHENGINE="ON" \ + -DWITH_KCAL="ON" + PACKAGES_WITH_LIBS := kbabel-trinity kompare-trinity kspy-trinity kunittest-trinity libcvsservice0-trinity umbrello-trinity #shlibs_ver = 4:3.5.0-1 diff --git a/debian/lenny/tdetoys/debian/control b/debian/lenny/tdetoys/debian/control index e583487ae..a603814b4 100644 --- a/debian/lenny/tdetoys/debian/control +++ b/debian/lenny/tdetoys/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>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com> -Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-trinity-dev, gawk, gettext, sharutils, automake, autoconf, libtool, libltdl-dev +Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), cmake, autotools-dev, tdelibs4-trinity-dev, gawk, gettext, sharutils, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: tdetoys-trinity diff --git a/debian/lenny/tdetoys/debian/rules b/debian/lenny/tdetoys/debian/rules index 60a5a9cf4..da1268d9f 100755 --- a/debian/lenny/tdetoys/debian/rules +++ b/debian/lenny/tdetoys/debian/rules @@ -1,6 +1,7 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk @@ -14,7 +15,20 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" + DEB_DH_STRIP_ARGS := --dbg-package=tdetoys-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_INSTALL_CHANGELOGS_kodo-trinity := kodo/ChangeLog DEB_INSTALL_CHANGELOGS_kteatime-trinity := kteatime/ChangeLog diff --git a/debian/lenny/tdeutils/debian/control b/debian/lenny/tdeutils/debian/control index 8af135969..23132b0e0 100644 --- a/debian/lenny/tdeutils/debian/control +++ b/debian/lenny/tdeutils/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>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, 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, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, sharutils, automake, autoconf, libtool, libltdl-dev +Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), cmake, autotools-dev, gawk, gettext, tdelibs4-trinity-dev, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, sharutils, automake, autoconf, libtool, libltdl-dev Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc Standards-Version: 3.8.4 diff --git a/debian/lenny/tdeutils/debian/rules b/debian/lenny/tdeutils/debian/rules index f0a8e0d00..19848196e 100755 --- a/debian/lenny/tdeutils/debian/rules +++ b/debian/lenny/tdeutils/debian/rules @@ -1,6 +1,7 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk @@ -16,10 +17,32 @@ DEB_KDE_APIDOX := yes DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_DPMS="ON" \ + -DWITH_ASUS="ON" \ + -DWITH_VAIO="ON" \ + -DWITH_THINKPAD="ON" \ + -DWITH_I8K="ON" \ + -DWITH_SNMP="ON" \ + -DWITH_SENSORS="ON" \ + -DWITH_XMMS="ON" \ + -DWITH_KNEWSTUFF="ON" + DOC_HTML_PRUNE := kcontrol-trinity kinfocenter-trinity ktimer-trinity kcharselect-trinity ksim-trinity DEB_DH_STRIP_ARGS := --exclude=examples --dbg-package=tdeutils-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := khexedit-trinity klaptopdaemon-trinity kmilo-trinity kregexpeditor-trinity ksim-trinity #shlibs_ver = 4:3.5.0-1 diff --git a/debian/lenny/tdevelop/debian/control b/debian/lenny/tdevelop/debian/control index 6203fd52d..ba0e5814b 100644 --- a/debian/lenny/tdevelop/debian/control +++ b/debian/lenny/tdevelop/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Jeremy Lain <jeremy.laine@m4x.org> -Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), tdelibs4-trinity-dev, gettext, tdelibs4-trinity-doc, libtqtinterface-doc, flex, python, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, libdb-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), cmake, tdelibs4-trinity-dev, gettext, tdelibs4-trinity-doc, libtqtinterface-doc, flex, python, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, libdb-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: tdevelop-trinity diff --git a/debian/lenny/tdevelop/debian/rules b/debian/lenny/tdevelop/debian/rules index 74b304533..95a3981ea 100755 --- a/debian/lenny/tdevelop/debian/rules +++ b/debian/lenny/tdevelop/debian/rules @@ -5,6 +5,7 @@ makebuilddir:: [ -f debian/control.tmp ] || cp debian/control debian/control.tmp include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk @@ -16,6 +17,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := tdevelop-trinity DEB_KDE_ENABLE_FINAL := @@ -53,6 +57,20 @@ DEB_CONFIGURE_EXTRA_FLAGS := \ --prefix=/opt/trinity \ --with-extra-libs=/opt/trinity/lib +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_BUILDTOOL_ALL="ON" \ + -DWITH_LANGUAGE_ALL="ON" \ + -DWITH_VCS_ALL="ON" \ + -DQT_DOCDIR="/usr/share/qt3/doc/html" + binary-install/tdevelop-trinity:: mkdir -p debian/tdevelop-trinity/opt/trinity/share/pixmaps cp debian/tdevelop.xpm debian/tdevelop-trinity/opt/trinity/share/pixmaps diff --git a/debian/lenny/tdewebdev/debian/rules b/debian/lenny/tdewebdev/debian/rules index 5a5ea2fd9..ad4eb9d85 100755 --- a/debian/lenny/tdewebdev/debian/rules +++ b/debian/lenny/tdewebdev/debian/rules @@ -28,6 +28,9 @@ endif DEB_DH_STRIP_ARGS := --dbg-package=tdewebdev-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := kommander-trinity #shlibs_ver = 4:3.5.0-1 diff --git a/debian/squeeze/applications/abakus/debian/rules b/debian/squeeze/applications/abakus/debian/rules index d0a475105..c856f7cae 100755 --- a/debian/squeeze/applications/abakus/debian/rules +++ b/debian/squeeze/applications/abakus/debian/rules @@ -22,6 +22,9 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS - DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. DEB_BUILD_PARALLEL = true diff --git a/debian/squeeze/applications/abakus/debian/source/options b/debian/squeeze/applications/abakus/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/abakus/debian/source/options +++ b/debian/squeeze/applications/abakus/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 diff --git a/debian/squeeze/applications/adept/debian/rules b/debian/squeeze/applications/adept/debian/rules index ee86e8e4f..742307eb6 100755 --- a/debian/squeeze/applications/adept/debian/rules +++ b/debian/squeeze/applications/adept/debian/rules @@ -14,6 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_MAKE_CHECK_TARGET := check DEB_CONFIGURE_EXTRA_FLAGS += --enable-adept --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # Enable us to locate the old libept-trinity library and includes CPPFLAGS += -I/opt/trinity/include LDFLAGS += -L/opt/trinity/lib -lept diff --git a/debian/squeeze/applications/adept/debian/source/options b/debian/squeeze/applications/adept/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/adept/debian/source/options +++ b/debian/squeeze/applications/adept/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 diff --git a/debian/squeeze/applications/amarok.cmake/debian/source/options b/debian/squeeze/applications/amarok.cmake/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/amarok.cmake/debian/source/options +++ b/debian/squeeze/applications/amarok.cmake/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 diff --git a/debian/squeeze/applications/amarok/debian/rules b/debian/squeeze/applications/amarok/debian/rules index deb43ebf7..77b0e3159 100755 --- a/debian/squeeze/applications/amarok/debian/rules +++ b/debian/squeeze/applications/amarok/debian/rules @@ -12,6 +12,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + ### VARIABLES # Exempt amarok engines from being handled as proper public libraries # by dh_makeshlibs diff --git a/debian/squeeze/applications/amarok/debian/source/options b/debian/squeeze/applications/amarok/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/amarok/debian/source/options +++ b/debian/squeeze/applications/amarok/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 diff --git a/debian/squeeze/applications/basket/debian/rules b/debian/squeeze/applications/basket/debian/rules index 46b74ab7e..d3cf5255e 100755 --- a/debian/squeeze/applications/basket/debian/rules +++ b/debian/squeeze/applications/basket/debian/rules @@ -10,6 +10,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -101,7 +104,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/squeeze/applications/basket/debian/source/options b/debian/squeeze/applications/basket/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/basket/debian/source/options +++ b/debian/squeeze/applications/basket/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 diff --git a/debian/squeeze/applications/bibletime/debian/rules b/debian/squeeze/applications/bibletime/debian/rules index ea4b62326..4106bf0f4 100755 --- a/debian/squeeze/applications/bibletime/debian/rules +++ b/debian/squeeze/applications/bibletime/debian/rules @@ -19,6 +19,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + binary-install/bibletime-trinity:: chmod 644 debian/bibletime-trinity/opt/trinity/share/apps/bibletime/pics/* chmod 644 debian/bibletime-trinity/opt/trinity/share/apps/bibletime/bibletimeui.rc diff --git a/debian/squeeze/applications/bibletime/debian/source/options b/debian/squeeze/applications/bibletime/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/bibletime/debian/source/options +++ b/debian/squeeze/applications/bibletime/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 diff --git a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/rules b/debian/squeeze/applications/compizconfig-backend-kconfig/debian/rules index c5dd59ccb..85efaa2fa 100755 --- a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/rules +++ b/debian/squeeze/applications/compizconfig-backend-kconfig/debian/rules @@ -13,6 +13,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/source/options b/debian/squeeze/applications/compizconfig-backend-kconfig/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/source/options +++ b/debian/squeeze/applications/compizconfig-backend-kconfig/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 diff --git a/debian/squeeze/applications/desktop-effects-tde/debian/rules b/debian/squeeze/applications/desktop-effects-tde/debian/rules index 7bf3e3306..d494616db 100755 --- a/debian/squeeze/applications/desktop-effects-tde/debian/rules +++ b/debian/squeeze/applications/desktop-effects-tde/debian/rules @@ -9,5 +9,8 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + binary-install/desktop-effects-tde-trinity:: dh_pycentral -pdesktop-effects-tde-trinity diff --git a/debian/squeeze/applications/desktop-effects-tde/debian/source/options b/debian/squeeze/applications/desktop-effects-tde/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/desktop-effects-tde/debian/source/options +++ b/debian/squeeze/applications/desktop-effects-tde/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 diff --git a/debian/squeeze/applications/digikam/debian/rules b/debian/squeeze/applications/digikam/debian/rules index 4edd6e763..76fa321bc 100755 --- a/debian/squeeze/applications/digikam/debian/rules +++ b/debian/squeeze/applications/digikam/debian/rules @@ -15,6 +15,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine TARBALL_EXT=tar.bz2 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_CONFIGURE_EXTRA_FLAGS := --without-included-sqlite3 --prefix=/opt/trinity --disable-static DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" diff --git a/debian/squeeze/applications/digikam/debian/source/options b/debian/squeeze/applications/digikam/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/digikam/debian/source/options +++ b/debian/squeeze/applications/digikam/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 diff --git a/debian/squeeze/applications/dolphin/debian/rules b/debian/squeeze/applications/dolphin/debian/rules index 1534d2f29..66ea98891 100755 --- a/debian/squeeze/applications/dolphin/debian/rules +++ b/debian/squeeze/applications/dolphin/debian/rules @@ -18,6 +18,9 @@ include debian/cdbs/debian-qt-kde.mk DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + binary-install/dolphin-trinity:: mkdir -p debian/dolphin-trinity/opt/trinity/bin ln -s d3lphin debian/dolphin-trinity/opt/trinity/bin/dolphin diff --git a/debian/squeeze/applications/dolphin/debian/source/options b/debian/squeeze/applications/dolphin/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/dolphin/debian/source/options +++ b/debian/squeeze/applications/dolphin/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 diff --git a/debian/squeeze/applications/filelight-l10n/debian/rules b/debian/squeeze/applications/filelight-l10n/debian/rules index 9255102ce..84a2f4975 100755 --- a/debian/squeeze/applications/filelight-l10n/debian/rules +++ b/debian/squeeze/applications/filelight-l10n/debian/rules @@ -19,6 +19,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/usr/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/squeeze/applications/filelight-l10n/debian/source/options b/debian/squeeze/applications/filelight-l10n/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/filelight-l10n/debian/source/options +++ b/debian/squeeze/applications/filelight-l10n/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 diff --git a/debian/squeeze/applications/filelight/debian/rules b/debian/squeeze/applications/filelight/debian/rules index 247e26b9d..efa61f0f7 100755 --- a/debian/squeeze/applications/filelight/debian/rules +++ b/debian/squeeze/applications/filelight/debian/rules @@ -20,6 +20,9 @@ DEB_DH_ALWAYS_EXCLUDE=.svn DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --disable-debug +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/squeeze/applications/filelight/debian/source/options b/debian/squeeze/applications/filelight/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/filelight/debian/source/options +++ b/debian/squeeze/applications/filelight/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 diff --git a/debian/squeeze/applications/fusion-icon/debian/rules b/debian/squeeze/applications/fusion-icon/debian/rules index 5d3ed1e14..8c79610db 100755 --- a/debian/squeeze/applications/fusion-icon/debian/rules +++ b/debian/squeeze/applications/fusion-icon/debian/rules @@ -7,6 +7,9 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/python-distutils-custom.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + binary-install/fusion-icon-trinity:: mkdir -p debian/fusion-icon-trinity/usr/local/lib cp -Rp debian/fusion-icon-trinity/usr/local/* debian/fusion-icon-trinity/usr/ diff --git a/debian/squeeze/applications/fusion-icon/debian/source/options b/debian/squeeze/applications/fusion-icon/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/fusion-icon/debian/source/options +++ b/debian/squeeze/applications/fusion-icon/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 diff --git a/debian/squeeze/applications/gtk-qt-engine/debian/rules b/debian/squeeze/applications/gtk-qt-engine/debian/rules index 20c8468ec..8c78b986c 100755 --- a/debian/squeeze/applications/gtk-qt-engine/debian/rules +++ b/debian/squeeze/applications/gtk-qt-engine/debian/rules @@ -27,6 +27,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + binary-install/gtk-qt-engine-trinity:: mkdir -p $(CURDIR)/debian/gtk-qt-engine-trinity/opt/trinity/share/kgtk/ cp -Rp $(CURDIR)/debian/.gtkrc-2.0-kde4 $(CURDIR)/debian/gtk-qt-engine-trinity/opt/trinity/share/kgtk/ diff --git a/debian/squeeze/applications/gtk-qt-engine/debian/source/options b/debian/squeeze/applications/gtk-qt-engine/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/gtk-qt-engine/debian/source/options +++ b/debian/squeeze/applications/gtk-qt-engine/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 diff --git a/debian/squeeze/applications/gtk3-tqt-engine/debian/rules b/debian/squeeze/applications/gtk3-tqt-engine/debian/rules index 242fb2c84..9bed17b05 100755 --- a/debian/squeeze/applications/gtk3-tqt-engine/debian/rules +++ b/debian/squeeze/applications/gtk3-tqt-engine/debian/rules @@ -11,6 +11,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/squeeze/applications/gwenview-i18n/debian/rules b/debian/squeeze/applications/gwenview-i18n/debian/rules index ef4e97ec1..3070a9c9d 100755 --- a/debian/squeeze/applications/gwenview-i18n/debian/rules +++ b/debian/squeeze/applications/gwenview-i18n/debian/rules @@ -9,6 +9,9 @@ include /usr/share/cdbs/1/rules/utils.mk -include debian/debiandirs +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_INSTALL_DOCS_ALL := DOC_LANGS = da de et fr it nl pl pt ru sv pt_BR diff --git a/debian/squeeze/applications/gwenview-i18n/debian/source/options b/debian/squeeze/applications/gwenview-i18n/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/gwenview-i18n/debian/source/options +++ b/debian/squeeze/applications/gwenview-i18n/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 diff --git a/debian/squeeze/applications/gwenview/debian/rules b/debian/squeeze/applications/gwenview/debian/rules index 447938cef..d6423c512 100755 --- a/debian/squeeze/applications/gwenview/debian/rules +++ b/debian/squeeze/applications/gwenview/debian/rules @@ -18,6 +18,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := --enable-kipi --enable-final --prefix=/opt/trinity DEB_INSTALL_DOCS_ALL := DEB_INSTALL_CHANGELOGS_ALL := NEWS +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_DH_MAKESHLIBS_ARGS_ALL := -V DEB_SHLIBDEPS_INCLUDE = debian/gwenview-trinity/opt/trinity/lib diff --git a/debian/squeeze/applications/gwenview/debian/source/options b/debian/squeeze/applications/gwenview/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/gwenview/debian/source/options +++ b/debian/squeeze/applications/gwenview/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 diff --git a/debian/squeeze/applications/k3b-i18n/debian/rules b/debian/squeeze/applications/k3b-i18n/debian/rules index 2048362b9..1e6d35926 100755 --- a/debian/squeeze/applications/k3b-i18n/debian/rules +++ b/debian/squeeze/applications/k3b-i18n/debian/rules @@ -15,6 +15,9 @@ DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_INFODIR := /opt/trinity/share/info +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -102,7 +105,7 @@ binary-indep: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb -- -Z bzip2 + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture-dependent files here. binary-arch: build install diff --git a/debian/squeeze/applications/k3b-i18n/debian/source/options b/debian/squeeze/applications/k3b-i18n/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/k3b-i18n/debian/source/options +++ b/debian/squeeze/applications/k3b-i18n/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 diff --git a/debian/squeeze/applications/k3b/debian/control b/debian/squeeze/applications/k3b/debian/control index 20733a1f0..d15a1e0fe 100644 --- a/debian/squeeze/applications/k3b/debian/control +++ b/debian/squeeze/applications/k3b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Francois Marier <francois@debian.org>, Fathi Boudra <fabo@debian.org> -Build-Depends: libdvdread4, libdvdread-dev, alsa, libasound2-dev, lame, libmp3lame-dev, debhelper (>= 6), cdbs (>= 0.4.52ubuntu18), tdelibs4-trinity-dev (>= 3.5.0), libflac++-dev (>= 1.1.2), flac, libdbus-tqt-1-dev, libhal-dev (>= 0.5.5.1), libhal-storage-dev (>= 0.5.5.1), libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmusicbrainz4-dev (>= 2.1.1-4.1), libmad0-dev, chrpath, libavformat-dev, libavcodec-dev, libvorbis-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: libdvdread4, libdvdread-dev, alsa, libasound2-dev, lame, libmp3lame-dev, debhelper (>= 6), cdbs (>= 0.4.52ubuntu18), tdelibs4-trinity-dev (>= 3.5.0), libflac++-dev (>= 1.1.2), flac, libdbus-tqt-1-dev, libhal-dev (>= 0.5.5.1), libhal-storage-dev (>= 0.5.5.1), libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmad0-dev, chrpath, libavformat-dev, libavcodec-dev, libvorbis-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://www.k3b.org diff --git a/debian/squeeze/applications/k3b/debian/rules b/debian/squeeze/applications/k3b/debian/rules index 3a19a0ec8..cc895cd83 100755 --- a/debian/squeeze/applications/k3b/debian/rules +++ b/debian/squeeze/applications/k3b/debian/rules @@ -17,6 +17,9 @@ DEB_INSTALL_MANPAGES_k3b = debian/k3b.1 DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/tmp/ +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/squeeze/applications/k3b/debian/source/options b/debian/squeeze/applications/k3b/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/k3b/debian/source/options +++ b/debian/squeeze/applications/k3b/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 diff --git a/debian/squeeze/applications/k9copy/debian/rules b/debian/squeeze/applications/k9copy/debian/rules index 0887c2d07..5f97b6de2 100755 --- a/debian/squeeze/applications/k9copy/debian/rules +++ b/debian/squeeze/applications/k9copy/debian/rules @@ -15,6 +15,9 @@ DEB_INSTALL_MANPAGES_k9copy = k9copy-trinity.1 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/squeeze/applications/k9copy/debian/source/options b/debian/squeeze/applications/k9copy/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/k9copy/debian/source/options +++ b/debian/squeeze/applications/k9copy/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 diff --git a/debian/squeeze/applications/kaffeine-mozilla/debian/rules b/debian/squeeze/applications/kaffeine-mozilla/debian/rules index 80fe9807b..c04c761e2 100755 --- a/debian/squeeze/applications/kaffeine-mozilla/debian/rules +++ b/debian/squeeze/applications/kaffeine-mozilla/debian/rules @@ -14,6 +14,9 @@ export DH_OPTIONS DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity @@ -177,7 +180,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/squeeze/applications/kaffeine-mozilla/debian/source/options b/debian/squeeze/applications/kaffeine-mozilla/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/kaffeine-mozilla/debian/source/options +++ b/debian/squeeze/applications/kaffeine-mozilla/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 diff --git a/debian/squeeze/applications/kaffeine/debian/rules b/debian/squeeze/applications/kaffeine/debian/rules index 7791988e7..9021f8fb0 100755 --- a/debian/squeeze/applications/kaffeine/debian/rules +++ b/debian/squeeze/applications/kaffeine/debian/rules @@ -17,6 +17,9 @@ DEB_INSTALL_MANPAGES_kaffeine-trinity := debian/kaffeine.1 DEB_FIXPERMS_EXCLUDE := install-css.sh install-codecs +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/squeeze/applications/kaffeine/debian/source/options b/debian/squeeze/applications/kaffeine/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/kaffeine/debian/source/options +++ b/debian/squeeze/applications/kaffeine/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 diff --git a/debian/squeeze/applications/katapult/debian/rules b/debian/squeeze/applications/katapult/debian/rules index 6340f855d..779671876 100755 --- a/debian/squeeze/applications/katapult/debian/rules +++ b/debian/squeeze/applications/katapult/debian/rules @@ -14,6 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine export KUBUNTU_DESKTOP_POT=extragear-utils_katapult DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + cleanbuilddir/katapult-trinity:: rm -f katapult.1 diff --git a/debian/squeeze/applications/katapult/debian/source/options b/debian/squeeze/applications/katapult/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/katapult/debian/source/options +++ b/debian/squeeze/applications/katapult/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 diff --git a/debian/squeeze/applications/kbarcode/debian/rules b/debian/squeeze/applications/kbarcode/debian/rules index b8267f39c..cdbae3c90 100755 --- a/debian/squeeze/applications/kbarcode/debian/rules +++ b/debian/squeeze/applications/kbarcode/debian/rules @@ -16,6 +16,9 @@ DEB_INSTALL_MANPAGES_kbarcode-trinity := debian/kbarcode.1 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/squeeze/applications/kbarcode/debian/source/options b/debian/squeeze/applications/kbarcode/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/kbarcode/debian/source/options +++ b/debian/squeeze/applications/kbarcode/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 diff --git a/debian/squeeze/applications/kbfx/debian/rules b/debian/squeeze/applications/kbfx/debian/rules index 2bffe9b78..97b64d997 100755 --- a/debian/squeeze/applications/kbfx/debian/rules +++ b/debian/squeeze/applications/kbfx/debian/rules @@ -24,6 +24,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CMAKE_EXTRA_FLAGS = -DLIB_SUFFIX="" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DCMAKE_INSTALL_PREFIX="/opt/trinity/" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + get-orig-source: @@dh_testdir @@[ -d ../tarballs/. ] @@ -74,6 +77,6 @@ binary-arch: build dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch diff --git a/debian/squeeze/applications/kbfx/debian/source/options b/debian/squeeze/applications/kbfx/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/kbfx/debian/source/options +++ b/debian/squeeze/applications/kbfx/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 diff --git a/debian/squeeze/applications/kbookreader/debian/rules b/debian/squeeze/applications/kbookreader/debian/rules index 6f4a82d1b..53794c4fe 100755 --- a/debian/squeeze/applications/kbookreader/debian/rules +++ b/debian/squeeze/applications/kbookreader/debian/rules @@ -13,6 +13,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/squeeze/applications/kbookreader/debian/source/options b/debian/squeeze/applications/kbookreader/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/kbookreader/debian/source/options +++ b/debian/squeeze/applications/kbookreader/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 diff --git a/debian/squeeze/applications/kchmviewer/debian/rules b/debian/squeeze/applications/kchmviewer/debian/rules index a496effa9..c22afc5a3 100755 --- a/debian/squeeze/applications/kchmviewer/debian/rules +++ b/debian/squeeze/applications/kchmviewer/debian/rules @@ -16,6 +16,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -114,7 +117,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/squeeze/applications/kchmviewer/debian/source/options b/debian/squeeze/applications/kchmviewer/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/kchmviewer/debian/source/options +++ b/debian/squeeze/applications/kchmviewer/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 diff --git a/debian/squeeze/applications/kcmautostart/debian/rules b/debian/squeeze/applications/kcmautostart/debian/rules index 242fb2c84..9bed17b05 100644..100755 --- a/debian/squeeze/applications/kcmautostart/debian/rules +++ b/debian/squeeze/applications/kcmautostart/debian/rules @@ -11,6 +11,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/squeeze/applications/kcmldap/debian/changelog b/debian/squeeze/applications/kcmldap/debian/changelog new file mode 100644 index 000000000..a47452e9c --- /dev/null +++ b/debian/squeeze/applications/kcmldap/debian/changelog @@ -0,0 +1,5 @@ +kcontrol-ldapbonding-trinity (0.5-0ubuntu0) karmic; urgency=low + + * Karmic rebuild + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 02 July 2009 16:08:00 -0600 diff --git a/debian/squeeze/applications/kcmldap/debian/compat b/debian/squeeze/applications/kcmldap/debian/compat new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/debian/squeeze/applications/kcmldap/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/squeeze/applications/kcmldap/debian/control b/debian/squeeze/applications/kcmldap/debian/control new file mode 100644 index 000000000..de711caf1 --- /dev/null +++ b/debian/squeeze/applications/kcmldap/debian/control @@ -0,0 +1,13 @@ +Source: kcontrol-ldapbonding-trinity +Section: tde +Priority: optional +Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +XSBC-Original-Maintainer: Raphaël Pinson <raphink@raphink.net> +Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, libtdeldap-trinity-dev, automake, autoconf, libtool, libltdl-dev +Standards-Version: 3.8.4 + +Package: kcontrol-ldapbonding-trinity +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, libpam-krb5, libpam-ldap, nss-updatedb, libpam-ccreds +Description: LDAP control module for the TDE control center + LDAP is a TDE control center module to manage TDE connections to LDAP realms. diff --git a/debian/squeeze/applications/kcmldap/debian/copyright b/debian/squeeze/applications/kcmldap/debian/copyright new file mode 100644 index 000000000..540709e87 --- /dev/null +++ b/debian/squeeze/applications/kcmldap/debian/copyright @@ -0,0 +1,31 @@ +This package was debianized by Timothy Pearson <kb9vqf@pearsoncomputing.net> on +Thu, 17 May 2012 19:52:51 +0100. + +It was downloaded from http://www.trinitydesktop.org + +Upstream Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> + +copyright (C) 2012 Timothy Pearson <kb9vqf@pearsoncomputing.net> + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +The Debian packaging is (C) 2012, Timothy Pearson <kb9vqf@pearsoncomputing.net> and +is licensed under the GPL, see above. + diff --git a/debian/squeeze/applications/kcmldap/debian/rules b/debian/squeeze/applications/kcmldap/debian/rules new file mode 100755 index 000000000..9bed17b05 --- /dev/null +++ b/debian/squeeze/applications/kcmldap/debian/rules @@ -0,0 +1,27 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/debhelper.mk + +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde +DEB_CONFIGURE_MANDIR := /opt/trinity/share/man +DEB_CONFIGURE_PREFIX := /opt/trinity +DEB_CONFIGURE_INFODIR := /opt/trinity/share/info + +cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + +post-patches:: debian/stamp-bootstrap + +debian/stamp-bootstrap: + ! [ -f /usr/share/libtool/ltmain.sh ] || \ + cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh + ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ + cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh + cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in + + make -f admin/Makefile.common cvs + touch debian/stamp-bootstrap diff --git a/debian/squeeze/applications/kcmldapcontroller/debian/changelog b/debian/squeeze/applications/kcmldapcontroller/debian/changelog new file mode 100644 index 000000000..5ab6125c1 --- /dev/null +++ b/debian/squeeze/applications/kcmldapcontroller/debian/changelog @@ -0,0 +1,5 @@ +kcontrol-ldap-controller-trinity (0.5-0ubuntu0) karmic; urgency=low + + * Karmic rebuild + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 02 July 2009 16:08:00 -0600 diff --git a/debian/squeeze/applications/kcmldapcontroller/debian/compat b/debian/squeeze/applications/kcmldapcontroller/debian/compat new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/debian/squeeze/applications/kcmldapcontroller/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/squeeze/applications/kcmldapcontroller/debian/control b/debian/squeeze/applications/kcmldapcontroller/debian/control new file mode 100644 index 000000000..7cbb384bc --- /dev/null +++ b/debian/squeeze/applications/kcmldapcontroller/debian/control @@ -0,0 +1,12 @@ +Source: kcontrol-ldap-controller-trinity +Section: tde +Priority: optional +Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, libldap2-dev, libtdeldap-trinity-dev, automake, autoconf, libtool, libltdl-dev +Standards-Version: 3.8.4 + +Package: kcontrol-ldap-controller-trinity +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, heimdal-kdc, slapd, libsasl2-modules-gssapi-heimdal, sasl2-bin, openssl +Description: LDAP realm controller module for the TDE control center + LDAP Controller is a TDE control center module to configure an LDAP Realm Controller diff --git a/debian/squeeze/applications/kcmldapcontroller/debian/copyright b/debian/squeeze/applications/kcmldapcontroller/debian/copyright new file mode 100644 index 000000000..540709e87 --- /dev/null +++ b/debian/squeeze/applications/kcmldapcontroller/debian/copyright @@ -0,0 +1,31 @@ +This package was debianized by Timothy Pearson <kb9vqf@pearsoncomputing.net> on +Thu, 17 May 2012 19:52:51 +0100. + +It was downloaded from http://www.trinitydesktop.org + +Upstream Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> + +copyright (C) 2012 Timothy Pearson <kb9vqf@pearsoncomputing.net> + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +The Debian packaging is (C) 2012, Timothy Pearson <kb9vqf@pearsoncomputing.net> and +is licensed under the GPL, see above. + diff --git a/debian/squeeze/applications/kcmldapcontroller/debian/rules b/debian/squeeze/applications/kcmldapcontroller/debian/rules new file mode 100755 index 000000000..9bed17b05 --- /dev/null +++ b/debian/squeeze/applications/kcmldapcontroller/debian/rules @@ -0,0 +1,27 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/debhelper.mk + +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde +DEB_CONFIGURE_MANDIR := /opt/trinity/share/man +DEB_CONFIGURE_PREFIX := /opt/trinity +DEB_CONFIGURE_INFODIR := /opt/trinity/share/info + +cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + +post-patches:: debian/stamp-bootstrap + +debian/stamp-bootstrap: + ! [ -f /usr/share/libtool/ltmain.sh ] || \ + cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh + ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ + cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh + cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in + + make -f admin/Makefile.common cvs + touch debian/stamp-bootstrap diff --git a/debian/squeeze/applications/kcmldapmanager/debian/changelog b/debian/squeeze/applications/kcmldapmanager/debian/changelog new file mode 100644 index 000000000..b73c248b8 --- /dev/null +++ b/debian/squeeze/applications/kcmldapmanager/debian/changelog @@ -0,0 +1,5 @@ +kcontrol-ldap-manager-trinity (0.5-0ubuntu0) karmic; urgency=low + + * Karmic rebuild + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 02 July 2009 16:08:00 -0600 diff --git a/debian/squeeze/applications/kcmldapmanager/debian/compat b/debian/squeeze/applications/kcmldapmanager/debian/compat new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/debian/squeeze/applications/kcmldapmanager/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/squeeze/applications/kcmldapmanager/debian/control b/debian/squeeze/applications/kcmldapmanager/debian/control new file mode 100644 index 000000000..b84e5e4c3 --- /dev/null +++ b/debian/squeeze/applications/kcmldapmanager/debian/control @@ -0,0 +1,12 @@ +Source: kcontrol-ldap-manager-trinity +Section: tde +Priority: optional +Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, libldap2-dev, libtdeldap-trinity-dev, automake, autoconf, libtool, libltdl-dev +Standards-Version: 3.8.4 + +Package: kcontrol-ldap-manager-trinity +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients +Description: LDAP realm management module for the TDE control center + LDAP Manager is a TDE control center module to manage users, groups, and machines in LDAP realms. diff --git a/debian/squeeze/applications/kcmldapmanager/debian/copyright b/debian/squeeze/applications/kcmldapmanager/debian/copyright new file mode 100644 index 000000000..540709e87 --- /dev/null +++ b/debian/squeeze/applications/kcmldapmanager/debian/copyright @@ -0,0 +1,31 @@ +This package was debianized by Timothy Pearson <kb9vqf@pearsoncomputing.net> on +Thu, 17 May 2012 19:52:51 +0100. + +It was downloaded from http://www.trinitydesktop.org + +Upstream Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> + +copyright (C) 2012 Timothy Pearson <kb9vqf@pearsoncomputing.net> + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +The Debian packaging is (C) 2012, Timothy Pearson <kb9vqf@pearsoncomputing.net> and +is licensed under the GPL, see above. + diff --git a/debian/squeeze/applications/kcmldapmanager/debian/rules b/debian/squeeze/applications/kcmldapmanager/debian/rules new file mode 100755 index 000000000..9bed17b05 --- /dev/null +++ b/debian/squeeze/applications/kcmldapmanager/debian/rules @@ -0,0 +1,27 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/debhelper.mk + +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde +DEB_CONFIGURE_MANDIR := /opt/trinity/share/man +DEB_CONFIGURE_PREFIX := /opt/trinity +DEB_CONFIGURE_INFODIR := /opt/trinity/share/info + +cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + +post-patches:: debian/stamp-bootstrap + +debian/stamp-bootstrap: + ! [ -f /usr/share/libtool/ltmain.sh ] || \ + cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh + ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ + cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh + cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in + + make -f admin/Makefile.common cvs + touch debian/stamp-bootstrap diff --git a/debian/squeeze/applications/kcpuload/debian/rules b/debian/squeeze/applications/kcpuload/debian/rules index e13398f63..20eca167c 100755 --- a/debian/squeeze/applications/kcpuload/debian/rules +++ b/debian/squeeze/applications/kcpuload/debian/rules @@ -12,6 +12,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # This has to be exported to make some magic below work. export DH_OPTIONS @@ -184,7 +187,7 @@ binary-common: dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture independant packages using the common target. binary-indep: build install diff --git a/debian/squeeze/applications/kcpuload/debian/source/options b/debian/squeeze/applications/kcpuload/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/kcpuload/debian/source/options +++ b/debian/squeeze/applications/kcpuload/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 diff --git a/debian/squeeze/applications/kdbusnotification/debian/rules b/debian/squeeze/applications/kdbusnotification/debian/rules index 2acd9ab0f..94d0ad5bd 100755 --- a/debian/squeeze/applications/kdbusnotification/debian/rules +++ b/debian/squeeze/applications/kdbusnotification/debian/rules @@ -12,6 +12,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # This has to be exported to make some magic below work. export DH_OPTIONS @@ -173,7 +176,7 @@ binary-common: dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture independant packages using the common target. binary-indep: build install diff --git a/debian/squeeze/applications/kdbusnotification/debian/source/options b/debian/squeeze/applications/kdbusnotification/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/kdbusnotification/debian/source/options +++ b/debian/squeeze/applications/kdbusnotification/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 diff --git a/debian/squeeze/applications/kdiff3/debian/rules b/debian/squeeze/applications/kdiff3/debian/rules index bc64fcc06..19ea44a07 100755 --- a/debian/squeeze/applications/kdiff3/debian/rules +++ b/debian/squeeze/applications/kdiff3/debian/rules @@ -11,6 +11,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -97,7 +100,7 @@ binary-indep: build install dh_installdeb -i dh_gencontrol -i dh_md5sums -i - dh_builddeb -i + dh_builddeb -i $(DEB_DH_BUILDDEB_ARGS) # Build architecture-dependent files here. binary-arch: build install @@ -118,7 +121,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/squeeze/applications/kdiff3/debian/source/options b/debian/squeeze/applications/kdiff3/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/kdiff3/debian/source/options +++ b/debian/squeeze/applications/kdiff3/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 diff --git a/debian/squeeze/applications/kdirstat/debian/rules b/debian/squeeze/applications/kdirstat/debian/rules index b15f5a9a5..8c0a950a3 100755 --- a/debian/squeeze/applications/kdirstat/debian/rules +++ b/debian/squeeze/applications/kdirstat/debian/rules @@ -13,6 +13,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + LDFLAGS += -Wl,--as-needed post-patches:: debian/stamp-bootstrap diff --git a/debian/squeeze/applications/kdirstat/debian/source/options b/debian/squeeze/applications/kdirstat/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/kdirstat/debian/source/options +++ b/debian/squeeze/applications/kdirstat/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 diff --git a/debian/squeeze/applications/kdpkg/debian/rules b/debian/squeeze/applications/kdpkg/debian/rules index ff163f6a7..455414f69 100755 --- a/debian/squeeze/applications/kdpkg/debian/rules +++ b/debian/squeeze/applications/kdpkg/debian/rules @@ -11,6 +11,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/squeeze/applications/kdpkg/debian/source/options b/debian/squeeze/applications/kdpkg/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/kdpkg/debian/source/options +++ b/debian/squeeze/applications/kdpkg/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 diff --git a/debian/squeeze/applications/keep/debian/rules b/debian/squeeze/applications/keep/debian/rules index b6eae04ee..1b5054df6 100755 --- a/debian/squeeze/applications/keep/debian/rules +++ b/debian/squeeze/applications/keep/debian/rules @@ -16,6 +16,9 @@ DEB_INSTALL_MANPAGES_keep := keep.1 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/squeeze/applications/keep/debian/source/options b/debian/squeeze/applications/keep/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/keep/debian/source/options +++ b/debian/squeeze/applications/keep/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 diff --git a/debian/squeeze/applications/kerberostray/debian/rules b/debian/squeeze/applications/kerberostray/debian/rules index 242fb2c84..9bed17b05 100755 --- a/debian/squeeze/applications/kerberostray/debian/rules +++ b/debian/squeeze/applications/kerberostray/debian/rules @@ -11,6 +11,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/squeeze/applications/kerry/debian/rules b/debian/squeeze/applications/kerry/debian/rules index 7dc0fbe23..dea466c17 100755 --- a/debian/squeeze/applications/kerry/debian/rules +++ b/debian/squeeze/applications/kerry/debian/rules @@ -16,6 +16,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit DEB_INSTALL_MANPAGES_kerry-trinity = kerry.1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + build/kerry-trinity:: docbook2x-man debian/kerry.1.docbook diff --git a/debian/squeeze/applications/kerry/debian/source/options b/debian/squeeze/applications/kerry/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/kerry/debian/source/options +++ b/debian/squeeze/applications/kerry/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 diff --git a/debian/squeeze/applications/kgtk-qt3/debian/rules b/debian/squeeze/applications/kgtk-qt3/debian/rules index 15ab99eb2..b4cb7a953 100755 --- a/debian/squeeze/applications/kgtk-qt3/debian/rules +++ b/debian/squeeze/applications/kgtk-qt3/debian/rules @@ -22,6 +22,9 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS - DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. DEB_BUILD_PARALLEL = true diff --git a/debian/squeeze/applications/kgtk-qt3/debian/source/options b/debian/squeeze/applications/kgtk-qt3/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/kgtk-qt3/debian/source/options +++ b/debian/squeeze/applications/kgtk-qt3/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 diff --git a/debian/squeeze/applications/kile/debian/rules b/debian/squeeze/applications/kile/debian/rules index 3e19a08ea..d7f547296 100755 --- a/debian/squeeze/applications/kile/debian/rules +++ b/debian/squeeze/applications/kile/debian/rules @@ -17,6 +17,9 @@ DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp DEB_INSTALL_MANPAGES_kile := debian/kile.1 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/squeeze/applications/kile/debian/source/options b/debian/squeeze/applications/kile/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/kile/debian/source/options +++ b/debian/squeeze/applications/kile/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 diff --git a/debian/squeeze/applications/kima/debian/rules b/debian/squeeze/applications/kima/debian/rules index 519575104..45e052b96 100755 --- a/debian/squeeze/applications/kima/debian/rules +++ b/debian/squeeze/applications/kima/debian/rules @@ -11,6 +11,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # Add here any variable or target overrides you need. post-patches:: debian/stamp-bootstrap diff --git a/debian/squeeze/applications/kima/debian/source/options b/debian/squeeze/applications/kima/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/kima/debian/source/options +++ b/debian/squeeze/applications/kima/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 diff --git a/debian/squeeze/applications/kio-apt/debian/rules b/debian/squeeze/applications/kio-apt/debian/rules index 9b82c21ad..93f63f8ee 100755 --- a/debian/squeeze/applications/kio-apt/debian/rules +++ b/debian/squeeze/applications/kio-apt/debian/rules @@ -14,6 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/squeeze/applications/kio-apt/debian/source/options b/debian/squeeze/applications/kio-apt/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/kio-apt/debian/source/options +++ b/debian/squeeze/applications/kio-apt/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 diff --git a/debian/squeeze/applications/kio-locate/debian/rules b/debian/squeeze/applications/kio-locate/debian/rules index 7a837110e..ecf59da08 100755 --- a/debian/squeeze/applications/kio-locate/debian/rules +++ b/debian/squeeze/applications/kio-locate/debian/rules @@ -22,6 +22,9 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS - DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. DEB_BUILD_PARALLEL = true diff --git a/debian/squeeze/applications/kio-locate/debian/source/options b/debian/squeeze/applications/kio-locate/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/kio-locate/debian/source/options +++ b/debian/squeeze/applications/kio-locate/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 diff --git a/debian/squeeze/applications/kio-umountwrapper/debian/rules b/debian/squeeze/applications/kio-umountwrapper/debian/rules index ae8903f41..6672eae5b 100755 --- a/debian/squeeze/applications/kio-umountwrapper/debian/rules +++ b/debian/squeeze/applications/kio-umountwrapper/debian/rules @@ -13,6 +13,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/squeeze/applications/kio-umountwrapper/debian/source/options b/debian/squeeze/applications/kio-umountwrapper/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/kio-umountwrapper/debian/source/options +++ b/debian/squeeze/applications/kio-umountwrapper/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 diff --git a/debian/squeeze/applications/kiosktool/debian/rules b/debian/squeeze/applications/kiosktool/debian/rules index 4e38353a1..507e5a458 100755 --- a/debian/squeeze/applications/kiosktool/debian/rules +++ b/debian/squeeze/applications/kiosktool/debian/rules @@ -11,6 +11,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/squeeze/applications/kiosktool/debian/source/options b/debian/squeeze/applications/kiosktool/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/kiosktool/debian/source/options +++ b/debian/squeeze/applications/kiosktool/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 diff --git a/debian/squeeze/applications/kmplayer/debian/rules b/debian/squeeze/applications/kmplayer/debian/rules index 63bf848d1..166ca76e2 100755 --- a/debian/squeeze/applications/kmplayer/debian/rules +++ b/debian/squeeze/applications/kmplayer/debian/rules @@ -22,6 +22,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := --enable-maintainer-mode --prefix=/opt/trinity --wi DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp DEB_INSTALL_MANPAGES_kmplayer = kmplayer.1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/squeeze/applications/kmplayer/debian/source/options b/debian/squeeze/applications/kmplayer/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/kmplayer/debian/source/options +++ b/debian/squeeze/applications/kmplayer/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 diff --git a/debian/squeeze/applications/kmyfirewall/debian/rules b/debian/squeeze/applications/kmyfirewall/debian/rules index 8fa664c8a..28035c796 100755 --- a/debian/squeeze/applications/kmyfirewall/debian/rules +++ b/debian/squeeze/applications/kmyfirewall/debian/rules @@ -13,6 +13,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -126,7 +129,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/squeeze/applications/kmyfirewall/debian/source/options b/debian/squeeze/applications/kmyfirewall/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/kmyfirewall/debian/source/options +++ b/debian/squeeze/applications/kmyfirewall/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 diff --git a/debian/squeeze/applications/kmymoney/debian/rules b/debian/squeeze/applications/kmymoney/debian/rules index 192c6019c..4c3b55cb4 100755 --- a/debian/squeeze/applications/kmymoney/debian/rules +++ b/debian/squeeze/applications/kmymoney/debian/rules @@ -13,6 +13,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde --disable-sqlite3 --disable-pdf-docs +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + LDFLAGS += -Wl,--as-needed post-patches:: debian/stamp-bootstrap diff --git a/debian/squeeze/applications/kmymoney/debian/source/options b/debian/squeeze/applications/kmymoney/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/kmymoney/debian/source/options +++ b/debian/squeeze/applications/kmymoney/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 diff --git a/debian/squeeze/applications/knemo/debian/rules b/debian/squeeze/applications/knemo/debian/rules index fd71fe17f..4fb03f005 100755 --- a/debian/squeeze/applications/knemo/debian/rules +++ b/debian/squeeze/applications/knemo/debian/rules @@ -15,6 +15,9 @@ DEB_INSTALL_DOCS_knemo = -XNEWS DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/squeeze/applications/knemo/debian/source/options b/debian/squeeze/applications/knemo/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/knemo/debian/source/options +++ b/debian/squeeze/applications/knemo/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 diff --git a/debian/squeeze/applications/knetload/debian/rules b/debian/squeeze/applications/knetload/debian/rules index f5784f7ae..d955fbe4a 100755 --- a/debian/squeeze/applications/knetload/debian/rules +++ b/debian/squeeze/applications/knetload/debian/rules @@ -9,6 +9,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -178,7 +181,7 @@ binary-common: dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture independant packages using the common target. binary-indep: build install diff --git a/debian/squeeze/applications/knetload/debian/source/options b/debian/squeeze/applications/knetload/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/knetload/debian/source/options +++ b/debian/squeeze/applications/knetload/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 diff --git a/debian/squeeze/applications/knetstats/debian/rules b/debian/squeeze/applications/knetstats/debian/rules index 7b1522933..1a573fb20 100755 --- a/debian/squeeze/applications/knetstats/debian/rules +++ b/debian/squeeze/applications/knetstats/debian/rules @@ -13,6 +13,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_MANPAGES_knetstats-trinity = knetstats.1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/squeeze/applications/knetstats/debian/source/options b/debian/squeeze/applications/knetstats/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/knetstats/debian/source/options +++ b/debian/squeeze/applications/knetstats/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 diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/source/options b/debian/squeeze/applications/knetworkmanager.cmake/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/knetworkmanager.cmake/debian/source/options +++ b/debian/squeeze/applications/knetworkmanager.cmake/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 diff --git a/debian/squeeze/applications/knetworkmanager8/debian/rules b/debian/squeeze/applications/knetworkmanager8/debian/rules index a4ba9688c..9c7e598e1 100755 --- a/debian/squeeze/applications/knetworkmanager8/debian/rules +++ b/debian/squeeze/applications/knetworkmanager8/debian/rules @@ -15,6 +15,9 @@ DEB_INSTALL_DOCS_ALL := -XNEWS -XTODO DEB_CONFIGURE_EXTRA_FLAGS := --with-openvpn --with-vpnc --with-pptp +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/squeeze/applications/knetworkmanager8/debian/source/options b/debian/squeeze/applications/knetworkmanager8/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/knetworkmanager8/debian/source/options +++ b/debian/squeeze/applications/knetworkmanager8/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 diff --git a/debian/squeeze/applications/knetworkmanager9/debian/rules b/debian/squeeze/applications/knetworkmanager9/debian/rules index c9fa2b866..00ac9877f 100755 --- a/debian/squeeze/applications/knetworkmanager9/debian/rules +++ b/debian/squeeze/applications/knetworkmanager9/debian/rules @@ -20,6 +20,9 @@ DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" - DEB_INSTALL_DOCS_ALL := -XNEWS -XTODO +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + binary-install/network-manager-kde-trinity:: # Install autostart file install -D -m 644 tdenetworkmanager-0.8/src/tdenetworkmanager.desktop \ diff --git a/debian/squeeze/applications/knetworkmanager9/debian/source/options b/debian/squeeze/applications/knetworkmanager9/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/knetworkmanager9/debian/source/options +++ b/debian/squeeze/applications/knetworkmanager9/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 diff --git a/debian/squeeze/applications/knights/debian/rules b/debian/squeeze/applications/knights/debian/rules index ab81cb6e3..f4f406c79 100755 --- a/debian/squeeze/applications/knights/debian/rules +++ b/debian/squeeze/applications/knights/debian/rules @@ -13,6 +13,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -107,7 +110,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/squeeze/applications/knights/debian/source/options b/debian/squeeze/applications/knights/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/knights/debian/source/options +++ b/debian/squeeze/applications/knights/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 diff --git a/debian/squeeze/applications/knowit/debian/rules b/debian/squeeze/applications/knowit/debian/rules index 3ed456df4..0a090fdb6 100755 --- a/debian/squeeze/applications/knowit/debian/rules +++ b/debian/squeeze/applications/knowit/debian/rules @@ -14,6 +14,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -95,7 +98,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/squeeze/applications/knowit/debian/source/options b/debian/squeeze/applications/knowit/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/knowit/debian/source/options +++ b/debian/squeeze/applications/knowit/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 diff --git a/debian/squeeze/applications/knutclient/debian/rules b/debian/squeeze/applications/knutclient/debian/rules index ad89a9108..0d07992cf 100755 --- a/debian/squeeze/applications/knutclient/debian/rules +++ b/debian/squeeze/applications/knutclient/debian/rules @@ -18,6 +18,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -127,7 +130,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/squeeze/applications/knutclient/debian/source/options b/debian/squeeze/applications/knutclient/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/knutclient/debian/source/options +++ b/debian/squeeze/applications/knutclient/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 diff --git a/debian/squeeze/applications/koffice-i18n/debian/rules b/debian/squeeze/applications/koffice-i18n/debian/rules index 9bb59484f..478c97b9d 100755 --- a/debian/squeeze/applications/koffice-i18n/debian/rules +++ b/debian/squeeze/applications/koffice-i18n/debian/rules @@ -3,6 +3,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + languages = `ls -1d *i18n*` build-stamp: @@ -81,7 +84,7 @@ binary-indep: build dh_installdeb dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep diff --git a/debian/squeeze/applications/koffice-i18n/debian/source/options b/debian/squeeze/applications/koffice-i18n/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/koffice-i18n/debian/source/options +++ b/debian/squeeze/applications/koffice-i18n/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 diff --git a/debian/squeeze/applications/koffice/debian/rules b/debian/squeeze/applications/koffice/debian/rules index b166e12e4..ed91a11c3 100755 --- a/debian/squeeze/applications/koffice/debian/rules +++ b/debian/squeeze/applications/koffice/debian/rules @@ -17,6 +17,9 @@ DEB_KDE_APIDOX := no DEB_DH_STRIP_ARGS := --dbg-package=koffice-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := karbon-trinity kchart-trinity kivio-trinity koffice-libs-trinity chalk-trinity kspread-trinity kugar-trinity kthesaurus-trinity DEB_INSTALL_CHANGELOGS_karbon-trinity := karbon/CHANGES diff --git a/debian/squeeze/applications/koffice/debian/source/options b/debian/squeeze/applications/koffice/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/koffice/debian/source/options +++ b/debian/squeeze/applications/koffice/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 diff --git a/debian/squeeze/applications/konversation/debian/rules b/debian/squeeze/applications/konversation/debian/rules index 359d5f809..0e973a150 100755 --- a/debian/squeeze/applications/konversation/debian/rules +++ b/debian/squeeze/applications/konversation/debian/rules @@ -15,6 +15,9 @@ DEB_DH_STRIP_ARGS := --dbg-package=konversation-trinity-dbg DEB_INSTALL_DOCS_ALL = DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/squeeze/applications/konversation/debian/source/options b/debian/squeeze/applications/konversation/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/konversation/debian/source/options +++ b/debian/squeeze/applications/konversation/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 diff --git a/debian/squeeze/applications/kopete-otr/debian/rules b/debian/squeeze/applications/kopete-otr/debian/rules index abfd36cfc..4edf9d96d 100755 --- a/debian/squeeze/applications/kopete-otr/debian/rules +++ b/debian/squeeze/applications/kopete-otr/debian/rules @@ -12,6 +12,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/squeeze/applications/kopete-otr/debian/source/options b/debian/squeeze/applications/kopete-otr/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/kopete-otr/debian/source/options +++ b/debian/squeeze/applications/kopete-otr/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 diff --git a/debian/squeeze/applications/kpicosim/debian/rules b/debian/squeeze/applications/kpicosim/debian/rules index 4a8c9dcdd..0a03f424b 100755 --- a/debian/squeeze/applications/kpicosim/debian/rules +++ b/debian/squeeze/applications/kpicosim/debian/rules @@ -16,6 +16,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -123,7 +126,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/squeeze/applications/kpicosim/debian/source/options b/debian/squeeze/applications/kpicosim/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/kpicosim/debian/source/options +++ b/debian/squeeze/applications/kpicosim/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 diff --git a/debian/squeeze/applications/kpilot/debian/rules b/debian/squeeze/applications/kpilot/debian/rules index abfd36cfc..4edf9d96d 100755 --- a/debian/squeeze/applications/kpilot/debian/rules +++ b/debian/squeeze/applications/kpilot/debian/rules @@ -12,6 +12,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/squeeze/applications/kpilot/debian/source/options b/debian/squeeze/applications/kpilot/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/kpilot/debian/source/options +++ b/debian/squeeze/applications/kpilot/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 diff --git a/debian/squeeze/applications/kpowersave-nohal/debian/rules b/debian/squeeze/applications/kpowersave-nohal/debian/rules index a2f0e66bb..262171bc3 100755 --- a/debian/squeeze/applications/kpowersave-nohal/debian/rules +++ b/debian/squeeze/applications/kpowersave-nohal/debian/rules @@ -14,6 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_DOCS_ALL := AUTHORS NEWS DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/squeeze/applications/kpowersave-nohal/debian/source/options b/debian/squeeze/applications/kpowersave-nohal/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/kpowersave-nohal/debian/source/options +++ b/debian/squeeze/applications/kpowersave-nohal/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 diff --git a/debian/squeeze/applications/kpowersave.cmake/debian/source/options b/debian/squeeze/applications/kpowersave.cmake/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/kpowersave.cmake/debian/source/options +++ b/debian/squeeze/applications/kpowersave.cmake/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 diff --git a/debian/squeeze/applications/kpowersave/debian/rules b/debian/squeeze/applications/kpowersave/debian/rules index 991d42479..961465395 100755 --- a/debian/squeeze/applications/kpowersave/debian/rules +++ b/debian/squeeze/applications/kpowersave/debian/rules @@ -14,6 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_DOCS_ALL := AUTHORS NEWS DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/squeeze/applications/kpowersave/debian/source/options b/debian/squeeze/applications/kpowersave/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/kpowersave/debian/source/options +++ b/debian/squeeze/applications/kpowersave/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 diff --git a/debian/squeeze/applications/kradio/debian/rules b/debian/squeeze/applications/kradio/debian/rules index d8c6c0226..41840eb6e 100755 --- a/debian/squeeze/applications/kradio/debian/rules +++ b/debian/squeeze/applications/kradio/debian/rules @@ -16,6 +16,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -121,7 +124,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/squeeze/applications/kradio/debian/source/options b/debian/squeeze/applications/kradio/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/kradio/debian/source/options +++ b/debian/squeeze/applications/kradio/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 diff --git a/debian/squeeze/applications/krename/debian/rules b/debian/squeeze/applications/krename/debian/rules index f886eacd0..4983ad699 100755 --- a/debian/squeeze/applications/krename/debian/rules +++ b/debian/squeeze/applications/krename/debian/rules @@ -15,6 +15,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + ### Libtool and Automake updates post-patches:: debian/stamp-autothings-update debian/stamp-autothings-update: diff --git a/debian/squeeze/applications/krename/debian/source/options b/debian/squeeze/applications/krename/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/krename/debian/source/options +++ b/debian/squeeze/applications/krename/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 diff --git a/debian/squeeze/applications/krusader/debian/rules b/debian/squeeze/applications/krusader/debian/rules index 139132dbb..b19073807 100755 --- a/debian/squeeze/applications/krusader/debian/rules +++ b/debian/squeeze/applications/krusader/debian/rules @@ -18,6 +18,9 @@ DEB_DESTDIR = $(CURDIR)/debian/krusader-trinity/ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/squeeze/applications/krusader/debian/source/options b/debian/squeeze/applications/krusader/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/krusader/debian/source/options +++ b/debian/squeeze/applications/krusader/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 diff --git a/debian/squeeze/applications/ksplash-engine-moodin/debian/rules b/debian/squeeze/applications/ksplash-engine-moodin/debian/rules index 047b8ca76..c41d87b76 100755 --- a/debian/squeeze/applications/ksplash-engine-moodin/debian/rules +++ b/debian/squeeze/applications/ksplash-engine-moodin/debian/rules @@ -11,6 +11,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -132,7 +135,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/squeeze/applications/ksplash-engine-moodin/debian/source/options b/debian/squeeze/applications/ksplash-engine-moodin/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/ksplash-engine-moodin/debian/source/options +++ b/debian/squeeze/applications/ksplash-engine-moodin/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 diff --git a/debian/squeeze/applications/ksquirrel/debian/rules b/debian/squeeze/applications/ksquirrel/debian/rules index 744a8d1e5..f59e43351 100755 --- a/debian/squeeze/applications/ksquirrel/debian/rules +++ b/debian/squeeze/applications/ksquirrel/debian/rules @@ -16,6 +16,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -106,7 +109,7 @@ binary-arch: build install # dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/squeeze/applications/ksquirrel/debian/source/options b/debian/squeeze/applications/ksquirrel/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/ksquirrel/debian/source/options +++ b/debian/squeeze/applications/ksquirrel/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 diff --git a/debian/squeeze/applications/kstreamripper/debian/rules b/debian/squeeze/applications/kstreamripper/debian/rules index 9f641b49a..88540f9bf 100755 --- a/debian/squeeze/applications/kstreamripper/debian/rules +++ b/debian/squeeze/applications/kstreamripper/debian/rules @@ -2,6 +2,9 @@ include /usr/share/cdbs/1/rules/debhelper.mk #DEB_INSTALL_MANPAGES_kstreamripper-trinity:=debian/kstreamripper.1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PATH := /opt/trinity/bin:$(PATH) build/kstreamripper-trinity:: diff --git a/debian/squeeze/applications/kstreamripper/debian/source/options b/debian/squeeze/applications/kstreamripper/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/kstreamripper/debian/source/options +++ b/debian/squeeze/applications/kstreamripper/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 diff --git a/debian/squeeze/applications/ksystemlog/debian/rules b/debian/squeeze/applications/ksystemlog/debian/rules index 12d493659..5b9d63684 100755 --- a/debian/squeeze/applications/ksystemlog/debian/rules +++ b/debian/squeeze/applications/ksystemlog/debian/rules @@ -15,6 +15,9 @@ DEB_INSTALL_MANPAGES_ksystemlog-trinity := ksystemlog.1 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/squeeze/applications/ksystemlog/debian/source/options b/debian/squeeze/applications/ksystemlog/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/ksystemlog/debian/source/options +++ b/debian/squeeze/applications/ksystemlog/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 diff --git a/debian/squeeze/applications/ktechlab/debian/rules b/debian/squeeze/applications/ktechlab/debian/rules index 15d1878df..227674f7f 100755 --- a/debian/squeeze/applications/ktechlab/debian/rules +++ b/debian/squeeze/applications/ktechlab/debian/rules @@ -12,6 +12,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -108,7 +111,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install unpatch diff --git a/debian/squeeze/applications/ktechlab/debian/source/options b/debian/squeeze/applications/ktechlab/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/ktechlab/debian/source/options +++ b/debian/squeeze/applications/ktechlab/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 diff --git a/debian/squeeze/applications/ktorrent/debian/rules b/debian/squeeze/applications/ktorrent/debian/rules index 5590816c2..d0046eb44 100755 --- a/debian/squeeze/applications/ktorrent/debian/rules +++ b/debian/squeeze/applications/ktorrent/debian/rules @@ -15,6 +15,9 @@ DEB_INSTALL_MANPAGES_ktorrent = ktorrent.1 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + build/ktorrent-trinity:: docbook2x-man debian/ktorrent.1.docbook diff --git a/debian/squeeze/applications/ktorrent/debian/source/options b/debian/squeeze/applications/ktorrent/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/ktorrent/debian/source/options +++ b/debian/squeeze/applications/ktorrent/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 diff --git a/debian/squeeze/applications/kuickshow/debian/rules b/debian/squeeze/applications/kuickshow/debian/rules index ee4456494..46fe966da 100755 --- a/debian/squeeze/applications/kuickshow/debian/rules +++ b/debian/squeeze/applications/kuickshow/debian/rules @@ -14,6 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/squeeze/applications/kuickshow/debian/source/options b/debian/squeeze/applications/kuickshow/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/kuickshow/debian/source/options +++ b/debian/squeeze/applications/kuickshow/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 diff --git a/debian/squeeze/applications/kvirc/debian/rules b/debian/squeeze/applications/kvirc/debian/rules index 665c61d25..fd45d5925 100755 --- a/debian/squeeze/applications/kvirc/debian/rules +++ b/debian/squeeze/applications/kvirc/debian/rules @@ -49,6 +49,9 @@ endif # DEB_COMPRESS_EXCLUDE := .kvs +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # # Run dh_shlibdeps with the correct options # diff --git a/debian/squeeze/applications/kvirc/debian/source/options b/debian/squeeze/applications/kvirc/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/kvirc/debian/source/options +++ b/debian/squeeze/applications/kvirc/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 diff --git a/debian/squeeze/applications/kvkbd/debian/rules b/debian/squeeze/applications/kvkbd/debian/rules index 305c1e4df..0f564108e 100755 --- a/debian/squeeze/applications/kvkbd/debian/rules +++ b/debian/squeeze/applications/kvkbd/debian/rules @@ -13,6 +13,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + makebuilddir/kvkbd-trinity:: make -f Makefile.cvs diff --git a/debian/squeeze/applications/kvkbd/debian/source/options b/debian/squeeze/applications/kvkbd/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/kvkbd/debian/source/options +++ b/debian/squeeze/applications/kvkbd/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 diff --git a/debian/squeeze/applications/kvpnc/debian/rules b/debian/squeeze/applications/kvpnc/debian/rules index 354c23311..f93ccb291 100755 --- a/debian/squeeze/applications/kvpnc/debian/rules +++ b/debian/squeeze/applications/kvpnc/debian/rules @@ -17,6 +17,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + makebuilddir/kvpnc-trinity:: cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh diff --git a/debian/squeeze/applications/kvpnc/debian/source/options b/debian/squeeze/applications/kvpnc/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/kvpnc/debian/source/options +++ b/debian/squeeze/applications/kvpnc/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 diff --git a/debian/squeeze/applications/piklab/debian/rules b/debian/squeeze/applications/piklab/debian/rules index cd16137c9..6d0a1d510 100755 --- a/debian/squeeze/applications/piklab/debian/rules +++ b/debian/squeeze/applications/piklab/debian/rules @@ -10,6 +10,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -111,7 +114,7 @@ binary-arch: build install dh_shlibdeps -l/opt/trinity/lib dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: config build clean binary-indep binary-arch binary install diff --git a/debian/squeeze/applications/piklab/debian/source/options b/debian/squeeze/applications/piklab/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/piklab/debian/source/options +++ b/debian/squeeze/applications/piklab/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 diff --git a/debian/squeeze/applications/potracegui/debian/rules b/debian/squeeze/applications/potracegui/debian/rules index bc559477f..4b268883c 100755 --- a/debian/squeeze/applications/potracegui/debian/rules +++ b/debian/squeeze/applications/potracegui/debian/rules @@ -20,6 +20,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -100,7 +103,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/squeeze/applications/potracegui/debian/source/options b/debian/squeeze/applications/potracegui/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/potracegui/debian/source/options +++ b/debian/squeeze/applications/potracegui/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 diff --git a/debian/squeeze/applications/qt4-tqt-theme-engine/debian/rules b/debian/squeeze/applications/qt4-tqt-theme-engine/debian/rules index bd271d7de..2cde95722 100755 --- a/debian/squeeze/applications/qt4-tqt-theme-engine/debian/rules +++ b/debian/squeeze/applications/qt4-tqt-theme-engine/debian/rules @@ -9,5 +9,8 @@ DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + QMAKE := qmake-qt4 diff --git a/debian/squeeze/applications/rosegarden/debian/rules b/debian/squeeze/applications/rosegarden/debian/rules index 32d10d6ff..3fc2b777e 100755 --- a/debian/squeeze/applications/rosegarden/debian/rules +++ b/debian/squeeze/applications/rosegarden/debian/rules @@ -22,6 +22,9 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS - DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. DEB_BUILD_PARALLEL = true @@ -56,7 +59,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install configure diff --git a/debian/squeeze/applications/rosegarden/debian/source/options b/debian/squeeze/applications/rosegarden/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/rosegarden/debian/source/options +++ b/debian/squeeze/applications/rosegarden/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 diff --git a/debian/squeeze/applications/smartcardauth/debian/rules b/debian/squeeze/applications/smartcardauth/debian/rules index a9e7e66cb..fe74e584a 100755 --- a/debian/squeeze/applications/smartcardauth/debian/rules +++ b/debian/squeeze/applications/smartcardauth/debian/rules @@ -9,3 +9,6 @@ CFLAGS=-g -Wall -fPIC DEB_MAKE_INSTALL_TARGET := install DESTDIR="$(DEB_DESTDIR)" DEB_INSTALL_DOCS_ALL := + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) diff --git a/debian/squeeze/applications/smartcardauth/debian/source/options b/debian/squeeze/applications/smartcardauth/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/smartcardauth/debian/source/options +++ b/debian/squeeze/applications/smartcardauth/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 diff --git a/debian/squeeze/applications/smb4k/debian/rules b/debian/squeeze/applications/smb4k/debian/rules index db6aa90dd..70b1248dc 100755 --- a/debian/squeeze/applications/smb4k/debian/rules +++ b/debian/squeeze/applications/smb4k/debian/rules @@ -16,6 +16,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/squeeze/applications/smb4k/debian/source/options b/debian/squeeze/applications/smb4k/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/smb4k/debian/source/options +++ b/debian/squeeze/applications/smb4k/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 diff --git a/debian/squeeze/applications/soundkonverter/debian/rules b/debian/squeeze/applications/soundkonverter/debian/rules index 831240224..d3eac8d3b 100755 --- a/debian/squeeze/applications/soundkonverter/debian/rules +++ b/debian/squeeze/applications/soundkonverter/debian/rules @@ -23,6 +23,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS = --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + install/soundkonverter-trinity:: install -D -p -m0644 debian/soundkonverter-trinity.lintian-overrides \ debian/soundkonverter-trinity/usr/share/lintian/overrides/soundkonverter-trinity diff --git a/debian/squeeze/applications/soundkonverter/debian/source/options b/debian/squeeze/applications/soundkonverter/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/soundkonverter/debian/source/options +++ b/debian/squeeze/applications/soundkonverter/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 diff --git a/debian/squeeze/applications/tde-guidance/debian/rules b/debian/squeeze/applications/tde-guidance/debian/rules index 996ad6a4d..614fdb4a9 100755 --- a/debian/squeeze/applications/tde-guidance/debian/rules +++ b/debian/squeeze/applications/tde-guidance/debian/rules @@ -15,6 +15,9 @@ PYSUPPORT_PATH = $(DEB_DESTDIR)/opt/trinity/share/python-support DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde LDFLAGS_APPEND := -L/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + install/tde-guidance-trinity:: # install icons to right place install -D -p -m0644 $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/hi32-app-daemons.png \ diff --git a/debian/squeeze/applications/tde-guidance/debian/source/options b/debian/squeeze/applications/tde-guidance/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/tde-guidance/debian/source/options +++ b/debian/squeeze/applications/tde-guidance/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 diff --git a/debian/squeeze/applications/tde-style-lipstik/debian/rules b/debian/squeeze/applications/tde-style-lipstik/debian/rules index f24b21716..eb9de9610 100755 --- a/debian/squeeze/applications/tde-style-lipstik/debian/rules +++ b/debian/squeeze/applications/tde-style-lipstik/debian/rules @@ -16,6 +16,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -122,7 +125,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/squeeze/applications/tde-style-lipstik/debian/source/options b/debian/squeeze/applications/tde-style-lipstik/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/tde-style-lipstik/debian/source/options +++ b/debian/squeeze/applications/tde-style-lipstik/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 diff --git a/debian/squeeze/applications/tde-style-qtcurve/debian/rules b/debian/squeeze/applications/tde-style-qtcurve/debian/rules index c61c340ae..685703a85 100755 --- a/debian/squeeze/applications/tde-style-qtcurve/debian/rules +++ b/debian/squeeze/applications/tde-style-qtcurve/debian/rules @@ -24,6 +24,9 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS - DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. DEB_BUILD_PARALLEL = true diff --git a/debian/squeeze/applications/tde-style-qtcurve/debian/source/options b/debian/squeeze/applications/tde-style-qtcurve/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/tde-style-qtcurve/debian/source/options +++ b/debian/squeeze/applications/tde-style-qtcurve/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 diff --git a/debian/squeeze/applications/tde-systemsettings/debian/rules b/debian/squeeze/applications/tde-systemsettings/debian/rules index 8110845eb..ed2e13a90 100755 --- a/debian/squeeze/applications/tde-systemsettings/debian/rules +++ b/debian/squeeze/applications/tde-systemsettings/debian/rules @@ -15,6 +15,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/squeeze/applications/tde-systemsettings/debian/source/options b/debian/squeeze/applications/tde-systemsettings/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/tde-systemsettings/debian/source/options +++ b/debian/squeeze/applications/tde-systemsettings/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 diff --git a/debian/squeeze/applications/tdesudo/debian/rules b/debian/squeeze/applications/tdesudo/debian/rules index 5a63a69a9..443a43aed 100755 --- a/debian/squeeze/applications/tdesudo/debian/rules +++ b/debian/squeeze/applications/tdesudo/debian/rules @@ -15,6 +15,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit DEB_INSTALL_MANPAGES_tdesudo-trinity = tdesudo-trinity.1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + build/tdesudo-trinity:: docbook2x-man debian/tdesudo-trinity.1.docbook mv tdesudo.1 tdesudo-trinity.1 diff --git a/debian/squeeze/applications/tdesudo/debian/source/options b/debian/squeeze/applications/tdesudo/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/tdesudo/debian/source/options +++ b/debian/squeeze/applications/tdesudo/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 diff --git a/debian/squeeze/applications/tdesvn/debian/rules b/debian/squeeze/applications/tdesvn/debian/rules index d3e870fba..37d2a944b 100755 --- a/debian/squeeze/applications/tdesvn/debian/rules +++ b/debian/squeeze/applications/tdesvn/debian/rules @@ -22,6 +22,9 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS - DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. DEB_BUILD_PARALLEL = true diff --git a/debian/squeeze/applications/tdesvn/debian/source/options b/debian/squeeze/applications/tdesvn/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/tdesvn/debian/source/options +++ b/debian/squeeze/applications/tdesvn/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 diff --git a/debian/squeeze/applications/tdmtheme/debian/rules b/debian/squeeze/applications/tdmtheme/debian/rules index 8e74fc2cb..0fc4f4aa4 100755 --- a/debian/squeeze/applications/tdmtheme/debian/rules +++ b/debian/squeeze/applications/tdmtheme/debian/rules @@ -15,6 +15,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/squeeze/applications/tdmtheme/debian/source/options b/debian/squeeze/applications/tdmtheme/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/tdmtheme/debian/source/options +++ b/debian/squeeze/applications/tdmtheme/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 diff --git a/debian/squeeze/applications/tellico/debian/rules b/debian/squeeze/applications/tellico/debian/rules index 84b8312a4..9e404eabf 100755 --- a/debian/squeeze/applications/tellico/debian/rules +++ b/debian/squeeze/applications/tellico/debian/rules @@ -12,6 +12,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -149,7 +152,7 @@ binary-indep: build install dh_installdeb -i dh_gencontrol -i dh_md5sums -i - dh_builddeb -i + dh_builddeb -i $(DEB_DH_BUILDDEB_ARGS) # Build architecture-dependent files here. binary-arch: build install @@ -171,7 +174,7 @@ binary-arch: build install dh_shlibdeps -a dh_gencontrol -a dh_md5sums -a - dh_builddeb -a + dh_builddeb -a $(DEB_DH_BUILDDEB_ARGS) binary: binary-arch binary-indep .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/squeeze/applications/tellico/debian/source/options b/debian/squeeze/applications/tellico/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/tellico/debian/source/options +++ b/debian/squeeze/applications/tellico/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 diff --git a/debian/squeeze/applications/twin-style-crystal/debian/rules b/debian/squeeze/applications/twin-style-crystal/debian/rules index 8cda3384a..4fb0c5bb5 100755 --- a/debian/squeeze/applications/twin-style-crystal/debian/rules +++ b/debian/squeeze/applications/twin-style-crystal/debian/rules @@ -13,6 +13,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/squeeze/applications/twin-style-crystal/debian/source/options b/debian/squeeze/applications/twin-style-crystal/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/twin-style-crystal/debian/source/options +++ b/debian/squeeze/applications/twin-style-crystal/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 diff --git a/debian/squeeze/applications/wlassistant/debian/rules b/debian/squeeze/applications/wlassistant/debian/rules index abada8378..1a8fdeafb 100755 --- a/debian/squeeze/applications/wlassistant/debian/rules +++ b/debian/squeeze/applications/wlassistant/debian/rules @@ -22,6 +22,9 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS - DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. DEB_BUILD_PARALLEL = true diff --git a/debian/squeeze/applications/wlassistant/debian/source/options b/debian/squeeze/applications/wlassistant/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/wlassistant/debian/source/options +++ b/debian/squeeze/applications/wlassistant/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 diff --git a/debian/squeeze/applications/yakuake/debian/rules b/debian/squeeze/applications/yakuake/debian/rules index f5bd922f5..aa22c8b59 100755 --- a/debian/squeeze/applications/yakuake/debian/rules +++ b/debian/squeeze/applications/yakuake/debian/rules @@ -15,6 +15,9 @@ INSTALL_DOCS_ALL := DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + ### Libtool and Automake updates post-patches:: debian/stamp-autothings-update debian/stamp-autothings-update: diff --git a/debian/squeeze/applications/yakuake/debian/source/options b/debian/squeeze/applications/yakuake/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/applications/yakuake/debian/source/options +++ b/debian/squeeze/applications/yakuake/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 diff --git a/debian/squeeze/defaultsettings b/debian/squeeze/defaultsettings new file mode 120000 index 000000000..86062d702 --- /dev/null +++ b/debian/squeeze/defaultsettings @@ -0,0 +1 @@ +../../ubuntu/maverick/defaultsettings
\ No newline at end of file diff --git a/debian/squeeze/dependencies/arts/debian/rules b/debian/squeeze/dependencies/arts/debian/rules index b0a724e1a..9c9730bda 100755 --- a/debian/squeeze/dependencies/arts/debian/rules +++ b/debian/squeeze/dependencies/arts/debian/rules @@ -23,6 +23,9 @@ DEB_BUILD_PARALLEL = true DEB_DH_STRIP_ARGS := --dbg-package=arts-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := libarts1c2a-trinity libartsc0-trinity DEB_DH_MAKESHLIBS_ARGS_ALL := -V diff --git a/debian/squeeze/dependencies/arts/debian/source/options b/debian/squeeze/dependencies/arts/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/dependencies/arts/debian/source/options +++ b/debian/squeeze/dependencies/arts/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 diff --git a/debian/squeeze/dependencies/avahi-tqt/debian/control b/debian/squeeze/dependencies/avahi-tqt/debian/control index 8b0c55500..b4838d2b0 100644 --- a/debian/squeeze/dependencies/avahi-tqt/debian/control +++ b/debian/squeeze/dependencies/avahi-tqt/debian/control @@ -5,6 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> Uploaders: Timothy Pearson <kb9vqf@pearsoncomputing.net> Build-Depends: debhelper, + cdbs, pkg-config, python-support (>= 0.6), libglib2.0-dev (>= 2.4), diff --git a/debian/squeeze/dependencies/avahi-tqt/debian/rules b/debian/squeeze/dependencies/avahi-tqt/debian/rules index c3ea0343f..54a22a44f 100755 --- a/debian/squeeze/dependencies/avahi-tqt/debian/rules +++ b/debian/squeeze/dependencies/avahi-tqt/debian/rules @@ -1,17 +1,24 @@ #!/usr/bin/make -f -%: - dh $@ +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk # Ensure at build time that the library has no dependencies on undefined # symbols, and speed up loading. export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,-z,defs -Wl,-O1 -override_dh_auto_configure: - ./autogen.sh - dh_auto_configure -- $(CONFFLAGS) \ +DEB_CONFIGURE_EXTRA_FLAGS += \ --enable-compat-libdns_sd \ --disable-mono --disable-monodoc \ --disable-gtk3 \ --with-systemdsystemunitdir=/lib/systemd/system +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + +post-patches:: debian/stamp-bootstrap + +debian/stamp-bootstrap: + ./autogen.sh + rm ./ChangeLog + touch debian/stamp-bootstrap diff --git a/debian/squeeze/dependencies/avahi-tqt/debian/source/options b/debian/squeeze/dependencies/avahi-tqt/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/dependencies/avahi-tqt/debian/source/options +++ b/debian/squeeze/dependencies/avahi-tqt/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 diff --git a/debian/squeeze/dependencies/dbus-1-tqt/debian/rules b/debian/squeeze/dependencies/dbus-1-tqt/debian/rules index b7aa427f8..3b86de7db 100755 --- a/debian/squeeze/dependencies/dbus-1-tqt/debian/rules +++ b/debian/squeeze/dependencies/dbus-1-tqt/debian/rules @@ -4,3 +4,6 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) diff --git a/debian/squeeze/dependencies/dbus-1-tqt/debian/source/options b/debian/squeeze/dependencies/dbus-1-tqt/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/dependencies/dbus-1-tqt/debian/source/options +++ b/debian/squeeze/dependencies/dbus-1-tqt/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 diff --git a/debian/squeeze/dependencies/dbus-tqt/debian/rules b/debian/squeeze/dependencies/dbus-tqt/debian/rules index 894533134..a59bed76e 100755 --- a/debian/squeeze/dependencies/dbus-tqt/debian/rules +++ b/debian/squeeze/dependencies/dbus-tqt/debian/rules @@ -10,3 +10,6 @@ include /usr/share/cdbs/1/class/cmake.mk # Strict library versioning DEB_DH_MAKESHLIBS_ARGS_ALL := -V + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) diff --git a/debian/squeeze/dependencies/dbus-tqt/debian/source/options b/debian/squeeze/dependencies/dbus-tqt/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/dependencies/dbus-tqt/debian/source/options +++ b/debian/squeeze/dependencies/dbus-tqt/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 diff --git a/debian/squeeze/dependencies/libart-lgpl/debian/rules b/debian/squeeze/dependencies/libart-lgpl/debian/rules index 4390434f7..2751eb1f2 100755 --- a/debian/squeeze/dependencies/libart-lgpl/debian/rules +++ b/debian/squeeze/dependencies/libart-lgpl/debian/rules @@ -20,3 +20,5 @@ GNOME_MODULE := libart_lgpl DEB_DH_MAKESHLIBS_ARGS_$(libart-2.0-N) += -V '$(libart-2.0-N)(>= 2.3.18)' +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) diff --git a/debian/squeeze/dependencies/libart-lgpl/debian/source/options b/debian/squeeze/dependencies/libart-lgpl/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/dependencies/libart-lgpl/debian/source/options +++ b/debian/squeeze/dependencies/libart-lgpl/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 diff --git a/debian/squeeze/dependencies/libcaldav/debian/rules b/debian/squeeze/dependencies/libcaldav/debian/rules index 0dda6ea24..fb72a35e7 100755 --- a/debian/squeeze/dependencies/libcaldav/debian/rules +++ b/debian/squeeze/dependencies/libcaldav/debian/rules @@ -5,6 +5,9 @@ include /usr/share/quilt/quilt.make # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # This has to be exported to make some magic below work. export DH_OPTIONS @@ -86,7 +89,7 @@ binary-common: dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture independent packages using the common target. binary-indep: build install diff --git a/debian/squeeze/dependencies/libcarddav/debian/rules b/debian/squeeze/dependencies/libcarddav/debian/rules index 124929739..24bdcbc93 100755 --- a/debian/squeeze/dependencies/libcarddav/debian/rules +++ b/debian/squeeze/dependencies/libcarddav/debian/rules @@ -5,6 +5,9 @@ include /usr/share/quilt/quilt.make # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # This has to be exported to make some magic below work. export DH_OPTIONS @@ -86,7 +89,7 @@ binary-common: dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture independent packages using the common target. binary-indep: build install diff --git a/debian/squeeze/dependencies/python-tqt/debian/rules b/debian/squeeze/dependencies/python-tqt/debian/rules index ebb91c6e4..86eca95c9 100755 --- a/debian/squeeze/dependencies/python-tqt/debian/rules +++ b/debian/squeeze/dependencies/python-tqt/debian/rules @@ -3,6 +3,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + export DH_OPTIONS -include /usr/share/python/python.mk @@ -158,7 +161,7 @@ endif dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture independant packages using the common target. binary-indep: install-indep diff --git a/debian/squeeze/dependencies/python-tqt/debian/source/options b/debian/squeeze/dependencies/python-tqt/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/dependencies/python-tqt/debian/source/options +++ b/debian/squeeze/dependencies/python-tqt/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 diff --git a/debian/squeeze/dependencies/qt3/debian/control b/debian/squeeze/dependencies/qt3/debian/control index 8b1654d79..e10fbcab1 100644 --- a/debian/squeeze/dependencies/qt3/debian/control +++ b/debian/squeeze/dependencies/qt3/debian/control @@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1- libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, libxcursor-dev, libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg62-dev, libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev, - libfreetype6-dev, libxft-dev, unixodbc-dev, uuid-dev, + libfreetype6-dev, libxft-dev, unixodbc-dev, uuid-dev, libglib2.0-dev, libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcups2-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev, firebird2.1-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc] | firebird2-dev [i386 amd64] diff --git a/debian/squeeze/dependencies/qt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff b/debian/squeeze/dependencies/qt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff deleted file mode 100644 index 3c6394f33..000000000 --- a/debian/squeeze/dependencies/qt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff +++ /dev/null @@ -1,32 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## kubuntu_06_fglrx_0_size_screen.diff.dpatch by <jr@pechin3> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad qt-x11-free-3.3.8really3.3.7~/src/kernel/qpaintdevice_x11.cpp qt-x11-free-3.3.8really3.3.7/src/kernel/qpaintdevice_x11.cpp ---- qt-x11-free-3.3.8really3.3.7~/src/kernel/qpaintdevice_x11.cpp 2007-04-02 20:06:28.000000000 +0100 -+++ qt-x11-free-3.3.8really3.3.7/src/kernel/qpaintdevice_x11.cpp 2007-04-02 20:12:10.000000000 +0100 -@@ -526,11 +526,16 @@ - Q_CHECK_PTR( dpisX ); - Q_CHECK_PTR( dpisY ); - for ( i = 0; i < screens; i++ ) { -- dpisX[ i ] = (DisplayWidth(dpy,i) * 254 + DisplayWidthMM(dpy,i)*5) -- -- / (DisplayWidthMM(dpy,i)*10); -- dpisY[ i ] = (DisplayHeight(dpy,i) * 254 + DisplayHeightMM(dpy,i)*5) -- / (DisplayHeightMM(dpy,i)*10); -+ if (DisplayWidthMM(dpy,i) < 1) -+ dpisX[ i ] = 75; // default the dpi to 75. -+ else -+ dpisX[ i ] = (DisplayWidth(dpy,i) * 254 + DisplayWidthMM(dpy,i)*5) -+ / (DisplayWidthMM(dpy,i)*10); -+ if (DisplayHeightMM(dpy,i) < 1) -+ dpisY[ i ] = 75; // default the dpi to 75. -+ else -+ dpisY[ i ] = (DisplayHeight(dpy,i) * 254 + DisplayHeightMM(dpy,i)*5) -+ / (DisplayHeightMM(dpy,i)*10); - } - } - diff --git a/debian/squeeze/dependencies/qt3/debian/patches/series b/debian/squeeze/dependencies/qt3/debian/patches/series index 7377c84c1..e6bdb92af 100644 --- a/debian/squeeze/dependencies/qt3/debian/patches/series +++ b/debian/squeeze/dependencies/qt3/debian/patches/series @@ -1,4 +1,3 @@ 06_disable_rpath.diff 09_amd64_lib64.diff 72_dont_trust_uname-m_use_dpkg-arch_instead.diff -kubuntu_06_fglrx_0_size_screen.diff diff --git a/debian/squeeze/dependencies/qt3/debian/rules b/debian/squeeze/dependencies/qt3/debian/rules index 09b237823..7ede42ad9 100755 --- a/debian/squeeze/dependencies/qt3/debian/rules +++ b/debian/squeeze/dependencies/qt3/debian/rules @@ -11,6 +11,9 @@ export LD_LIBRARY_PATH=$(QTDIR)/lib:$(OLD_LD_LIBRARY_PATH) OLD_PATH := $(PATH) export PATH=$(QTDIR)/bin:$(OLD_PATH) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) @@ -96,6 +99,7 @@ CONFIGURE_OPTS = \ \ -lfontconfig \ -inputmethod \ + -glibmainloop \ # End of CONFIGURE_OPTS interbase_archs := i386 amd64 sparc powerpc @@ -326,7 +330,7 @@ binary-indep: build install dh_gencontrol -i dh_md5sums -i - dh_builddeb -i + dh_builddeb -i $(DEB_DH_BUILDDEB_ARGS) binary-arch: build install @@ -468,7 +472,7 @@ binary-arch: build install dh_gencontrol -a $(IBASE) dh_md5sums -a $(IBASE) - dh_builddeb -a $(IBASE) + dh_builddeb -a $(IBASE) $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build binary-indep binary-arch binary install clean patch unpatch diff --git a/debian/squeeze/dependencies/qt3/debian/source/options b/debian/squeeze/dependencies/qt3/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/dependencies/qt3/debian/source/options +++ b/debian/squeeze/dependencies/qt3/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 diff --git a/debian/squeeze/dependencies/sip4-tqt/debian/rules b/debian/squeeze/dependencies/sip4-tqt/debian/rules index 0dd14099f..2286739d5 100755 --- a/debian/squeeze/dependencies/sip4-tqt/debian/rules +++ b/debian/squeeze/dependencies/sip4-tqt/debian/rules @@ -2,6 +2,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + export DH_OPTIONS INSTDIR=$(CURDIR)/debian @@ -134,7 +137,7 @@ endif dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture independant packages using the common target. binary-indep: diff --git a/debian/squeeze/dependencies/sip4-tqt/debian/source/options b/debian/squeeze/dependencies/sip4-tqt/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/dependencies/sip4-tqt/debian/source/options +++ b/debian/squeeze/dependencies/sip4-tqt/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 diff --git a/debian/squeeze/dependencies/tqca-tls/debian/rules b/debian/squeeze/dependencies/tqca-tls/debian/rules index 4ffaf90dc..fc9e58e55 100755 --- a/debian/squeeze/dependencies/tqca-tls/debian/rules +++ b/debian/squeeze/dependencies/tqca-tls/debian/rules @@ -6,6 +6,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) @@ -104,7 +107,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/squeeze/dependencies/tqca-tls/debian/source/options b/debian/squeeze/dependencies/tqca-tls/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/dependencies/tqca-tls/debian/source/options +++ b/debian/squeeze/dependencies/tqca-tls/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 diff --git a/debian/squeeze/dependencies/tqscintilla/debian/rules b/debian/squeeze/dependencies/tqscintilla/debian/rules index 36df66cc9..8dfaa3377 100755 --- a/debian/squeeze/dependencies/tqscintilla/debian/rules +++ b/debian/squeeze/dependencies/tqscintilla/debian/rules @@ -5,6 +5,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # This is the debhelper compatibility version to use. export QTDIR=/usr/share/tqt3 export QMAKESPEC=$(QTDIR)/mkspecs/linux-g++ @@ -82,7 +85,7 @@ binary-indep: build install dh_installdeb -i dh_gencontrol -i dh_md5sums -i - dh_builddeb -i + dh_builddeb -i $(DEB_DH_BUILDDEB_ARGS) # Build architecture-dependent files here. binary-arch: build install @@ -100,7 +103,7 @@ binary-arch: build install dh_shlibdeps -a dh_gencontrol -a dh_md5sums -a - dh_builddeb -a + dh_builddeb -a $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install configure diff --git a/debian/squeeze/dependencies/tqscintilla/debian/source/options b/debian/squeeze/dependencies/tqscintilla/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/dependencies/tqscintilla/debian/source/options +++ b/debian/squeeze/dependencies/tqscintilla/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 diff --git a/debian/squeeze/dependencies/tqt3/debian/control b/debian/squeeze/dependencies/tqt3/debian/control index 1c8b45da3..b45983f80 100644 --- a/debian/squeeze/dependencies/tqt3/debian/control +++ b/debian/squeeze/dependencies/tqt3/debian/control @@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1- libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, libxcursor-dev, libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg-dev, libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev, - libfreetype6-dev, libxft-dev, unixodbc-dev, uuid-dev, + libfreetype6-dev, libxft-dev, unixodbc-dev, uuid-dev, libglib2.0-dev, libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcups2-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev, firebird2.1-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc] | firebird2-dev [i386 amd64] diff --git a/debian/squeeze/dependencies/tqt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff b/debian/squeeze/dependencies/tqt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff deleted file mode 100644 index 3c6394f33..000000000 --- a/debian/squeeze/dependencies/tqt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff +++ /dev/null @@ -1,32 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## kubuntu_06_fglrx_0_size_screen.diff.dpatch by <jr@pechin3> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad qt-x11-free-3.3.8really3.3.7~/src/kernel/qpaintdevice_x11.cpp qt-x11-free-3.3.8really3.3.7/src/kernel/qpaintdevice_x11.cpp ---- qt-x11-free-3.3.8really3.3.7~/src/kernel/qpaintdevice_x11.cpp 2007-04-02 20:06:28.000000000 +0100 -+++ qt-x11-free-3.3.8really3.3.7/src/kernel/qpaintdevice_x11.cpp 2007-04-02 20:12:10.000000000 +0100 -@@ -526,11 +526,16 @@ - Q_CHECK_PTR( dpisX ); - Q_CHECK_PTR( dpisY ); - for ( i = 0; i < screens; i++ ) { -- dpisX[ i ] = (DisplayWidth(dpy,i) * 254 + DisplayWidthMM(dpy,i)*5) -- -- / (DisplayWidthMM(dpy,i)*10); -- dpisY[ i ] = (DisplayHeight(dpy,i) * 254 + DisplayHeightMM(dpy,i)*5) -- / (DisplayHeightMM(dpy,i)*10); -+ if (DisplayWidthMM(dpy,i) < 1) -+ dpisX[ i ] = 75; // default the dpi to 75. -+ else -+ dpisX[ i ] = (DisplayWidth(dpy,i) * 254 + DisplayWidthMM(dpy,i)*5) -+ / (DisplayWidthMM(dpy,i)*10); -+ if (DisplayHeightMM(dpy,i) < 1) -+ dpisY[ i ] = 75; // default the dpi to 75. -+ else -+ dpisY[ i ] = (DisplayHeight(dpy,i) * 254 + DisplayHeightMM(dpy,i)*5) -+ / (DisplayHeightMM(dpy,i)*10); - } - } - diff --git a/debian/squeeze/dependencies/tqt3/debian/patches/series b/debian/squeeze/dependencies/tqt3/debian/patches/series index 7377c84c1..e6bdb92af 100644 --- a/debian/squeeze/dependencies/tqt3/debian/patches/series +++ b/debian/squeeze/dependencies/tqt3/debian/patches/series @@ -1,4 +1,3 @@ 06_disable_rpath.diff 09_amd64_lib64.diff 72_dont_trust_uname-m_use_dpkg-arch_instead.diff -kubuntu_06_fglrx_0_size_screen.diff diff --git a/debian/squeeze/dependencies/tqt3/debian/rules b/debian/squeeze/dependencies/tqt3/debian/rules index 39a2ee31c..d2d66f6a7 100755 --- a/debian/squeeze/dependencies/tqt3/debian/rules +++ b/debian/squeeze/dependencies/tqt3/debian/rules @@ -11,6 +11,9 @@ export LD_LIBRARY_PATH=$(QTDIR)/lib:$(OLD_LD_LIBRARY_PATH) OLD_PATH := $(PATH) export PATH=$(QTDIR)/bin:$(OLD_PATH) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) @@ -100,6 +103,7 @@ CONFIGURE_OPTS = \ \ -lfontconfig \ -inputmethod \ + -glibmainloop \ # End of CONFIGURE_OPTS interbase_archs := i386 amd64 sparc powerpc @@ -330,7 +334,7 @@ binary-indep: build install dh_gencontrol -i dh_md5sums -i - dh_builddeb -i + dh_builddeb -i $(DEB_DH_BUILDDEB_ARGS) binary-arch: build install @@ -461,7 +465,7 @@ binary-arch: build install dh_gencontrol -a $(IBASE) dh_md5sums -a $(IBASE) - dh_builddeb -a $(IBASE) + dh_builddeb -a $(IBASE) $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build binary-indep binary-arch binary install clean patch unpatch diff --git a/debian/squeeze/dependencies/tqt3/debian/source/options b/debian/squeeze/dependencies/tqt3/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/dependencies/tqt3/debian/source/options +++ b/debian/squeeze/dependencies/tqt3/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 diff --git a/debian/squeeze/dependencies/tqtinterface/debian/rules b/debian/squeeze/dependencies/tqtinterface/debian/rules index f05e2fadd..5d8f4cb4c 100755 --- a/debian/squeeze/dependencies/tqtinterface/debian/rules +++ b/debian/squeeze/dependencies/tqtinterface/debian/rules @@ -14,6 +14,9 @@ DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) DEB_CMAKE_EXTRA_FLAGS := -DPKGCONFIG_INSTALL_DIR="/usr/lib/pkgconfig" -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/usr" -DCMAKE_LIBRARY_PATH="/usr/lib" -DCMAKE_INCLUDE_PATH="/usr/include" -DCMAKE_VERBOSE_MAKEFILE="ON" -DWITH_QT3="ON" -DQTDIR="/usr/share/qt3" -DQT_LIBRARY_DIRS="/usr/share/qt3/lib" -DBUILD_ALL="ON" -DUSE_QT3="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. DEB_BUILD_PARALLEL = true diff --git a/debian/squeeze/dependencies/tqtinterface/debian/source/options b/debian/squeeze/dependencies/tqtinterface/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/dependencies/tqtinterface/debian/source/options +++ b/debian/squeeze/dependencies/tqtinterface/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 diff --git a/debian/squeeze/libraries/kipi-plugins/debian/rules b/debian/squeeze/libraries/kipi-plugins/debian/rules index 5177da213..c9f8bd279 100755 --- a/debian/squeeze/libraries/kipi-plugins/debian/rules +++ b/debian/squeeze/libraries/kipi-plugins/debian/rules @@ -20,6 +20,9 @@ DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + clean :: rm -f po/*/*.gmo diff --git a/debian/squeeze/libraries/kipi-plugins/debian/source/options b/debian/squeeze/libraries/kipi-plugins/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/libraries/kipi-plugins/debian/source/options +++ b/debian/squeeze/libraries/kipi-plugins/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 diff --git a/debian/squeeze/libraries/libkdcraw/debian/rules b/debian/squeeze/libraries/libkdcraw/debian/rules index 7785e4bcc..f58c12e61 100755 --- a/debian/squeeze/libraries/libkdcraw/debian/rules +++ b/debian/squeeze/libraries/libkdcraw/debian/rules @@ -16,3 +16,6 @@ DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--no-undefined -Wl,--as-needed" DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) diff --git a/debian/squeeze/libraries/libkdcraw/debian/source/options b/debian/squeeze/libraries/libkdcraw/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/libraries/libkdcraw/debian/source/options +++ b/debian/squeeze/libraries/libkdcraw/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 diff --git a/debian/squeeze/libraries/libkexiv2/debian/rules b/debian/squeeze/libraries/libkexiv2/debian/rules index 28a1c06e8..705840830 100755 --- a/debian/squeeze/libraries/libkexiv2/debian/rules +++ b/debian/squeeze/libraries/libkexiv2/debian/rules @@ -19,6 +19,9 @@ DEB_KDE_ENABLE_FINAL = yes DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + get-orig-source: @@dh_testdir @@[ -d ../tarballs/. ]||mkdir -p ../tarballs diff --git a/debian/squeeze/libraries/libkexiv2/debian/source/options b/debian/squeeze/libraries/libkexiv2/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/libraries/libkexiv2/debian/source/options +++ b/debian/squeeze/libraries/libkexiv2/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 diff --git a/debian/squeeze/libraries/libkipi/debian/rules b/debian/squeeze/libraries/libkipi/debian/rules index 94eb41df3..ff0f40f12 100755 --- a/debian/squeeze/libraries/libkipi/debian/rules +++ b/debian/squeeze/libraries/libkipi/debian/rules @@ -18,6 +18,9 @@ DEB_KDE_ENABLE_FINAL = yes DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + clean :: rm -f po/*/*.gmo diff --git a/debian/squeeze/libraries/libkipi/debian/source/options b/debian/squeeze/libraries/libkipi/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/libraries/libkipi/debian/source/options +++ b/debian/squeeze/libraries/libkipi/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 diff --git a/debian/squeeze/libraries/libksquirrel/debian/rules b/debian/squeeze/libraries/libksquirrel/debian/rules index 4d113ccd7..f5bc572dc 100755 --- a/debian/squeeze/libraries/libksquirrel/debian/rules +++ b/debian/squeeze/libraries/libksquirrel/debian/rules @@ -16,6 +16,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -88,7 +91,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/squeeze/libraries/libksquirrel/debian/source/options b/debian/squeeze/libraries/libksquirrel/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/libraries/libksquirrel/debian/source/options +++ b/debian/squeeze/libraries/libksquirrel/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 diff --git a/debian/squeeze/libraries/libtdeldap/debian/control b/debian/squeeze/libraries/libtdeldap/debian/control index 2f489d71e..cd0240ab3 100644 --- a/debian/squeeze/libraries/libtdeldap/debian/control +++ b/debian/squeeze/libraries/libtdeldap/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.8.4 Package: libtdeldap-trinity Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients +Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, nss-updatedb Description: LDAP interface library for TDE LDAP interface library for TDE management modules. . diff --git a/debian/squeeze/libraries/libtdeldap/debian/rules b/debian/squeeze/libraries/libtdeldap/debian/rules index 242fb2c84..9bed17b05 100755 --- a/debian/squeeze/libraries/libtdeldap/debian/rules +++ b/debian/squeeze/libraries/libtdeldap/debian/rules @@ -11,6 +11,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/squeeze/libraries/libtqt-perl/debian/rules b/debian/squeeze/libraries/libtqt-perl/debian/rules index 7bf57d40b..1d77c70fc 100755 --- a/debian/squeeze/libraries/libtqt-perl/debian/rules +++ b/debian/squeeze/libraries/libtqt-perl/debian/rules @@ -32,6 +32,9 @@ DEB_MAKE_INSTALL_TARGET := install \ PREFIX=$(CURDIR)/debian/libtqt-perl/usr \ SITEPREFIX=$(CURDIR)/debian/libtqt-perl/usr \ +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + pre-build:: pre-build-stamp pre-build-stamp: diff --git a/debian/squeeze/libraries/libtqt-perl/debian/source/options b/debian/squeeze/libraries/libtqt-perl/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/libraries/libtqt-perl/debian/source/options +++ b/debian/squeeze/libraries/libtqt-perl/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 diff --git a/debian/squeeze/libraries/mlt++/debian/rules b/debian/squeeze/libraries/mlt++/debian/rules index 0232c83be..99606e440 100755 --- a/debian/squeeze/libraries/mlt++/debian/rules +++ b/debian/squeeze/libraries/mlt++/debian/rules @@ -10,6 +10,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + version := $(shell sed -n 's/Package: \(.*\)/\1/p' debian/control | head -n 1) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -88,7 +91,7 @@ binary-arch: build install dh_shlibdeps -l/opt/trinity/lib dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/squeeze/libraries/mlt++/debian/source/options b/debian/squeeze/libraries/mlt++/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/libraries/mlt++/debian/source/options +++ b/debian/squeeze/libraries/mlt++/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 diff --git a/debian/squeeze/libraries/mlt/debian/rules b/debian/squeeze/libraries/mlt/debian/rules index 3889b6a3a..ce607fb77 100755 --- a/debian/squeeze/libraries/mlt/debian/rules +++ b/debian/squeeze/libraries/mlt/debian/rules @@ -10,6 +10,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + version := $(shell sed -n 's/Package: \(.*\)/\1/p' debian/control | head -n 1) NCPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1) @@ -114,7 +117,7 @@ binary-arch: build install dh_shlibdeps --exclude=libmlt --exclude=libmiracle --exclude=libvalerie dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/squeeze/libraries/mlt/debian/source/options b/debian/squeeze/libraries/mlt/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/libraries/mlt/debian/source/options +++ b/debian/squeeze/libraries/mlt/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 diff --git a/debian/squeeze/libraries/pytdeextensions/debian/control b/debian/squeeze/libraries/pytdeextensions/debian/control index 0920e9e37..626311320 100644 --- a/debian/squeeze/libraries/pytdeextensions/debian/control +++ b/debian/squeeze/libraries/pytdeextensions/debian/control @@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> Build-Depends: cdbs, debhelper (>= 5), chrpath, quilt, tdelibs4c2a-trinity, libtool, libxml2-utils, libxrandr-dev, libxxf86vm-dev, pytqt-tools, python-trinity-trinity, - python-tqt-dev, python-sip4-dev, python-support (>= 0.6), python (>= 2.5), python-dev (>= 2.5) + python-tqt-dev, python-sip4-dev, python-support (>= 0.6), python (>= 2.5), python-all-dev (>= 2.5) Standards-Version: 3.8.4 Package: pytdeextensions-trinity @@ -26,7 +26,7 @@ Architecture: any Section: libdevel Replaces: libpythonize0-trinity-dev (<< 4:14.0.0) Breaks: libpythonize0-trinity-dev (<< 4:14.0.0) -Depends: libpythonize0-trinity (= ${binary:Version}), python-dev +Depends: libpythonize0-trinity (= ${binary:Version}), python-all-dev Description: Python packages to support KDE applications (development) [Trinity] PyKDE Extensions is a collection of software and Python packages to support the creation and installation of KDE applications. diff --git a/debian/squeeze/libraries/pytdeextensions/debian/rules b/debian/squeeze/libraries/pytdeextensions/debian/rules index 4dcfaaae8..b4ae203da 100755 --- a/debian/squeeze/libraries/pytdeextensions/debian/rules +++ b/debian/squeeze/libraries/pytdeextensions/debian/rules @@ -18,6 +18,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + install/pytdeextensions-trinity:: # We have no idea if the built product is site-packages or dist-packages cd debian/tmp/usr/lib/python*/ && mv site-packages/ dist-packages/ || echo "site-packages --> dist-packages" diff --git a/debian/squeeze/libraries/pytdeextensions/debian/source/options b/debian/squeeze/libraries/pytdeextensions/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/libraries/pytdeextensions/debian/source/options +++ b/debian/squeeze/libraries/pytdeextensions/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 diff --git a/debian/squeeze/libraries/python-trinity/debian/rules b/debian/squeeze/libraries/python-trinity/debian/rules index ffa56ad63..67af8c2d8 100755 --- a/debian/squeeze/libraries/python-trinity/debian/rules +++ b/debian/squeeze/libraries/python-trinity/debian/rules @@ -11,6 +11,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + include /usr/share/dpatch/dpatch.make # This has to be exported to make some magic below work. export DH_OPTIONS @@ -151,7 +154,7 @@ endif dh_shlibdeps -l /opt/trinity/lib dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture independant packages using the common target. binary-indep: install-indep diff --git a/debian/squeeze/libraries/python-trinity/debian/source/options b/debian/squeeze/libraries/python-trinity/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/libraries/python-trinity/debian/source/options +++ b/debian/squeeze/libraries/python-trinity/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 diff --git a/debian/squeeze/metapackages/meta-tde/debian/README.Debian b/debian/squeeze/metapackages/meta-tde/debian/README.Debian new file mode 100644 index 000000000..6591fa872 --- /dev/null +++ b/debian/squeeze/metapackages/meta-tde/debian/README.Debian @@ -0,0 +1,14 @@ +kde -- a metapackage for KDE +kde-core -- a metapackage for KDE core +kde-devel -- a metapackage for developing KDE Applications +---------------------------------------------------------------------------- + +This package is a metapackage, meaning that its purpose is to contain +dependencies for a complete, Debian-based environment for KDE 3. + +This package also carries optional 'Recommends' and/or 'Suggests' +package suggestions. The packages listed are suggested for +installation, but not required. + +Please file a wishlist bug against the package if you feel there are +additional packages that ought to be included with this meta-package. diff --git a/debian/squeeze/metapackages/meta-tde/debian/changelog b/debian/squeeze/metapackages/meta-tde/debian/changelog new file mode 100644 index 000000000..7c5da1b8f --- /dev/null +++ b/debian/squeeze/metapackages/meta-tde/debian/changelog @@ -0,0 +1,617 @@ +meta-kde-trinity (5:54) squeeze; urgency=low + + * Trinity version + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Mon, 05 Jul 2010 12:08:00 -0600 + +meta-kde (5:48) unstable; urgency=low + + * Remove kde-amusements. + * Update to debhelper compat 6. + * Update to Standards-Version 3.7.3, no changes required. + * Update Uploaders. + * Update copyright file. + * Move Homepage to source field. + * Update 4:3.4.3 to 4:3.5.5 now this is the KDE version in stable, + and from 1.4.2 to 1.5.5 for arts. + * Update rules file. + * Add kdbg, kdevelop (>= 4:3.3.2), kprof to kde-devel Suggests. This was + installed by, now removed, kde-devel-extras. + + -- Ana Beatriz Guerrero Lopez <ana@debian.org> Fri, 18 Jan 2008 21:14:55 +0100 + +meta-kde (5:47) unstable; urgency=low + + +++ Changes by Christopher Martin: + + * Version the metapackages' dependencies, making the metapackages + more useful for backporters. + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 11 May 2006 20:04:40 -0400 + +meta-kde (5:46) unstable; urgency=low + + +++ Changes by Christopher Martin: + + * Add kdeaccessiblity to kde's depends, and clarify the verbiage noting that + kde doesn't depend on development packages. (Closes: #353496) + + * Remove dependency on fontconfig, since libqt3-mt already depends on it. + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 10 May 2006 19:35:02 -0400 + +meta-kde (5:45) unstable; urgency=low + + +++ Changes by Christopher Martin: + + * Remove the kdelibs3-bin dummy transitional package, as Sarge is out + and thus Woody --> Sarge upgrades are no longer a concern. + (Closes: #327548) + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sat, 10 Sep 2005 18:40:13 -0400 + +meta-kde (5:44) unstable; urgency=low + + +++ Changes by Christopher Martin: + + * Overhaul the package descriptions. + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Mon, 14 Mar 2005 14:24:50 -0500 + +meta-kde (5:43) unstable; urgency=low + + * Added kdelibs3-bin dummy package to aid woody transitions. + + -- Riku Voipio <riku.voipio@iki.fi> Tue, 14 Dec 2004 00:12:46 +0200 + +meta-kde (5:42) unstable; urgency=medium + + * The "why is kde in debian still 3.1.2" Release + * Disconnect meta-kde version numbers from kde. + * Change quanta to kdewebdev (Closes: #256574) + * Fix a typo (Closes: #231491) + * Suggest x-window-system-core (Closes: #237649) + * Add myself as uploaders + + -- Riku Voipio <riku.voipio@iki.fi> Tue, 16 Nov 2004 19:10:41 +0000 + +meta-kde (4:3.1.2) unstable; urgency=low + + * Split unofficial KDE packages into meta-kde-extras source. + * Fixed a typo in description. (Closes: #190718) + + -- Christopher L Cheney <ccheney@debian.org> Tue, 6 Jan 2004 02:00:00 -0600 + +meta-kde (4:3.1.1) unstable; urgency=low + + * Fixed a typo in description. + + -- Christopher L Cheney <ccheney@debian.org> Mon, 21 Apr 2003 00:30:00 -0500 + +meta-kde (4:3.1.0) unstable; urgency=low + + * Updated for KDE 3.1.1. (Closes: #135796, #182474, #188385) + * KDM is now only Recommended. (Closes: #123466) + * Bibletime is no longer in kde-extras due to being KDE2. (Closes: #158561) + + -- Christopher L Cheney <ccheney@debian.org> Sun, 13 Apr 2003 19:00:00 -0500 + +meta-kde (4:2.2.25) unstable; urgency=high + + * Removed kyahoo from kde-extras. Closes: #144708 (RC) + Arn't meta packages fun, sigh. + + -- Joey Hess <joeyh@debian.org> Sat, 27 Apr 2002 11:39:45 -0400 + +meta-kde (4:2.2.24) unstable; urgency=high + + * Move a few more deps around + * kamera wasn't even in the list + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 14 Mar 2002 11:55:00 -0700 + +meta-kde (4:2.2.23) unstable; urgency=low + + * A few more + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 11 Mar 2002 22:00:00 -0700 + +meta-kde (4:2.2.22) unstable; urgency=low + + * knapster2, kdestudio, kdesdk, and kdepim don't build on all archs + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 11 Mar 2002 11:00:00 -0700 + +meta-kde (4:2.2.21) unstable; urgency=low + + * One more cleanup. Now we are just waiting on hppa to catch up + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 09 Mar 2002 21:40:00 -0700 + +meta-kde (4:2.2.20) unstable; urgency=low + + * Remove kfilereplace + * Move several packages to suggests as they are either buggy or not + avail on all archs + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 09 Mar 2002 02:52:00 -0700 + +meta-kde (4:2.2.19) unstable; urgency=low + + * Change maintainer + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 17 Feb 2002 18:00:00 -0700 + +meta-kde (4:2.2.18) unstable; urgency=low + + * Fix spelling (Closes: #124411, #124784) + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 17 Dec 2001 15:16:00 -0700 + +meta-kde (4:2.2.17) unstable; urgency=low + + * Allow for kde3 co-existance + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 16 Dec 2001 05:23:00 -0700 + +meta-kde (4:2.2.16) unstable; urgency=low + + * Move kdemultimedia based packages to Suggests since they are not + available for all released archs. + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 02 Dec 2001 23:46:00 -0700 + +meta-kde (4:2.2.15) unstable; urgency=low + + * Remove pointers to -cvs packages + * Don't need these versions for woody's release so get rid of them. + * Cleanup changelog + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 29 Nov 2001 06:56:00 -0700 + +meta-kde (4:2.2.14) unstable; urgency=low + + * Remove recommends of libssl as that breaks policy + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 22 Nov 2001 22:58:00 -0700 + +meta-kde (4:2.2.13) unstable; urgency=low + + * Add info on sub-pixel AA + * 2.2.2 branding + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 19 Nov 2001 23:10:00 -0700 + +meta-kde (4:2.2.12) unstable; urgency=low + + * drop back to 2.2.1 until I upload 2.2.2 just to keep things sane + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 16 Nov 2001 00:28:00 -0700 + +meta-kde (4:2.2.11) unstable; urgency=low + + * Tweak deps so that one could intermix arts stuff from kde3-cvs with kde2 + stuff + * Add libssl0.9.6 recommends just to be nice + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 10 Nov 2001 20:28:00 -0700 + +meta-kde (4:2.2.10) unstable; urgency=low + + * Updated for KDE 2.2.2 and Qt 2.3.2 + * Remove pointers to any crypto packages + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 09 Nov 2001 11:17:00 -0700 + +meta-kde (4:2.2.9) unstable; urgency=low + + * Add korinico and kreatecd + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 30 Oct 2001 22:30:00 -0700 + +meta-kde (4:2.2.8) unstable; urgency=low + + * Replace kmsn with kmerlin (Closes: #116828) + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 24 Oct 2001 10:01:00 -0700 + +meta-kde (4:2.2.7) unstable; urgency=low + + * Update versioned deps and remove unnecessary ones + * Update Standards version + * Change Build-Depends to Build-Depends-Indep since the packages being + created are indep packages and not binary specific. + * Update XftConfig example + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 20 Oct 2001 22:24:00 -0700 + +meta-kde (4:2.2.6) unstable; urgency=low + + * Update priorities + * Add ktexmaker2 (Closes: #112573) + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 17 Sep 2001 14:00:00 -0700 + +meta-kde (4:2.2.5) unstable; urgency=low + + * Updated for 2.2.1 + * Update Xft config file (Closes: #112358) + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 17 Sep 2001 11:48:00 -0700 + +meta-kde (4:2.2.4) unstable; urgency=low + + * Added knewsticker-scripts (Closes: #110315) + * Add kinkatta + * Add kcd + * Change keuklid to kgeo + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 29 Aug 2001 00:38:00 -0700 + +meta-kde (4:2.2.3) unstable; urgency=low + + * Remove kups + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 22 Aug 2001 18:45:00 -0700 + +meta-kde (4:2.2.2) unstable; urgency=low + + * Add missing packages (Closes: #109373) + * Add missing games (Closes: #109433) + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 21 Aug 2001 00:01:00 -0700 + +meta-kde (4:2.2.1) unstable; urgency=low + + * Remove skam (Closes: #109019) + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 17 Aug 2001 08:50:00 -0700 + +meta-kde (4:2.2) unstable; urgency=low + + * Update deps for final 2.2 packages - actually do version deps so that + those who just like updating the meta-package won't get hosed...this + would only be an issue for those in testing/sid land. I think for final + release I'll take out the version deps to cut down on Packages size and + all...plus there really is no need for it for the release. I can go + back to versioned deps afterwards. + * add conflicts for old task-* packages...let's make sure they get removed + * Packages removed from kde-extras: kaim + kaim had to change it's name due to AOL being stupid and claiming TM on + the name AIM and use of it. I'll add the new package name once I get + packages built for it. They plon on a 1.00 release under the new name + however it still isn't available. The new name is kinkatta. + * New packages added to kde-extras: kooka, libkscan1, kandy, kmsn, + skam, mp3kult, licq-plugin-kde, knapster2, kaptain, wordtrans-kde + * New packages added to kde-devel: kspy, kbabel + * New packages added to kde: kdelibs3-crypto, kdebase-crypto, kdessh, + aktion, kde-i18n (all as suggests) + * New packages added to kde-games: kdecarddecks + * Moved kde-games from a suggests to a recommends for kde. + * Moved plugins and artwork from kde to kde-extras + * Change dep for kdm to kdm | x-display-manager which will exist soon. + * Install the Readme into the kde-extras package like the others. + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 10 Aug 2001 03:22:00 -0700 + +meta-kde (4:2.1.44) unstable; urgency=low + + * Fix libkmid | libkmid-alsa dep (Closes: #107585) + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 03 Aug 2001 11:28:00 -0700 + +meta-kde (4:2.1.43) unstable; urgency=low + + * Fix typo (Closes: #107371) + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 01 Aug 2001 09:49:00 -0700 + +meta-kde (4:2.1.42) unstable; urgency=low + + * br translations for debconf (Closes: #107033) + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 30 Jul 2001 00:58:00 -0700 + +meta-kde (4:2.1.41) unstable; urgency=low + + * Remove kamera...got ahead of myself + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 27 Jul 2001 20:27:00 -0700 + +meta-kde (4:2.1.40) unstable; urgency=low + + * Remove ksysctrl + * Update note about NVidia drivers in howto + * Add kamera + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 27 Jul 2001 00:49:00 -0700 + +meta-kde (4:2.1.39) unstable; urgency=low + + * Remove old dep on ktimemon + * Update descriptions + * Fix deps (Closes: #106425) + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 25 Jul 2001 03:37:00 -0700 + +meta-kde (4:2.1.38) unstable; urgency=low + + * Set some versioning for certain key packages + * add some or's (Closes: #96809) + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 19 Jul 2001 14:36:00 -0700 + +meta-kde (4:2.1.37) unstable; urgency=low + + * Get rid of task- prefixes since they are closer to meta packages than + tasks and tasks are handled differently now + * Change source package name to meta-kde to avoid confusion + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 17 Jul 2001 13:47:00 -0700 + +task-kde (4:2.1.36) unstable; urgency=low + + * Fix typo - thanks Martin Sj|gren <md9ms@mdstud.chalmers.se> + * Swedish tranlations (Closes: #103141) + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 02 Jul 2001 23:00:00 -0700 + +task-kde (4:2.1.35) unstable; urgency=low + + * kworldwatch -> kworldclock + * add kdeartwork and the addons bits + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 29 Jun 2001 20:00:00 -0700 + +task-kde (4:2.1.34) unstable; urgency=low + + * Update for 2.2 + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 28 Jun 2001 22:15:00 -0700 + +task-kde (4:2.1.33) unstable; urgency=low + + * Add konverse (Closes: #101037) + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 18 Jun 2001 22:15:00 -0700 + +task-kde (4:2.1.32) unstable; urgency=low + + * Add kleandisk (Closes: #98175) + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 23 May 2001 12:06:00 -0700 + +task-kde (4:2.1.31) unstable; urgency=low + + * Add keuklid (Closes: #98046) + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 22 May 2001 00:35:00 -0700 + +task-kde (4:2.1.30) unstable; urgency=low + + * Fix task issue (Closes: #97308, #97309) + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 13 May 2001 02:10:00 -0700 + +task-kde (4:2.1.29) unstable; urgency=low + + * New depends: kscreensaver, kdebase-audiolibs + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 12 May 2001 01:11:00 -0700 + +task-kde (4:2.1.28) unstable; urgency=low + + * new translations for debconf (Closes: #96515) + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 06 May 2001 18:22:00 -0700 + +task-kde (4:2.1.27) unstable; urgency=low + + * Add kweather (Closes: #96370) + * Happy birthday dad! + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 05 May 2001 02:13:00 -0700 + +task-kde (4:2.1.26) unstable; urgency=low + + * More dependency updates + * Update descriptions + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 04 May 2001 03:53:00 -0700 + +task-kde (4:2.1.24) unstable; urgency=low + + * Major cleanup + Removed all |'s from task packages + Removed all Suggests from task packages + Removed all Recommends from task packages + New task-kde-extras package which will contain all non-essential kde + packages including those considered to *possibly* open up security + risks such as required a ftp server or a talkd server. + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 02 May 2001 00:27:00 -0700 + +task-kde (4:2.1.23) unstable; urgency=low + + * Change Recommends to Suggests for ktalkd (Closes: #95661) + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 28 Apr 2001 17:46:00 -0700 + +task-kde (4:2.1.22) unstable; urgency=low + + * Changing AA package name to anti-aliasing-howto to keep the task bigots + of my ass. + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 28 Apr 2001 03:22:00 -0700 + +task-kde (4:2.1.21) unstable; urgency=low + + * More dependency work + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 24 Apr 2001 17:42:00 -0700 + +task-kde (4:2.1.20) unstable; urgency=low + + * Do kdevelop | kdestudio (Closes: #94377) + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 19 Apr 2001 10:43:00 -0700 + +task-kde (4:2.1.19) unstable; urgency=low + + * More depends movement. + Move Recommends parts in -dev package to Depends + Move koffice to Recommends from Depends as it's not an official release + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 18 Apr 2001 01:03:00 -0700 + +task-kde (4:2.1.18) unstable; urgency=low + + * Change Depends to Recommends for xfs since it's not required + * Add in german debconf bit (Closes: #94086) + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 15 Apr 2001 20:10:00 -0700 + +task-kde (4:2.1.17) unstable; urgency=low + + * Replace individual koffice packages with single "koffice" package + * Move a few packages from Suggests to Depends + * Change Recommends to Depends for task-kde-games + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 14 Apr 2001 00:27:00 -0700 + +task-kde (4:2.1.16) unstable; urgency=low + + * Add link to Linux Planet tutorial on AA + * Add link to Keith Packard's web page + * Add in bit to XftConfig example for turning of AA for font sizes smaller + than 11pixels. Submitted by Christian Mayrhuber + * Add cervisia to task-kde-devel package + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 08 Apr 2001 04:44:00 -0700 + +task-kde (4:2.1.15) unstable; urgency=low + + * Update font pathing in XftConfig and README + * Re-arrange some of the depends for task-anti-aliasing due to some of the + items being contrib and non-free. Make all but necessary fonts Suggests. + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 08 Apr 2001 04:44:00 -0700 + +task-kde (4:2.1.14) unstable; urgency=low + + * Add kaim + * Add kyahoo + * Add aethera + * New package: task-anti-aliasing + This will depend on packages required for AA (Anti Aliasing) support + as well as other suggests/recommends. Added documentation and eventual + debconf configuration and checks to make sure basic items are setup. + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 07 Apr 2001 03:34:00 -0700 + +task-kde (4:2.1.13) unstable; urgency=low + + * Move klisa from depends to recommends + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 02 Apr 2001 10:10:00 -0700 + +task-kde (4:2.1.12) unstable; urgency=low + + * Add kcpuload to suggests (Closes: #92016) + * Rearrange kdesdk deps (Closes: #92017) + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 30 Mar 2001 21:22:00 -0700 + +task-kde (4:2.1.11) unstable; urgency=low + + * Change dependency for lisa to klisa and moving to depends + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 27 Mar 2001 03:42:00 -0700 + +task-kde (4:2.1.10) unstable; urgency=low + + * New package: task-kde-games which will act like the task-gnome-games and + will recommend all kde based games or toys + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 26 Mar 2001 11:36:00 -0700 + +task-kde (4:2.1.9) unstable; urgency=low + + * Remove old kformula + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 11 Mar 2001 23:48:00 -0700 + +task-kde (4:2.1.8) unstable; urgency=low + + * Fix task-kde-devel depends for xlib6g|xlibs + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 11 Mar 2001 07:25:00 -0700 + +task-kde (4:2.1.7) unstable; urgency=low + + * Add other non-core kde apps to Suggests + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 08 Mar 2001 02:52:00 -0700 + +task-kde (4:2.1.6) unstable; urgency=low + + * Add Recommend for kprof (Closes: #88659) + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 05 Mar 2001 23:44:00 -0700 + +task-kde (4:2.1.5) unstable; urgency=low + + * Add in suggests/recommends for some font packages and whatnot needed for + AA use. + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 01 Mar 2001 07:23:00 -0700 + +task-kde (4:2.1.4) unstable; urgency=low + + * Take into account new qt package + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 23 Feb 2001 10:15:00 -0700 + +task-kde (4:2.1.3) unstable; urgency=low + + * Adding in depends/recommends/suggests for kdesdk and kdebindings packages + that are either in now or will be with 2.1 + * Adding in missing depends for ldap and cdparanoia -dev + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 20 Feb 2001 02:37:00 -0700 + +task-kde (4:2.1.2) unstable; urgency=low + + * Updating Depends to not include some non-base type packages and putting + them in recommends/suggests + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 19 Feb 2001 00:54:00 -0700 + +task-kde (4:2.1.1) unstable; urgency=low + + * Changing depends from libqt2.2-dev to libqt-dev and from kdelibs3-dev + to kdelibs-dev + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 15 Feb 2001 03:45:00 -0700 + +task-kde (4:2.1.0) unstable; urgency=low + + * Broke out task packages + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 09 Feb 2001 02:31:00 -0700 + +task-kde (4:2.0.0) unstable; urgency=low + + * More work on nspluginscan to avoid problems with faulty plugins + * Several small bug fixes from upstream + * Adding xutils to task-kde-devel package + * Fixing conflict with kfind (Closes: #83709) + * Fixing default bs for konsole for those not using "linux" or "vt100" + (Closes: #83705) + * Adding notation to konqueror about page about kdelibs3-crypto + * Applying German debconf template (Closes: #83871) + * Should also handle upgrade cleanup better. This is across the board but + affects base more than any other package. (Closes: #83543) + * Fixes problem with symbols in konsole (Closes: #83987) + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 28 Jan 2001 01:30:00 -0700 diff --git a/debian/squeeze/metapackages/meta-tde/debian/compat b/debian/squeeze/metapackages/meta-tde/debian/compat new file mode 100644 index 000000000..1e8b31496 --- /dev/null +++ b/debian/squeeze/metapackages/meta-tde/debian/compat @@ -0,0 +1 @@ +6 diff --git a/debian/squeeze/metapackages/meta-tde/debian/control b/debian/squeeze/metapackages/meta-tde/debian/control new file mode 100644 index 000000000..12ddd9aaf --- /dev/null +++ b/debian/squeeze/metapackages/meta-tde/debian/control @@ -0,0 +1,60 @@ +Source: meta-kde-trinity +Section: kde +Priority: optional +Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Sune Vuorela <debian@pusling.com>, Fathi Boudra <fabo@debian.org>, Armin Berres <trigger+debian@space-based.de> +Build-Depends: debhelper (>= 6) +Standards-Version: 3.7.3 +Homepage: http://www.kde.org + +Package: kde-trinity +Architecture: all +Section: kde +Priority: optional +Depends: kde-core-trinity (>= 5:47), kde-core-trinity (>= 5:47), kdeedu-trinity (>= 4:3.5.5), kdegames-trinity (>= 4:3.5.5), kdetoys-trinity (>= 4:3.5.5), kdeaccessibility-trinity (>= 4:3.5.5), kdeaddons-trinity (>= 4:3.5.5), kdeadmin-trinity (>= 4:3.5.5), kdeartwork-trinity (>= 4:3.5.5), kdegraphics-trinity (>= 4:3.5.5), kdemultimedia-trinity (>= 4:3.5.5), kdenetwork-trinity (>= 4:3.5.5), kdepim-trinity (>= 4:3.5.5), kdeutils-trinity (>= 4:3.5.5), kdewebdev-trinity (>= 4:3.5.5), desktop-base-trinity +Suggests: kde-i18n-trinity (>= 4:3.5.5), x-window-system-core, kdesudo-trinity, debian-kgtk-trinity +Description: the K Desktop Environment official modules [Trinity] + KDE (the K Desktop Environment) is a powerful Open Source graphical + desktop environment for Unix workstations. It combines ease of use, + contemporary functionality, and outstanding graphical design with the + technological superiority of the Unix operating system. + . + This metapackage includes all the official modules released with KDE that + are not specific to development. In addition to the core KDE modules, this + includes multimedia, networking, personal information manager (PIM), + graphics, education, games, web development, system administration tools, + and other artwork and utilities. + + +Package: kde-core-trinity +Architecture: all +Section: kde +Priority: optional +Depends: arts-trinity (>= 1.5.5), kdebase-trinity (>= 4:3.5.5), kdelibs-trinity (>= 4:3.5.5), sudo-trinity +Suggests: kde-i18n-trinity (>= 4:3.5.5) +Description: the K Desktop Environment core modules [Trinity] + KDE (the K Desktop Environment) is a powerful Open Source graphical + desktop environment for Unix workstations. It combines ease of use, + contemporary functionality, and outstanding graphical design with the + technological superiority of the Unix operating system. + . + This metapackage includes the core official modules released with KDE. This + includes just the basic desktop (browser, file manager, text editor, control + center, panel, etc.) and important libraries and data, in addition to the + aRts soundserver. + +Package: kde-devel-trinity +Architecture: all +Section: kde +Priority: optional +Depends: kde-core-trinity (>= 5:48), kdesdk-trinity (>= 4:3.5.5), libartsc0-trinity-dev (>= 1.5.5), libarts1-trinity-dev (>= 1.5.5), kdelibs4-trinity-dev (>= 4:3.5.5), kdebase-trinity-dev (>= 4:3.5.5), libkonq4-trinity-dev (>= 4:3.5.5), qt3-designer +Suggests: kde-i18n-trinity (>= 4:3.5.5), kdbg-trinity, kdevelop-trinity (>= 4:3.3.5), kprof-trinity +Description: the K Desktop Environment development files and modules [Trinity] + KDE (the K Desktop Environment) is a powerful Open Source graphical + desktop environment for Unix workstations. It combines ease of use, + contemporary functionality, and outstanding graphical design with the + technological superiority of the Unix operating system. + . + This metapackage includes official KDE modules that are useful to developers, + including KDE's software development kit (SDK), Qt3's designer tool, and all + core KDE header and development packages. diff --git a/debian/squeeze/metapackages/meta-tde/debian/copyright b/debian/squeeze/metapackages/meta-tde/debian/copyright new file mode 100644 index 000000000..a007b7115 --- /dev/null +++ b/debian/squeeze/metapackages/meta-tde/debian/copyright @@ -0,0 +1,20 @@ +This package was created by Ivan E. Moore II <rkrusty@debian.org>. + +Copyright (C) 2001 Ivan E. Moore II +Copyright (C) 2003 Christopher L. Cheney +Copyright (C) 2004-2008 Debian Qt/KDE Maintainers + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABLILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. You should have received a +copy of the GNU General Public License along with this program; if +not, write to the Free Software Foundation, Inc, 51 Franklin St, +Fifth Floor, Boston, MA 02110-1301, USA. + +Please see /usr/share/common-licenses/GPL for the full license. diff --git a/debian/squeeze/metapackages/meta-tde/debian/kde-core.README.Debian b/debian/squeeze/metapackages/meta-tde/debian/kde-core.README.Debian new file mode 120000 index 000000000..903888432 --- /dev/null +++ b/debian/squeeze/metapackages/meta-tde/debian/kde-core.README.Debian @@ -0,0 +1 @@ +README.Debian
\ No newline at end of file diff --git a/debian/squeeze/metapackages/meta-tde/debian/kde-devel.README.Debian b/debian/squeeze/metapackages/meta-tde/debian/kde-devel.README.Debian new file mode 120000 index 000000000..903888432 --- /dev/null +++ b/debian/squeeze/metapackages/meta-tde/debian/kde-devel.README.Debian @@ -0,0 +1 @@ +README.Debian
\ No newline at end of file diff --git a/debian/squeeze/metapackages/meta-tde/debian/kde.README.Debian b/debian/squeeze/metapackages/meta-tde/debian/kde.README.Debian new file mode 120000 index 000000000..903888432 --- /dev/null +++ b/debian/squeeze/metapackages/meta-tde/debian/kde.README.Debian @@ -0,0 +1 @@ +README.Debian
\ No newline at end of file diff --git a/debian/squeeze/metapackages/meta-tde/debian/rules b/debian/squeeze/metapackages/meta-tde/debian/rules new file mode 100755 index 000000000..a3fbf99a7 --- /dev/null +++ b/debian/squeeze/metapackages/meta-tde/debian/rules @@ -0,0 +1,55 @@ +#!/usr/bin/make -f + +#export DH_VERBOSE=1 + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + +configure: configure-stamp +configure-stamp: + dh_testdir + + touch configure-stamp + +build: build-stamp + +build-stamp: configure-stamp + dh_testdir + touch $@ + +clean: + dh_testdir + dh_testroot + rm -f build-arch-stamp build-indep-stamp configure-stamp + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k -i + dh_installdirs -i + + +binary-arch: build install + +binary-indep: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installexamples +# dh_install +# dh_installinfo + dh_installman + dh_link + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure diff --git a/debian/squeeze/metapackages/sudo-trinity/debian/rules b/debian/squeeze/metapackages/sudo-trinity/debian/rules index 087848532..f8c89d5db 100755 --- a/debian/squeeze/metapackages/sudo-trinity/debian/rules +++ b/debian/squeeze/metapackages/sudo-trinity/debian/rules @@ -6,3 +6,6 @@ CFLAGS=-g -Wall -fPIC DEB_MAKE_INSTALL_TARGET := install DESTDIR="$(DEB_DESTDIR)" DEB_INSTALL_DOCS_ALL := + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) diff --git a/debian/squeeze/metapackages/sudo-trinity/debian/source/options b/debian/squeeze/metapackages/sudo-trinity/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/metapackages/sudo-trinity/debian/source/options +++ b/debian/squeeze/metapackages/sudo-trinity/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 diff --git a/debian/squeeze/tde-i18n/debian/control b/debian/squeeze/tde-i18n/debian/control index 11d0c979e..37422390f 100644 --- a/debian/squeeze/tde-i18n/debian/control +++ b/debian/squeeze/tde-i18n/debian/control @@ -25,7 +25,7 @@ Replaces: kde-i18n-ar-trinity (<< 4:14.0.0) Breaks: kde-i18n-ar-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde -Provides: tde-i18n-trinity-trinity +Provides: tde-i18n-trinity Description: Arabic (ar) internationalized (i18n) files for KDE This package contains the Arabic internationalized (i18n) files for all KDE core applications. @@ -505,7 +505,7 @@ Replaces: kde-i18n-nb-trinity (<< 4:14.0.0) Breaks: kde-i18n-nb-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde -Provides: tde-i18n-trinity, tde-i18n-no +Provides: tde-i18n-trinity, tde-i18n-no-trinity Description: Norwegian Bookmal (nb) internationalized (i18n) files for KDE This package contains the Norwegian Bookmal internationalized (i18n) files for all KDE core applications. diff --git a/debian/squeeze/tde-i18n/debian/rules b/debian/squeeze/tde-i18n/debian/rules index e275e35df..b60af22ee 100755 --- a/debian/squeeze/tde-i18n/debian/rules +++ b/debian/squeeze/tde-i18n/debian/rules @@ -31,6 +31,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + debian/debiandirs: scripts/admin/debianrules perl -w scripts/admin/debianrules echodirs > debian/debiandirs @@ -107,7 +110,7 @@ binary-indep: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Below here is fairly generic really diff --git a/debian/squeeze/tde-i18n/debian/source/options b/debian/squeeze/tde-i18n/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/tde-i18n/debian/source/options +++ b/debian/squeeze/tde-i18n/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 diff --git a/debian/squeeze/tdeaccessibility/debian/rules b/debian/squeeze/tdeaccessibility/debian/rules index f5c6caf43..4fdbdb6c3 100755 --- a/debian/squeeze/tdeaccessibility/debian/rules +++ b/debian/squeeze/tdeaccessibility/debian/rules @@ -18,6 +18,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := \ DEB_DH_STRIP_ARGS := --dbg-package=tdeaccessibility-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := kttsd-trinity ksayit-trinity #shlibs_ver = 4:3.5.0 diff --git a/debian/squeeze/tdeaccessibility/debian/source/options b/debian/squeeze/tdeaccessibility/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/tdeaccessibility/debian/source/options +++ b/debian/squeeze/tdeaccessibility/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 diff --git a/debian/squeeze/tdeaddons/debian/rules b/debian/squeeze/tdeaddons/debian/rules index 5d337bfab..e2158a506 100755 --- a/debian/squeeze/tdeaddons/debian/rules +++ b/debian/squeeze/tdeaddons/debian/rules @@ -16,6 +16,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := --without-xmms --prefix=/opt/trinity --with-extra-l DEB_DH_STRIP_ARGS := --dbg-package=tdeaddons-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DOC_HTML_PRUNE := konq-plugins-trinity/smbmounter binary-install/konq-plugins-trinity:: diff --git a/debian/squeeze/tdeaddons/debian/source/options b/debian/squeeze/tdeaddons/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/tdeaddons/debian/source/options +++ b/debian/squeeze/tdeaddons/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 diff --git a/debian/squeeze/tdeadmin/debian/rules b/debian/squeeze/tdeadmin/debian/rules index 9c9ccadda..849de5f21 100755 --- a/debian/squeeze/tdeadmin/debian/rules +++ b/debian/squeeze/tdeadmin/debian/rules @@ -14,6 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_STRIP_ARGS := --dbg-package=tdeadmin-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_CONFIGURE_EXTRA_FLAGS := \ --without-rpm --with-pam=kde --with-shadow --with-nis \ --with-private-groups --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib diff --git a/debian/squeeze/tdeadmin/debian/source/options b/debian/squeeze/tdeadmin/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/tdeadmin/debian/source/options +++ b/debian/squeeze/tdeadmin/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 diff --git a/debian/squeeze/tdeartwork/debian/control b/debian/squeeze/tdeartwork/debian/control index 514fae94e..ee0ae9ba5 100644 --- a/debian/squeeze/tdeartwork/debian/control +++ b/debian/squeeze/tdeartwork/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-trinity-dev, gawk, gettext, sharutils, tdebase-trinity-dev, twin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), cmake, autotools-dev, tdelibs4-trinity-dev, gawk, gettext, sharutils, tdebase-trinity-dev, twin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies, automake, autoconf, libtool, libltdl-dev Build-Conflicts: autoconf2.13, nvidia-glx Standards-Version: 3.8.4 diff --git a/debian/squeeze/tdeartwork/debian/rules b/debian/squeeze/tdeartwork/debian/rules index be9adbbcd..4e236c044 100755 --- a/debian/squeeze/tdeartwork/debian/rules +++ b/debian/squeeze/tdeartwork/debian/rules @@ -1,6 +1,7 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk @@ -14,8 +15,22 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ARTS="ON" + DEB_DH_STRIP_ARGS := --dbg-package=tdeartwork-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + clean:: rm -f IconThemes/kdeclassic/22x22/actions/kde/kde.png rm -f IconThemes/kdeclassic/32x32/actions/kde/kde.png diff --git a/debian/squeeze/tdeartwork/debian/source/options b/debian/squeeze/tdeartwork/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/tdeartwork/debian/source/options +++ b/debian/squeeze/tdeartwork/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 diff --git a/debian/squeeze/tdebase/debian/80ubuntu-xmodmap b/debian/squeeze/tdebase/debian/80ubuntu-xmodmap index 27a318d73..7774dd9b8 100644 --- a/debian/squeeze/tdebase/debian/80ubuntu-xmodmap +++ b/debian/squeeze/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/debian/squeeze/tdebase/debian/control b/debian/squeeze/tdebase/debian/control index 39819b4ea..7f0ff08d3 100644 --- a/debian/squeeze/tdebase/debian/control +++ b/debian/squeeze/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/debian/squeeze/tdebase/debian/rules b/debian/squeeze/tdebase/debian/rules index a5183fe19..c72887aaa 100755 --- a/debian/squeeze/tdebase/debian/rules +++ b/debian/squeeze/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/debian/squeeze/tdebase/debian/source/options b/debian/squeeze/tdebase/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/tdebase/debian/source/options +++ b/debian/squeeze/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 diff --git a/debian/squeeze/tdebindings/debian/rules b/debian/squeeze/tdebindings/debian/rules index 6a0e11dc7..b503f7580 100755 --- a/debian/squeeze/tdebindings/debian/rules +++ b/debian/squeeze/tdebindings/debian/rules @@ -35,6 +35,9 @@ DEB_CONFIGURE_EXTRA_FLAGS = $(WITH_JAVA) \ DEB_COMPRESS_EXCLUDE += .java .ui .js .rb .map .wav .bmp .cpp .sk +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are not all the packages with libraries, but only those that # need to be in DEB_SHLIBDEPS_INCLUDE... PACKAGES_WITH_LIBS = libqt3-jni-trinity libsmokeqt1-trinity libsmokekde1-trinity libkjsembed1-trinity diff --git a/debian/squeeze/tdebindings/debian/source/options b/debian/squeeze/tdebindings/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/tdebindings/debian/source/options +++ b/debian/squeeze/tdebindings/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 diff --git a/debian/squeeze/tdeedu/debian/rules b/debian/squeeze/tdeedu/debian/rules index d1258cdf0..9f81df4c0 100755 --- a/debian/squeeze/tdeedu/debian/rules +++ b/debian/squeeze/tdeedu/debian/rules @@ -16,6 +16,9 @@ DEB_DH_INSTALL_SOURCEDIR := $(DEB_DESTDIR) DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # Ensure that kig's python scripting built successfully. common-build-arch:: test -e $(DEB_BUILDDIR)/kig/scripting/libscripting.la diff --git a/debian/squeeze/tdeedu/debian/source/options b/debian/squeeze/tdeedu/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/tdeedu/debian/source/options +++ b/debian/squeeze/tdeedu/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 diff --git a/debian/squeeze/tdegames/debian/rules b/debian/squeeze/tdegames/debian/rules index a979e0440..085eb8404 100755 --- a/debian/squeeze/tdegames/debian/rules +++ b/debian/squeeze/tdegames/debian/rules @@ -26,6 +26,9 @@ DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if DEB_INSTALL_CHANGELOGS_tdegames := $(DEB_SRCDIR)/ChangeLog +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_DH_MAKESHLIBS_ARGS_libtdegames1-trinity := -V'libtdegames1-trinity' DEB_DH_MAKESHLIBS_ARGS_atlantik-trinity := -V DEB_DH_MAKESHLIBS_ARGS_kolf-trinity := -V diff --git a/debian/squeeze/tdegames/debian/source/options b/debian/squeeze/tdegames/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/tdegames/debian/source/options +++ b/debian/squeeze/tdegames/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 diff --git a/debian/squeeze/tdegraphics/debian/rules b/debian/squeeze/tdegraphics/debian/rules index 927f3faf8..9aedb5fcf 100755 --- a/debian/squeeze/tdegraphics/debian/rules +++ b/debian/squeeze/tdegraphics/debian/rules @@ -24,6 +24,9 @@ DEB_BUILD_PARALLEL = true DEB_DH_STRIP_ARGS := --dbg-package=tdegraphics-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := kfaxview-trinity kghostview-trinity kmrml-trinity kpovmodeler-trinity ksvg-trinity \ kuickshow-trinity kview-trinity kviewshell-trinity libkscan1-trinity diff --git a/debian/squeeze/tdegraphics/debian/source/options b/debian/squeeze/tdegraphics/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/tdegraphics/debian/source/options +++ b/debian/squeeze/tdegraphics/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 diff --git a/debian/squeeze/tdelibs/debian/rules b/debian/squeeze/tdelibs/debian/rules index 3c7a4b8a7..44ac6deda 100755 --- a/debian/squeeze/tdelibs/debian/rules +++ b/debian/squeeze/tdelibs/debian/rules @@ -36,6 +36,9 @@ DEB_FIXPERMS_EXCLUDE := \ DEB_DH_STRIP_ARGS := --dbg-package=tdelibs-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + binary-install/tdelibs-data-trinity:: install -p -D -m644 kded/applications.menu debian/tdelibs-data-trinity/opt/trinity/etc/xdg/menus/kde-applications.menu install -p -D -m644 debian/trinitylibs.conf debian/tdelibs-data-trinity/etc/ld.so.conf.d/trinitylibs.conf diff --git a/debian/squeeze/tdelibs/debian/source/options b/debian/squeeze/tdelibs/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/tdelibs/debian/source/options +++ b/debian/squeeze/tdelibs/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 diff --git a/debian/squeeze/tdemultimedia/debian/rules b/debian/squeeze/tdemultimedia/debian/rules index 336c7e70d..1e7e0647c 100755 --- a/debian/squeeze/tdemultimedia/debian/rules +++ b/debian/squeeze/tdemultimedia/debian/rules @@ -23,6 +23,9 @@ DOC_HTML_PRUNE := kcontrol-trinity DEB_DH_STRIP_ARGS := --dbg-package=tdemultimedia-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := artsbuilder-trinity tdemultimedia-kio-plugins-trinity kmid-trinity kmix-trinity krec-trinity \ libarts1-akode-trinity libarts1-audiofile-trinity libarts1-mpeglib-trinity libarts1-xine-trinity \ libkcddb1-trinity mpeglib-trinity noatun-trinity diff --git a/debian/squeeze/tdemultimedia/debian/source/options b/debian/squeeze/tdemultimedia/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/tdemultimedia/debian/source/options +++ b/debian/squeeze/tdemultimedia/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 diff --git a/debian/squeeze/tdenetwork/debian/control b/debian/squeeze/tdenetwork/debian/control index 637a8912d..a1a2dcb2b 100644 --- a/debian/squeeze/tdenetwork/debian/control +++ b/debian/squeeze/tdenetwork/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>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com>, Sarah Hobbs <hobbsee@ubuntu.com>, Sune Vuorela <debian@pusling.com> -Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs4-trinity-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), cmake, autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs4-trinity-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: tdenetwork-trinity @@ -149,7 +149,7 @@ Architecture: any Replaces: kopete-trinity (<< 4:14.0.0) Breaks: kopete-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} -Recommends: qca-tls +Recommends: tqca-tls Suggests: tdeartwork-emoticons-trinity, khelpcenter-trinity, imagemagick, gnupg, gnomemeeting Description: instant messenger for Trinity Kopete is an instant messenger program which can communicate with a variety diff --git a/debian/squeeze/tdenetwork/debian/control.in b/debian/squeeze/tdenetwork/debian/control.in index ec41ae06a..1c7fc62f9 100644 --- a/debian/squeeze/tdenetwork/debian/control.in +++ b/debian/squeeze/tdenetwork/debian/control.in @@ -132,7 +132,7 @@ Package: kopete Section: tde Architecture: any Depends: ${shlibs:Depends} -Recommends: qca-tls +Recommends: tqca-tls Suggests: tdeartwork-emoticons, khelpcenter, imagemagick, gnupg, gnomemeeting Replaces: konversation (<= 0.14.0-4), sim (<= 0.9.3-2) Description: instant messenger for KDE diff --git a/debian/squeeze/tdenetwork/debian/rules b/debian/squeeze/tdenetwork/debian/rules index bab6267ec..2579d07e3 100755 --- a/debian/squeeze/tdenetwork/debian/rules +++ b/debian/squeeze/tdenetwork/debian/rules @@ -13,6 +13,7 @@ export DH_OPTIONS # include debian/cdbs/buildvars.mk include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk @@ -26,8 +27,26 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_WEBCAM="ON" \ + -DWITH_ARTS="ON" \ + -DWITH_SLP="ON" \ + -DBUILD_KOPETE_PROTOCOL_ALL="ON" \ + -DBUILD_KOPETE_PLUGIN_ALL="ON" + DEB_DH_STRIP_ARGS := --dbg-package=tdenetwork-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := librss1-trinity kopete-trinity ksirc-trinity kwifimanager-trinity #shlibs_ver = 4:3.5.0-1 diff --git a/debian/squeeze/tdenetwork/debian/source/options b/debian/squeeze/tdenetwork/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/tdenetwork/debian/source/options +++ b/debian/squeeze/tdenetwork/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 diff --git a/debian/squeeze/tdepim/debian/rules b/debian/squeeze/tdepim/debian/rules index b20b4a7b9..0e1c5356b 100755 --- a/debian/squeeze/tdepim/debian/rules +++ b/debian/squeeze/tdepim/debian/rules @@ -32,6 +32,9 @@ DEB_INSTALL_DOCS_ALL := DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if test -s $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; then echo $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; break; fi; done) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + shlibs_ver=4:3.5.7 DEB_DH_MAKESHLIBS_ARGS_libindex0-trinity := -V'libindex0-trinity (>= $(shlibs_ver))' DEB_DH_MAKESHLIBS_ARGS_libkcal2b-trinity := -V'libkcal2b-trinity (>= $(shlibs_ver))' diff --git a/debian/squeeze/tdepim/debian/source/options b/debian/squeeze/tdepim/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/tdepim/debian/source/options +++ b/debian/squeeze/tdepim/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 diff --git a/debian/squeeze/tdesdk/debian/control b/debian/squeeze/tdesdk/debian/control index 16d2c2e6b..5305f7b08 100644 --- a/debian/squeeze/tdesdk/debian/control +++ b/debian/squeeze/tdesdk/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>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, +Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), cmake, autotools-dev, gawk, gettext, pkg-config, tdelibs4-trinity-dev, binutils-dev, bison, flex, tdepim-trinity-dev, libapr1-dev, libkcal2-trinity-dev, libktnef1-trinity-dev, libsvn-dev, libdb-dev, diff --git a/debian/squeeze/tdesdk/debian/rules b/debian/squeeze/tdesdk/debian/rules index 3675e531a..36d49b7c7 100755 --- a/debian/squeeze/tdesdk/debian/rules +++ b/debian/squeeze/tdesdk/debian/rules @@ -1,6 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk @@ -14,8 +15,23 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_STRIP_ARGS := --dbg-package=tdesdk-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_DBSEARCHENGINE="ON" \ + -DWITH_KCAL="ON" + PACKAGES_WITH_LIBS := kbabel-trinity kompare-trinity kspy-trinity kunittest-trinity libcvsservice0-trinity umbrello-trinity #shlibs_ver = 4:3.5.0-1 diff --git a/debian/squeeze/tdesdk/debian/source/options b/debian/squeeze/tdesdk/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/tdesdk/debian/source/options +++ b/debian/squeeze/tdesdk/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 diff --git a/debian/squeeze/tdetoys/debian/control b/debian/squeeze/tdetoys/debian/control index e583487ae..a603814b4 100644 --- a/debian/squeeze/tdetoys/debian/control +++ b/debian/squeeze/tdetoys/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>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com> -Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-trinity-dev, gawk, gettext, sharutils, automake, autoconf, libtool, libltdl-dev +Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), cmake, autotools-dev, tdelibs4-trinity-dev, gawk, gettext, sharutils, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: tdetoys-trinity diff --git a/debian/squeeze/tdetoys/debian/rules b/debian/squeeze/tdetoys/debian/rules index 60a5a9cf4..da1268d9f 100755 --- a/debian/squeeze/tdetoys/debian/rules +++ b/debian/squeeze/tdetoys/debian/rules @@ -1,6 +1,7 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk @@ -14,7 +15,20 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" + DEB_DH_STRIP_ARGS := --dbg-package=tdetoys-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_INSTALL_CHANGELOGS_kodo-trinity := kodo/ChangeLog DEB_INSTALL_CHANGELOGS_kteatime-trinity := kteatime/ChangeLog diff --git a/debian/squeeze/tdetoys/debian/source/options b/debian/squeeze/tdetoys/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/tdetoys/debian/source/options +++ b/debian/squeeze/tdetoys/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 diff --git a/debian/squeeze/tdeutils/debian/control b/debian/squeeze/tdeutils/debian/control index 8af135969..23132b0e0 100644 --- a/debian/squeeze/tdeutils/debian/control +++ b/debian/squeeze/tdeutils/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>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, 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, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, sharutils, automake, autoconf, libtool, libltdl-dev +Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), cmake, autotools-dev, gawk, gettext, tdelibs4-trinity-dev, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, sharutils, automake, autoconf, libtool, libltdl-dev Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc Standards-Version: 3.8.4 diff --git a/debian/squeeze/tdeutils/debian/rules b/debian/squeeze/tdeutils/debian/rules index f0a8e0d00..19848196e 100755 --- a/debian/squeeze/tdeutils/debian/rules +++ b/debian/squeeze/tdeutils/debian/rules @@ -1,6 +1,7 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk @@ -16,10 +17,32 @@ DEB_KDE_APIDOX := yes DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_DPMS="ON" \ + -DWITH_ASUS="ON" \ + -DWITH_VAIO="ON" \ + -DWITH_THINKPAD="ON" \ + -DWITH_I8K="ON" \ + -DWITH_SNMP="ON" \ + -DWITH_SENSORS="ON" \ + -DWITH_XMMS="ON" \ + -DWITH_KNEWSTUFF="ON" + DOC_HTML_PRUNE := kcontrol-trinity kinfocenter-trinity ktimer-trinity kcharselect-trinity ksim-trinity DEB_DH_STRIP_ARGS := --exclude=examples --dbg-package=tdeutils-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := khexedit-trinity klaptopdaemon-trinity kmilo-trinity kregexpeditor-trinity ksim-trinity #shlibs_ver = 4:3.5.0-1 diff --git a/debian/squeeze/tdeutils/debian/source/options b/debian/squeeze/tdeutils/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/tdeutils/debian/source/options +++ b/debian/squeeze/tdeutils/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 diff --git a/debian/squeeze/tdevelop/debian/control b/debian/squeeze/tdevelop/debian/control index 6203fd52d..ba0e5814b 100644 --- a/debian/squeeze/tdevelop/debian/control +++ b/debian/squeeze/tdevelop/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Jeremy Lain <jeremy.laine@m4x.org> -Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), tdelibs4-trinity-dev, gettext, tdelibs4-trinity-doc, libtqtinterface-doc, flex, python, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, libdb-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), cmake, tdelibs4-trinity-dev, gettext, tdelibs4-trinity-doc, libtqtinterface-doc, flex, python, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, libdb-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: tdevelop-trinity diff --git a/debian/squeeze/tdevelop/debian/rules b/debian/squeeze/tdevelop/debian/rules index 74b304533..95a3981ea 100755 --- a/debian/squeeze/tdevelop/debian/rules +++ b/debian/squeeze/tdevelop/debian/rules @@ -5,6 +5,7 @@ makebuilddir:: [ -f debian/control.tmp ] || cp debian/control debian/control.tmp include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk @@ -16,6 +17,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := tdevelop-trinity DEB_KDE_ENABLE_FINAL := @@ -53,6 +57,20 @@ DEB_CONFIGURE_EXTRA_FLAGS := \ --prefix=/opt/trinity \ --with-extra-libs=/opt/trinity/lib +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_BUILDTOOL_ALL="ON" \ + -DWITH_LANGUAGE_ALL="ON" \ + -DWITH_VCS_ALL="ON" \ + -DQT_DOCDIR="/usr/share/qt3/doc/html" + binary-install/tdevelop-trinity:: mkdir -p debian/tdevelop-trinity/opt/trinity/share/pixmaps cp debian/tdevelop.xpm debian/tdevelop-trinity/opt/trinity/share/pixmaps diff --git a/debian/squeeze/tdevelop/debian/source/options b/debian/squeeze/tdevelop/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/tdevelop/debian/source/options +++ b/debian/squeeze/tdevelop/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 diff --git a/debian/squeeze/tdewebdev/debian/rules b/debian/squeeze/tdewebdev/debian/rules index 5a5ea2fd9..ad4eb9d85 100755 --- a/debian/squeeze/tdewebdev/debian/rules +++ b/debian/squeeze/tdewebdev/debian/rules @@ -28,6 +28,9 @@ endif DEB_DH_STRIP_ARGS := --dbg-package=tdewebdev-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := kommander-trinity #shlibs_ver = 4:3.5.0-1 diff --git a/debian/squeeze/tdewebdev/debian/source/options b/debian/squeeze/tdewebdev/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/squeeze/tdewebdev/debian/source/options +++ b/debian/squeeze/tdewebdev/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 diff --git a/debian/wheezy/applications/abakus/debian/rules b/debian/wheezy/applications/abakus/debian/rules index d0a475105..c856f7cae 100755 --- a/debian/wheezy/applications/abakus/debian/rules +++ b/debian/wheezy/applications/abakus/debian/rules @@ -22,6 +22,9 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS - DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. DEB_BUILD_PARALLEL = true diff --git a/debian/wheezy/applications/abakus/debian/source/options b/debian/wheezy/applications/abakus/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/abakus/debian/source/options +++ b/debian/wheezy/applications/abakus/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 diff --git a/debian/wheezy/applications/adept/debian/rules b/debian/wheezy/applications/adept/debian/rules index ee86e8e4f..742307eb6 100755 --- a/debian/wheezy/applications/adept/debian/rules +++ b/debian/wheezy/applications/adept/debian/rules @@ -14,6 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_MAKE_CHECK_TARGET := check DEB_CONFIGURE_EXTRA_FLAGS += --enable-adept --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # Enable us to locate the old libept-trinity library and includes CPPFLAGS += -I/opt/trinity/include LDFLAGS += -L/opt/trinity/lib -lept diff --git a/debian/wheezy/applications/adept/debian/source/options b/debian/wheezy/applications/adept/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/adept/debian/source/options +++ b/debian/wheezy/applications/adept/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 diff --git a/debian/wheezy/applications/amarok.cmake/debian/source/options b/debian/wheezy/applications/amarok.cmake/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/amarok.cmake/debian/source/options +++ b/debian/wheezy/applications/amarok.cmake/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 diff --git a/debian/wheezy/applications/amarok/debian/rules b/debian/wheezy/applications/amarok/debian/rules index deb43ebf7..77b0e3159 100755 --- a/debian/wheezy/applications/amarok/debian/rules +++ b/debian/wheezy/applications/amarok/debian/rules @@ -12,6 +12,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + ### VARIABLES # Exempt amarok engines from being handled as proper public libraries # by dh_makeshlibs diff --git a/debian/wheezy/applications/amarok/debian/source/options b/debian/wheezy/applications/amarok/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/amarok/debian/source/options +++ b/debian/wheezy/applications/amarok/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 diff --git a/debian/wheezy/applications/basket/debian/rules b/debian/wheezy/applications/basket/debian/rules index 46b74ab7e..d3cf5255e 100755 --- a/debian/wheezy/applications/basket/debian/rules +++ b/debian/wheezy/applications/basket/debian/rules @@ -10,6 +10,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -101,7 +104,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/wheezy/applications/basket/debian/source/options b/debian/wheezy/applications/basket/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/basket/debian/source/options +++ b/debian/wheezy/applications/basket/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 diff --git a/debian/wheezy/applications/bibletime/debian/rules b/debian/wheezy/applications/bibletime/debian/rules index ea4b62326..4106bf0f4 100755 --- a/debian/wheezy/applications/bibletime/debian/rules +++ b/debian/wheezy/applications/bibletime/debian/rules @@ -19,6 +19,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + binary-install/bibletime-trinity:: chmod 644 debian/bibletime-trinity/opt/trinity/share/apps/bibletime/pics/* chmod 644 debian/bibletime-trinity/opt/trinity/share/apps/bibletime/bibletimeui.rc diff --git a/debian/wheezy/applications/bibletime/debian/source/options b/debian/wheezy/applications/bibletime/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/bibletime/debian/source/options +++ b/debian/wheezy/applications/bibletime/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 diff --git a/debian/wheezy/applications/compizconfig-backend-kconfig/debian/rules b/debian/wheezy/applications/compizconfig-backend-kconfig/debian/rules index c5dd59ccb..85efaa2fa 100755 --- a/debian/wheezy/applications/compizconfig-backend-kconfig/debian/rules +++ b/debian/wheezy/applications/compizconfig-backend-kconfig/debian/rules @@ -13,6 +13,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/wheezy/applications/compizconfig-backend-kconfig/debian/source/options b/debian/wheezy/applications/compizconfig-backend-kconfig/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/compizconfig-backend-kconfig/debian/source/options +++ b/debian/wheezy/applications/compizconfig-backend-kconfig/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 diff --git a/debian/wheezy/applications/desktop-effects-tde/debian/rules b/debian/wheezy/applications/desktop-effects-tde/debian/rules index 7bf3e3306..d494616db 100755 --- a/debian/wheezy/applications/desktop-effects-tde/debian/rules +++ b/debian/wheezy/applications/desktop-effects-tde/debian/rules @@ -9,5 +9,8 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + binary-install/desktop-effects-tde-trinity:: dh_pycentral -pdesktop-effects-tde-trinity diff --git a/debian/wheezy/applications/desktop-effects-tde/debian/source/options b/debian/wheezy/applications/desktop-effects-tde/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/desktop-effects-tde/debian/source/options +++ b/debian/wheezy/applications/desktop-effects-tde/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 diff --git a/debian/wheezy/applications/digikam/debian/rules b/debian/wheezy/applications/digikam/debian/rules index 4edd6e763..76fa321bc 100755 --- a/debian/wheezy/applications/digikam/debian/rules +++ b/debian/wheezy/applications/digikam/debian/rules @@ -15,6 +15,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine TARBALL_EXT=tar.bz2 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_CONFIGURE_EXTRA_FLAGS := --without-included-sqlite3 --prefix=/opt/trinity --disable-static DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" diff --git a/debian/wheezy/applications/digikam/debian/source/options b/debian/wheezy/applications/digikam/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/digikam/debian/source/options +++ b/debian/wheezy/applications/digikam/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 diff --git a/debian/wheezy/applications/dolphin/debian/rules b/debian/wheezy/applications/dolphin/debian/rules index 1534d2f29..66ea98891 100755 --- a/debian/wheezy/applications/dolphin/debian/rules +++ b/debian/wheezy/applications/dolphin/debian/rules @@ -18,6 +18,9 @@ include debian/cdbs/debian-qt-kde.mk DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + binary-install/dolphin-trinity:: mkdir -p debian/dolphin-trinity/opt/trinity/bin ln -s d3lphin debian/dolphin-trinity/opt/trinity/bin/dolphin diff --git a/debian/wheezy/applications/dolphin/debian/source/options b/debian/wheezy/applications/dolphin/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/dolphin/debian/source/options +++ b/debian/wheezy/applications/dolphin/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 diff --git a/debian/wheezy/applications/filelight-l10n/debian/rules b/debian/wheezy/applications/filelight-l10n/debian/rules index 9255102ce..84a2f4975 100755 --- a/debian/wheezy/applications/filelight-l10n/debian/rules +++ b/debian/wheezy/applications/filelight-l10n/debian/rules @@ -19,6 +19,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/usr/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/wheezy/applications/filelight-l10n/debian/source/options b/debian/wheezy/applications/filelight-l10n/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/filelight-l10n/debian/source/options +++ b/debian/wheezy/applications/filelight-l10n/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 diff --git a/debian/wheezy/applications/filelight/debian/rules b/debian/wheezy/applications/filelight/debian/rules index 247e26b9d..efa61f0f7 100755 --- a/debian/wheezy/applications/filelight/debian/rules +++ b/debian/wheezy/applications/filelight/debian/rules @@ -20,6 +20,9 @@ DEB_DH_ALWAYS_EXCLUDE=.svn DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --disable-debug +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/wheezy/applications/filelight/debian/source/options b/debian/wheezy/applications/filelight/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/filelight/debian/source/options +++ b/debian/wheezy/applications/filelight/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 diff --git a/debian/wheezy/applications/fusion-icon/debian/rules b/debian/wheezy/applications/fusion-icon/debian/rules index 5d3ed1e14..8c79610db 100755 --- a/debian/wheezy/applications/fusion-icon/debian/rules +++ b/debian/wheezy/applications/fusion-icon/debian/rules @@ -7,6 +7,9 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/python-distutils-custom.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + binary-install/fusion-icon-trinity:: mkdir -p debian/fusion-icon-trinity/usr/local/lib cp -Rp debian/fusion-icon-trinity/usr/local/* debian/fusion-icon-trinity/usr/ diff --git a/debian/wheezy/applications/fusion-icon/debian/source/options b/debian/wheezy/applications/fusion-icon/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/fusion-icon/debian/source/options +++ b/debian/wheezy/applications/fusion-icon/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 diff --git a/debian/wheezy/applications/gtk-qt-engine/debian/rules b/debian/wheezy/applications/gtk-qt-engine/debian/rules index 20c8468ec..8c78b986c 100755 --- a/debian/wheezy/applications/gtk-qt-engine/debian/rules +++ b/debian/wheezy/applications/gtk-qt-engine/debian/rules @@ -27,6 +27,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + binary-install/gtk-qt-engine-trinity:: mkdir -p $(CURDIR)/debian/gtk-qt-engine-trinity/opt/trinity/share/kgtk/ cp -Rp $(CURDIR)/debian/.gtkrc-2.0-kde4 $(CURDIR)/debian/gtk-qt-engine-trinity/opt/trinity/share/kgtk/ diff --git a/debian/wheezy/applications/gtk-qt-engine/debian/source/options b/debian/wheezy/applications/gtk-qt-engine/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/gtk-qt-engine/debian/source/options +++ b/debian/wheezy/applications/gtk-qt-engine/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 diff --git a/debian/wheezy/applications/gtk3-tqt-engine/debian/rules b/debian/wheezy/applications/gtk3-tqt-engine/debian/rules index 242fb2c84..9bed17b05 100755 --- a/debian/wheezy/applications/gtk3-tqt-engine/debian/rules +++ b/debian/wheezy/applications/gtk3-tqt-engine/debian/rules @@ -11,6 +11,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/wheezy/applications/gwenview-i18n/debian/rules b/debian/wheezy/applications/gwenview-i18n/debian/rules index ef4e97ec1..3070a9c9d 100755 --- a/debian/wheezy/applications/gwenview-i18n/debian/rules +++ b/debian/wheezy/applications/gwenview-i18n/debian/rules @@ -9,6 +9,9 @@ include /usr/share/cdbs/1/rules/utils.mk -include debian/debiandirs +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_INSTALL_DOCS_ALL := DOC_LANGS = da de et fr it nl pl pt ru sv pt_BR diff --git a/debian/wheezy/applications/gwenview-i18n/debian/source/options b/debian/wheezy/applications/gwenview-i18n/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/gwenview-i18n/debian/source/options +++ b/debian/wheezy/applications/gwenview-i18n/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 diff --git a/debian/wheezy/applications/gwenview/debian/rules b/debian/wheezy/applications/gwenview/debian/rules index 447938cef..d6423c512 100755 --- a/debian/wheezy/applications/gwenview/debian/rules +++ b/debian/wheezy/applications/gwenview/debian/rules @@ -18,6 +18,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := --enable-kipi --enable-final --prefix=/opt/trinity DEB_INSTALL_DOCS_ALL := DEB_INSTALL_CHANGELOGS_ALL := NEWS +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_DH_MAKESHLIBS_ARGS_ALL := -V DEB_SHLIBDEPS_INCLUDE = debian/gwenview-trinity/opt/trinity/lib diff --git a/debian/wheezy/applications/gwenview/debian/source/options b/debian/wheezy/applications/gwenview/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/gwenview/debian/source/options +++ b/debian/wheezy/applications/gwenview/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 diff --git a/debian/wheezy/applications/k3b-i18n/debian/rules b/debian/wheezy/applications/k3b-i18n/debian/rules index 2048362b9..1e6d35926 100755 --- a/debian/wheezy/applications/k3b-i18n/debian/rules +++ b/debian/wheezy/applications/k3b-i18n/debian/rules @@ -15,6 +15,9 @@ DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_INFODIR := /opt/trinity/share/info +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -102,7 +105,7 @@ binary-indep: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb -- -Z bzip2 + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture-dependent files here. binary-arch: build install diff --git a/debian/wheezy/applications/k3b-i18n/debian/source/options b/debian/wheezy/applications/k3b-i18n/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/k3b-i18n/debian/source/options +++ b/debian/wheezy/applications/k3b-i18n/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 diff --git a/debian/wheezy/applications/k3b/debian/control b/debian/wheezy/applications/k3b/debian/control index 20733a1f0..d15a1e0fe 100644 --- a/debian/wheezy/applications/k3b/debian/control +++ b/debian/wheezy/applications/k3b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Francois Marier <francois@debian.org>, Fathi Boudra <fabo@debian.org> -Build-Depends: libdvdread4, libdvdread-dev, alsa, libasound2-dev, lame, libmp3lame-dev, debhelper (>= 6), cdbs (>= 0.4.52ubuntu18), tdelibs4-trinity-dev (>= 3.5.0), libflac++-dev (>= 1.1.2), flac, libdbus-tqt-1-dev, libhal-dev (>= 0.5.5.1), libhal-storage-dev (>= 0.5.5.1), libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmusicbrainz4-dev (>= 2.1.1-4.1), libmad0-dev, chrpath, libavformat-dev, libavcodec-dev, libvorbis-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: libdvdread4, libdvdread-dev, alsa, libasound2-dev, lame, libmp3lame-dev, debhelper (>= 6), cdbs (>= 0.4.52ubuntu18), tdelibs4-trinity-dev (>= 3.5.0), libflac++-dev (>= 1.1.2), flac, libdbus-tqt-1-dev, libhal-dev (>= 0.5.5.1), libhal-storage-dev (>= 0.5.5.1), libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmad0-dev, chrpath, libavformat-dev, libavcodec-dev, libvorbis-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://www.k3b.org diff --git a/debian/wheezy/applications/k3b/debian/rules b/debian/wheezy/applications/k3b/debian/rules index 3a19a0ec8..cc895cd83 100755 --- a/debian/wheezy/applications/k3b/debian/rules +++ b/debian/wheezy/applications/k3b/debian/rules @@ -17,6 +17,9 @@ DEB_INSTALL_MANPAGES_k3b = debian/k3b.1 DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/tmp/ +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/wheezy/applications/k3b/debian/source/options b/debian/wheezy/applications/k3b/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/k3b/debian/source/options +++ b/debian/wheezy/applications/k3b/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 diff --git a/debian/wheezy/applications/k9copy/debian/rules b/debian/wheezy/applications/k9copy/debian/rules index 0887c2d07..5f97b6de2 100755 --- a/debian/wheezy/applications/k9copy/debian/rules +++ b/debian/wheezy/applications/k9copy/debian/rules @@ -15,6 +15,9 @@ DEB_INSTALL_MANPAGES_k9copy = k9copy-trinity.1 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/wheezy/applications/k9copy/debian/source/options b/debian/wheezy/applications/k9copy/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/k9copy/debian/source/options +++ b/debian/wheezy/applications/k9copy/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 diff --git a/debian/wheezy/applications/kaffeine-mozilla/debian/rules b/debian/wheezy/applications/kaffeine-mozilla/debian/rules index 80fe9807b..c04c761e2 100755 --- a/debian/wheezy/applications/kaffeine-mozilla/debian/rules +++ b/debian/wheezy/applications/kaffeine-mozilla/debian/rules @@ -14,6 +14,9 @@ export DH_OPTIONS DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity @@ -177,7 +180,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/wheezy/applications/kaffeine-mozilla/debian/source/options b/debian/wheezy/applications/kaffeine-mozilla/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/kaffeine-mozilla/debian/source/options +++ b/debian/wheezy/applications/kaffeine-mozilla/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 diff --git a/debian/wheezy/applications/kaffeine/debian/rules b/debian/wheezy/applications/kaffeine/debian/rules index 7791988e7..9021f8fb0 100755 --- a/debian/wheezy/applications/kaffeine/debian/rules +++ b/debian/wheezy/applications/kaffeine/debian/rules @@ -17,6 +17,9 @@ DEB_INSTALL_MANPAGES_kaffeine-trinity := debian/kaffeine.1 DEB_FIXPERMS_EXCLUDE := install-css.sh install-codecs +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/wheezy/applications/kaffeine/debian/source/options b/debian/wheezy/applications/kaffeine/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/kaffeine/debian/source/options +++ b/debian/wheezy/applications/kaffeine/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 diff --git a/debian/wheezy/applications/katapult/debian/rules b/debian/wheezy/applications/katapult/debian/rules index 6340f855d..779671876 100755 --- a/debian/wheezy/applications/katapult/debian/rules +++ b/debian/wheezy/applications/katapult/debian/rules @@ -14,6 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine export KUBUNTU_DESKTOP_POT=extragear-utils_katapult DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + cleanbuilddir/katapult-trinity:: rm -f katapult.1 diff --git a/debian/wheezy/applications/katapult/debian/source/options b/debian/wheezy/applications/katapult/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/katapult/debian/source/options +++ b/debian/wheezy/applications/katapult/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 diff --git a/debian/wheezy/applications/kbarcode/debian/rules b/debian/wheezy/applications/kbarcode/debian/rules index b8267f39c..cdbae3c90 100755 --- a/debian/wheezy/applications/kbarcode/debian/rules +++ b/debian/wheezy/applications/kbarcode/debian/rules @@ -16,6 +16,9 @@ DEB_INSTALL_MANPAGES_kbarcode-trinity := debian/kbarcode.1 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/wheezy/applications/kbarcode/debian/source/options b/debian/wheezy/applications/kbarcode/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/kbarcode/debian/source/options +++ b/debian/wheezy/applications/kbarcode/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 diff --git a/debian/wheezy/applications/kbfx/debian/rules b/debian/wheezy/applications/kbfx/debian/rules index 2bffe9b78..97b64d997 100755 --- a/debian/wheezy/applications/kbfx/debian/rules +++ b/debian/wheezy/applications/kbfx/debian/rules @@ -24,6 +24,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CMAKE_EXTRA_FLAGS = -DLIB_SUFFIX="" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DCMAKE_INSTALL_PREFIX="/opt/trinity/" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + get-orig-source: @@dh_testdir @@[ -d ../tarballs/. ] @@ -74,6 +77,6 @@ binary-arch: build dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch diff --git a/debian/wheezy/applications/kbfx/debian/source/options b/debian/wheezy/applications/kbfx/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/kbfx/debian/source/options +++ b/debian/wheezy/applications/kbfx/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 diff --git a/debian/wheezy/applications/kbookreader/debian/rules b/debian/wheezy/applications/kbookreader/debian/rules index 6f4a82d1b..53794c4fe 100755 --- a/debian/wheezy/applications/kbookreader/debian/rules +++ b/debian/wheezy/applications/kbookreader/debian/rules @@ -13,6 +13,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/wheezy/applications/kbookreader/debian/source/options b/debian/wheezy/applications/kbookreader/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/kbookreader/debian/source/options +++ b/debian/wheezy/applications/kbookreader/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 diff --git a/debian/wheezy/applications/kchmviewer/debian/rules b/debian/wheezy/applications/kchmviewer/debian/rules index a496effa9..c22afc5a3 100755 --- a/debian/wheezy/applications/kchmviewer/debian/rules +++ b/debian/wheezy/applications/kchmviewer/debian/rules @@ -16,6 +16,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -114,7 +117,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/wheezy/applications/kchmviewer/debian/source/options b/debian/wheezy/applications/kchmviewer/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/kchmviewer/debian/source/options +++ b/debian/wheezy/applications/kchmviewer/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 diff --git a/debian/wheezy/applications/kcmautostart/debian/rules b/debian/wheezy/applications/kcmautostart/debian/rules index 242fb2c84..9bed17b05 100644..100755 --- a/debian/wheezy/applications/kcmautostart/debian/rules +++ b/debian/wheezy/applications/kcmautostart/debian/rules @@ -11,6 +11,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/wheezy/applications/kcmldap/debian/changelog b/debian/wheezy/applications/kcmldap/debian/changelog new file mode 100644 index 000000000..a47452e9c --- /dev/null +++ b/debian/wheezy/applications/kcmldap/debian/changelog @@ -0,0 +1,5 @@ +kcontrol-ldapbonding-trinity (0.5-0ubuntu0) karmic; urgency=low + + * Karmic rebuild + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 02 July 2009 16:08:00 -0600 diff --git a/debian/wheezy/applications/kcmldap/debian/compat b/debian/wheezy/applications/kcmldap/debian/compat new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/debian/wheezy/applications/kcmldap/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/wheezy/applications/kcmldap/debian/control b/debian/wheezy/applications/kcmldap/debian/control new file mode 100644 index 000000000..de711caf1 --- /dev/null +++ b/debian/wheezy/applications/kcmldap/debian/control @@ -0,0 +1,13 @@ +Source: kcontrol-ldapbonding-trinity +Section: tde +Priority: optional +Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +XSBC-Original-Maintainer: Raphaël Pinson <raphink@raphink.net> +Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, libtdeldap-trinity-dev, automake, autoconf, libtool, libltdl-dev +Standards-Version: 3.8.4 + +Package: kcontrol-ldapbonding-trinity +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, libpam-krb5, libpam-ldap, nss-updatedb, libpam-ccreds +Description: LDAP control module for the TDE control center + LDAP is a TDE control center module to manage TDE connections to LDAP realms. diff --git a/debian/wheezy/applications/kcmldap/debian/copyright b/debian/wheezy/applications/kcmldap/debian/copyright new file mode 100644 index 000000000..540709e87 --- /dev/null +++ b/debian/wheezy/applications/kcmldap/debian/copyright @@ -0,0 +1,31 @@ +This package was debianized by Timothy Pearson <kb9vqf@pearsoncomputing.net> on +Thu, 17 May 2012 19:52:51 +0100. + +It was downloaded from http://www.trinitydesktop.org + +Upstream Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> + +copyright (C) 2012 Timothy Pearson <kb9vqf@pearsoncomputing.net> + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +The Debian packaging is (C) 2012, Timothy Pearson <kb9vqf@pearsoncomputing.net> and +is licensed under the GPL, see above. + diff --git a/debian/wheezy/applications/kcmldap/debian/rules b/debian/wheezy/applications/kcmldap/debian/rules new file mode 100755 index 000000000..9bed17b05 --- /dev/null +++ b/debian/wheezy/applications/kcmldap/debian/rules @@ -0,0 +1,27 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/debhelper.mk + +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde +DEB_CONFIGURE_MANDIR := /opt/trinity/share/man +DEB_CONFIGURE_PREFIX := /opt/trinity +DEB_CONFIGURE_INFODIR := /opt/trinity/share/info + +cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + +post-patches:: debian/stamp-bootstrap + +debian/stamp-bootstrap: + ! [ -f /usr/share/libtool/ltmain.sh ] || \ + cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh + ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ + cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh + cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in + + make -f admin/Makefile.common cvs + touch debian/stamp-bootstrap diff --git a/debian/wheezy/applications/kcmldapcontroller/debian/changelog b/debian/wheezy/applications/kcmldapcontroller/debian/changelog new file mode 100644 index 000000000..5ab6125c1 --- /dev/null +++ b/debian/wheezy/applications/kcmldapcontroller/debian/changelog @@ -0,0 +1,5 @@ +kcontrol-ldap-controller-trinity (0.5-0ubuntu0) karmic; urgency=low + + * Karmic rebuild + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 02 July 2009 16:08:00 -0600 diff --git a/debian/wheezy/applications/kcmldapcontroller/debian/compat b/debian/wheezy/applications/kcmldapcontroller/debian/compat new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/debian/wheezy/applications/kcmldapcontroller/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/wheezy/applications/kcmldapcontroller/debian/control b/debian/wheezy/applications/kcmldapcontroller/debian/control new file mode 100644 index 000000000..7cbb384bc --- /dev/null +++ b/debian/wheezy/applications/kcmldapcontroller/debian/control @@ -0,0 +1,12 @@ +Source: kcontrol-ldap-controller-trinity +Section: tde +Priority: optional +Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, libldap2-dev, libtdeldap-trinity-dev, automake, autoconf, libtool, libltdl-dev +Standards-Version: 3.8.4 + +Package: kcontrol-ldap-controller-trinity +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, heimdal-kdc, slapd, libsasl2-modules-gssapi-heimdal, sasl2-bin, openssl +Description: LDAP realm controller module for the TDE control center + LDAP Controller is a TDE control center module to configure an LDAP Realm Controller diff --git a/debian/wheezy/applications/kcmldapcontroller/debian/copyright b/debian/wheezy/applications/kcmldapcontroller/debian/copyright new file mode 100644 index 000000000..540709e87 --- /dev/null +++ b/debian/wheezy/applications/kcmldapcontroller/debian/copyright @@ -0,0 +1,31 @@ +This package was debianized by Timothy Pearson <kb9vqf@pearsoncomputing.net> on +Thu, 17 May 2012 19:52:51 +0100. + +It was downloaded from http://www.trinitydesktop.org + +Upstream Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> + +copyright (C) 2012 Timothy Pearson <kb9vqf@pearsoncomputing.net> + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +The Debian packaging is (C) 2012, Timothy Pearson <kb9vqf@pearsoncomputing.net> and +is licensed under the GPL, see above. + diff --git a/debian/wheezy/applications/kcmldapcontroller/debian/rules b/debian/wheezy/applications/kcmldapcontroller/debian/rules new file mode 100755 index 000000000..9bed17b05 --- /dev/null +++ b/debian/wheezy/applications/kcmldapcontroller/debian/rules @@ -0,0 +1,27 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/debhelper.mk + +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde +DEB_CONFIGURE_MANDIR := /opt/trinity/share/man +DEB_CONFIGURE_PREFIX := /opt/trinity +DEB_CONFIGURE_INFODIR := /opt/trinity/share/info + +cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + +post-patches:: debian/stamp-bootstrap + +debian/stamp-bootstrap: + ! [ -f /usr/share/libtool/ltmain.sh ] || \ + cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh + ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ + cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh + cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in + + make -f admin/Makefile.common cvs + touch debian/stamp-bootstrap diff --git a/debian/wheezy/applications/kcmldapmanager/debian/changelog b/debian/wheezy/applications/kcmldapmanager/debian/changelog new file mode 100644 index 000000000..b73c248b8 --- /dev/null +++ b/debian/wheezy/applications/kcmldapmanager/debian/changelog @@ -0,0 +1,5 @@ +kcontrol-ldap-manager-trinity (0.5-0ubuntu0) karmic; urgency=low + + * Karmic rebuild + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 02 July 2009 16:08:00 -0600 diff --git a/debian/wheezy/applications/kcmldapmanager/debian/compat b/debian/wheezy/applications/kcmldapmanager/debian/compat new file mode 100644 index 000000000..7ed6ff82d --- /dev/null +++ b/debian/wheezy/applications/kcmldapmanager/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/wheezy/applications/kcmldapmanager/debian/control b/debian/wheezy/applications/kcmldapmanager/debian/control new file mode 100644 index 000000000..b84e5e4c3 --- /dev/null +++ b/debian/wheezy/applications/kcmldapmanager/debian/control @@ -0,0 +1,12 @@ +Source: kcontrol-ldap-manager-trinity +Section: tde +Priority: optional +Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, libldap2-dev, libtdeldap-trinity-dev, automake, autoconf, libtool, libltdl-dev +Standards-Version: 3.8.4 + +Package: kcontrol-ldap-manager-trinity +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients +Description: LDAP realm management module for the TDE control center + LDAP Manager is a TDE control center module to manage users, groups, and machines in LDAP realms. diff --git a/debian/wheezy/applications/kcmldapmanager/debian/copyright b/debian/wheezy/applications/kcmldapmanager/debian/copyright new file mode 100644 index 000000000..540709e87 --- /dev/null +++ b/debian/wheezy/applications/kcmldapmanager/debian/copyright @@ -0,0 +1,31 @@ +This package was debianized by Timothy Pearson <kb9vqf@pearsoncomputing.net> on +Thu, 17 May 2012 19:52:51 +0100. + +It was downloaded from http://www.trinitydesktop.org + +Upstream Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> + +copyright (C) 2012 Timothy Pearson <kb9vqf@pearsoncomputing.net> + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +The Debian packaging is (C) 2012, Timothy Pearson <kb9vqf@pearsoncomputing.net> and +is licensed under the GPL, see above. + diff --git a/debian/wheezy/applications/kcmldapmanager/debian/rules b/debian/wheezy/applications/kcmldapmanager/debian/rules new file mode 100755 index 000000000..9bed17b05 --- /dev/null +++ b/debian/wheezy/applications/kcmldapmanager/debian/rules @@ -0,0 +1,27 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/debhelper.mk + +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde +DEB_CONFIGURE_MANDIR := /opt/trinity/share/man +DEB_CONFIGURE_PREFIX := /opt/trinity +DEB_CONFIGURE_INFODIR := /opt/trinity/share/info + +cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + +post-patches:: debian/stamp-bootstrap + +debian/stamp-bootstrap: + ! [ -f /usr/share/libtool/ltmain.sh ] || \ + cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh + ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ + cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh + cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in + + make -f admin/Makefile.common cvs + touch debian/stamp-bootstrap diff --git a/debian/wheezy/applications/kcpuload/debian/rules b/debian/wheezy/applications/kcpuload/debian/rules index e13398f63..20eca167c 100755 --- a/debian/wheezy/applications/kcpuload/debian/rules +++ b/debian/wheezy/applications/kcpuload/debian/rules @@ -12,6 +12,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # This has to be exported to make some magic below work. export DH_OPTIONS @@ -184,7 +187,7 @@ binary-common: dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture independant packages using the common target. binary-indep: build install diff --git a/debian/wheezy/applications/kcpuload/debian/source/options b/debian/wheezy/applications/kcpuload/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/kcpuload/debian/source/options +++ b/debian/wheezy/applications/kcpuload/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 diff --git a/debian/wheezy/applications/kdbusnotification/debian/rules b/debian/wheezy/applications/kdbusnotification/debian/rules index 2acd9ab0f..94d0ad5bd 100755 --- a/debian/wheezy/applications/kdbusnotification/debian/rules +++ b/debian/wheezy/applications/kdbusnotification/debian/rules @@ -12,6 +12,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # This has to be exported to make some magic below work. export DH_OPTIONS @@ -173,7 +176,7 @@ binary-common: dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture independant packages using the common target. binary-indep: build install diff --git a/debian/wheezy/applications/kdbusnotification/debian/source/options b/debian/wheezy/applications/kdbusnotification/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/kdbusnotification/debian/source/options +++ b/debian/wheezy/applications/kdbusnotification/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 diff --git a/debian/wheezy/applications/kdiff3/debian/rules b/debian/wheezy/applications/kdiff3/debian/rules index bc64fcc06..19ea44a07 100755 --- a/debian/wheezy/applications/kdiff3/debian/rules +++ b/debian/wheezy/applications/kdiff3/debian/rules @@ -11,6 +11,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -97,7 +100,7 @@ binary-indep: build install dh_installdeb -i dh_gencontrol -i dh_md5sums -i - dh_builddeb -i + dh_builddeb -i $(DEB_DH_BUILDDEB_ARGS) # Build architecture-dependent files here. binary-arch: build install @@ -118,7 +121,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/wheezy/applications/kdiff3/debian/source/options b/debian/wheezy/applications/kdiff3/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/kdiff3/debian/source/options +++ b/debian/wheezy/applications/kdiff3/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 diff --git a/debian/wheezy/applications/kdirstat/debian/rules b/debian/wheezy/applications/kdirstat/debian/rules index b15f5a9a5..8c0a950a3 100755 --- a/debian/wheezy/applications/kdirstat/debian/rules +++ b/debian/wheezy/applications/kdirstat/debian/rules @@ -13,6 +13,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + LDFLAGS += -Wl,--as-needed post-patches:: debian/stamp-bootstrap diff --git a/debian/wheezy/applications/kdirstat/debian/source/options b/debian/wheezy/applications/kdirstat/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/kdirstat/debian/source/options +++ b/debian/wheezy/applications/kdirstat/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 diff --git a/debian/wheezy/applications/kdpkg/debian/rules b/debian/wheezy/applications/kdpkg/debian/rules index ff163f6a7..455414f69 100755 --- a/debian/wheezy/applications/kdpkg/debian/rules +++ b/debian/wheezy/applications/kdpkg/debian/rules @@ -11,6 +11,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/wheezy/applications/kdpkg/debian/source/options b/debian/wheezy/applications/kdpkg/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/kdpkg/debian/source/options +++ b/debian/wheezy/applications/kdpkg/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 diff --git a/debian/wheezy/applications/keep/debian/rules b/debian/wheezy/applications/keep/debian/rules index b6eae04ee..1b5054df6 100755 --- a/debian/wheezy/applications/keep/debian/rules +++ b/debian/wheezy/applications/keep/debian/rules @@ -16,6 +16,9 @@ DEB_INSTALL_MANPAGES_keep := keep.1 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/wheezy/applications/keep/debian/source/options b/debian/wheezy/applications/keep/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/keep/debian/source/options +++ b/debian/wheezy/applications/keep/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 diff --git a/debian/wheezy/applications/kerberostray/debian/rules b/debian/wheezy/applications/kerberostray/debian/rules index 242fb2c84..9bed17b05 100755 --- a/debian/wheezy/applications/kerberostray/debian/rules +++ b/debian/wheezy/applications/kerberostray/debian/rules @@ -11,6 +11,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/wheezy/applications/kerry/debian/rules b/debian/wheezy/applications/kerry/debian/rules index 7dc0fbe23..dea466c17 100755 --- a/debian/wheezy/applications/kerry/debian/rules +++ b/debian/wheezy/applications/kerry/debian/rules @@ -16,6 +16,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit DEB_INSTALL_MANPAGES_kerry-trinity = kerry.1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + build/kerry-trinity:: docbook2x-man debian/kerry.1.docbook diff --git a/debian/wheezy/applications/kerry/debian/source/options b/debian/wheezy/applications/kerry/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/kerry/debian/source/options +++ b/debian/wheezy/applications/kerry/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 diff --git a/debian/wheezy/applications/kgtk-qt3/debian/rules b/debian/wheezy/applications/kgtk-qt3/debian/rules index 15ab99eb2..b4cb7a953 100755 --- a/debian/wheezy/applications/kgtk-qt3/debian/rules +++ b/debian/wheezy/applications/kgtk-qt3/debian/rules @@ -22,6 +22,9 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS - DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. DEB_BUILD_PARALLEL = true diff --git a/debian/wheezy/applications/kgtk-qt3/debian/source/options b/debian/wheezy/applications/kgtk-qt3/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/kgtk-qt3/debian/source/options +++ b/debian/wheezy/applications/kgtk-qt3/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 diff --git a/debian/wheezy/applications/kile/debian/rules b/debian/wheezy/applications/kile/debian/rules index 3e19a08ea..d7f547296 100755 --- a/debian/wheezy/applications/kile/debian/rules +++ b/debian/wheezy/applications/kile/debian/rules @@ -17,6 +17,9 @@ DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp DEB_INSTALL_MANPAGES_kile := debian/kile.1 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/wheezy/applications/kile/debian/source/options b/debian/wheezy/applications/kile/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/kile/debian/source/options +++ b/debian/wheezy/applications/kile/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 diff --git a/debian/wheezy/applications/kima/debian/rules b/debian/wheezy/applications/kima/debian/rules index 519575104..45e052b96 100755 --- a/debian/wheezy/applications/kima/debian/rules +++ b/debian/wheezy/applications/kima/debian/rules @@ -11,6 +11,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # Add here any variable or target overrides you need. post-patches:: debian/stamp-bootstrap diff --git a/debian/wheezy/applications/kima/debian/source/options b/debian/wheezy/applications/kima/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/kima/debian/source/options +++ b/debian/wheezy/applications/kima/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 diff --git a/debian/wheezy/applications/kio-apt/debian/rules b/debian/wheezy/applications/kio-apt/debian/rules index 9b82c21ad..93f63f8ee 100755 --- a/debian/wheezy/applications/kio-apt/debian/rules +++ b/debian/wheezy/applications/kio-apt/debian/rules @@ -14,6 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/wheezy/applications/kio-apt/debian/source/options b/debian/wheezy/applications/kio-apt/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/kio-apt/debian/source/options +++ b/debian/wheezy/applications/kio-apt/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 diff --git a/debian/wheezy/applications/kio-locate/debian/rules b/debian/wheezy/applications/kio-locate/debian/rules index 7a837110e..ecf59da08 100755 --- a/debian/wheezy/applications/kio-locate/debian/rules +++ b/debian/wheezy/applications/kio-locate/debian/rules @@ -22,6 +22,9 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS - DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. DEB_BUILD_PARALLEL = true diff --git a/debian/wheezy/applications/kio-locate/debian/source/options b/debian/wheezy/applications/kio-locate/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/kio-locate/debian/source/options +++ b/debian/wheezy/applications/kio-locate/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 diff --git a/debian/wheezy/applications/kio-umountwrapper/debian/rules b/debian/wheezy/applications/kio-umountwrapper/debian/rules index ae8903f41..6672eae5b 100755 --- a/debian/wheezy/applications/kio-umountwrapper/debian/rules +++ b/debian/wheezy/applications/kio-umountwrapper/debian/rules @@ -13,6 +13,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/wheezy/applications/kio-umountwrapper/debian/source/options b/debian/wheezy/applications/kio-umountwrapper/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/kio-umountwrapper/debian/source/options +++ b/debian/wheezy/applications/kio-umountwrapper/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 diff --git a/debian/wheezy/applications/kiosktool/debian/rules b/debian/wheezy/applications/kiosktool/debian/rules index 4e38353a1..507e5a458 100755 --- a/debian/wheezy/applications/kiosktool/debian/rules +++ b/debian/wheezy/applications/kiosktool/debian/rules @@ -11,6 +11,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/wheezy/applications/kiosktool/debian/source/options b/debian/wheezy/applications/kiosktool/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/kiosktool/debian/source/options +++ b/debian/wheezy/applications/kiosktool/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 diff --git a/debian/wheezy/applications/kmplayer/debian/rules b/debian/wheezy/applications/kmplayer/debian/rules index 63bf848d1..166ca76e2 100755 --- a/debian/wheezy/applications/kmplayer/debian/rules +++ b/debian/wheezy/applications/kmplayer/debian/rules @@ -22,6 +22,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := --enable-maintainer-mode --prefix=/opt/trinity --wi DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp DEB_INSTALL_MANPAGES_kmplayer = kmplayer.1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/wheezy/applications/kmplayer/debian/source/options b/debian/wheezy/applications/kmplayer/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/kmplayer/debian/source/options +++ b/debian/wheezy/applications/kmplayer/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 diff --git a/debian/wheezy/applications/kmyfirewall/debian/rules b/debian/wheezy/applications/kmyfirewall/debian/rules index 8fa664c8a..28035c796 100755 --- a/debian/wheezy/applications/kmyfirewall/debian/rules +++ b/debian/wheezy/applications/kmyfirewall/debian/rules @@ -13,6 +13,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -126,7 +129,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/wheezy/applications/kmyfirewall/debian/source/options b/debian/wheezy/applications/kmyfirewall/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/kmyfirewall/debian/source/options +++ b/debian/wheezy/applications/kmyfirewall/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 diff --git a/debian/wheezy/applications/kmymoney/debian/rules b/debian/wheezy/applications/kmymoney/debian/rules index 192c6019c..4c3b55cb4 100755 --- a/debian/wheezy/applications/kmymoney/debian/rules +++ b/debian/wheezy/applications/kmymoney/debian/rules @@ -13,6 +13,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde --disable-sqlite3 --disable-pdf-docs +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + LDFLAGS += -Wl,--as-needed post-patches:: debian/stamp-bootstrap diff --git a/debian/wheezy/applications/kmymoney/debian/source/options b/debian/wheezy/applications/kmymoney/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/kmymoney/debian/source/options +++ b/debian/wheezy/applications/kmymoney/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 diff --git a/debian/wheezy/applications/knemo/debian/rules b/debian/wheezy/applications/knemo/debian/rules index fd71fe17f..4fb03f005 100755 --- a/debian/wheezy/applications/knemo/debian/rules +++ b/debian/wheezy/applications/knemo/debian/rules @@ -15,6 +15,9 @@ DEB_INSTALL_DOCS_knemo = -XNEWS DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/wheezy/applications/knemo/debian/source/options b/debian/wheezy/applications/knemo/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/knemo/debian/source/options +++ b/debian/wheezy/applications/knemo/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 diff --git a/debian/wheezy/applications/knetload/debian/rules b/debian/wheezy/applications/knetload/debian/rules index f5784f7ae..d955fbe4a 100755 --- a/debian/wheezy/applications/knetload/debian/rules +++ b/debian/wheezy/applications/knetload/debian/rules @@ -9,6 +9,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -178,7 +181,7 @@ binary-common: dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture independant packages using the common target. binary-indep: build install diff --git a/debian/wheezy/applications/knetload/debian/source/options b/debian/wheezy/applications/knetload/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/knetload/debian/source/options +++ b/debian/wheezy/applications/knetload/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 diff --git a/debian/wheezy/applications/knetstats/debian/rules b/debian/wheezy/applications/knetstats/debian/rules index 7b1522933..1a573fb20 100755 --- a/debian/wheezy/applications/knetstats/debian/rules +++ b/debian/wheezy/applications/knetstats/debian/rules @@ -13,6 +13,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_MANPAGES_knetstats-trinity = knetstats.1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/wheezy/applications/knetstats/debian/source/options b/debian/wheezy/applications/knetstats/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/knetstats/debian/source/options +++ b/debian/wheezy/applications/knetstats/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 diff --git a/debian/wheezy/applications/knetworkmanager.cmake/debian/source/options b/debian/wheezy/applications/knetworkmanager.cmake/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/knetworkmanager.cmake/debian/source/options +++ b/debian/wheezy/applications/knetworkmanager.cmake/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 diff --git a/debian/wheezy/applications/knetworkmanager8/debian/rules b/debian/wheezy/applications/knetworkmanager8/debian/rules index a4ba9688c..9c7e598e1 100755 --- a/debian/wheezy/applications/knetworkmanager8/debian/rules +++ b/debian/wheezy/applications/knetworkmanager8/debian/rules @@ -15,6 +15,9 @@ DEB_INSTALL_DOCS_ALL := -XNEWS -XTODO DEB_CONFIGURE_EXTRA_FLAGS := --with-openvpn --with-vpnc --with-pptp +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/wheezy/applications/knetworkmanager8/debian/source/options b/debian/wheezy/applications/knetworkmanager8/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/knetworkmanager8/debian/source/options +++ b/debian/wheezy/applications/knetworkmanager8/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 diff --git a/debian/wheezy/applications/knetworkmanager9/debian/rules b/debian/wheezy/applications/knetworkmanager9/debian/rules index c9fa2b866..00ac9877f 100755 --- a/debian/wheezy/applications/knetworkmanager9/debian/rules +++ b/debian/wheezy/applications/knetworkmanager9/debian/rules @@ -20,6 +20,9 @@ DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" - DEB_INSTALL_DOCS_ALL := -XNEWS -XTODO +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + binary-install/network-manager-kde-trinity:: # Install autostart file install -D -m 644 tdenetworkmanager-0.8/src/tdenetworkmanager.desktop \ diff --git a/debian/wheezy/applications/knetworkmanager9/debian/source/options b/debian/wheezy/applications/knetworkmanager9/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/knetworkmanager9/debian/source/options +++ b/debian/wheezy/applications/knetworkmanager9/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 diff --git a/debian/wheezy/applications/knights/debian/rules b/debian/wheezy/applications/knights/debian/rules index ab81cb6e3..f4f406c79 100755 --- a/debian/wheezy/applications/knights/debian/rules +++ b/debian/wheezy/applications/knights/debian/rules @@ -13,6 +13,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -107,7 +110,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/wheezy/applications/knights/debian/source/options b/debian/wheezy/applications/knights/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/knights/debian/source/options +++ b/debian/wheezy/applications/knights/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 diff --git a/debian/wheezy/applications/knowit/debian/rules b/debian/wheezy/applications/knowit/debian/rules index 3ed456df4..0a090fdb6 100755 --- a/debian/wheezy/applications/knowit/debian/rules +++ b/debian/wheezy/applications/knowit/debian/rules @@ -14,6 +14,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -95,7 +98,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/wheezy/applications/knowit/debian/source/options b/debian/wheezy/applications/knowit/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/knowit/debian/source/options +++ b/debian/wheezy/applications/knowit/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 diff --git a/debian/wheezy/applications/knutclient/debian/rules b/debian/wheezy/applications/knutclient/debian/rules index ad89a9108..0d07992cf 100755 --- a/debian/wheezy/applications/knutclient/debian/rules +++ b/debian/wheezy/applications/knutclient/debian/rules @@ -18,6 +18,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -127,7 +130,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/wheezy/applications/knutclient/debian/source/options b/debian/wheezy/applications/knutclient/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/knutclient/debian/source/options +++ b/debian/wheezy/applications/knutclient/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 diff --git a/debian/wheezy/applications/koffice-i18n/debian/rules b/debian/wheezy/applications/koffice-i18n/debian/rules index 9bb59484f..478c97b9d 100755 --- a/debian/wheezy/applications/koffice-i18n/debian/rules +++ b/debian/wheezy/applications/koffice-i18n/debian/rules @@ -3,6 +3,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + languages = `ls -1d *i18n*` build-stamp: @@ -81,7 +84,7 @@ binary-indep: build dh_installdeb dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep diff --git a/debian/wheezy/applications/koffice-i18n/debian/source/options b/debian/wheezy/applications/koffice-i18n/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/koffice-i18n/debian/source/options +++ b/debian/wheezy/applications/koffice-i18n/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 diff --git a/debian/wheezy/applications/koffice/debian/rules b/debian/wheezy/applications/koffice/debian/rules index b166e12e4..ed91a11c3 100755 --- a/debian/wheezy/applications/koffice/debian/rules +++ b/debian/wheezy/applications/koffice/debian/rules @@ -17,6 +17,9 @@ DEB_KDE_APIDOX := no DEB_DH_STRIP_ARGS := --dbg-package=koffice-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := karbon-trinity kchart-trinity kivio-trinity koffice-libs-trinity chalk-trinity kspread-trinity kugar-trinity kthesaurus-trinity DEB_INSTALL_CHANGELOGS_karbon-trinity := karbon/CHANGES diff --git a/debian/wheezy/applications/koffice/debian/source/options b/debian/wheezy/applications/koffice/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/koffice/debian/source/options +++ b/debian/wheezy/applications/koffice/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 diff --git a/debian/wheezy/applications/konversation/debian/rules b/debian/wheezy/applications/konversation/debian/rules index 359d5f809..0e973a150 100755 --- a/debian/wheezy/applications/konversation/debian/rules +++ b/debian/wheezy/applications/konversation/debian/rules @@ -15,6 +15,9 @@ DEB_DH_STRIP_ARGS := --dbg-package=konversation-trinity-dbg DEB_INSTALL_DOCS_ALL = DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/wheezy/applications/konversation/debian/source/options b/debian/wheezy/applications/konversation/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/konversation/debian/source/options +++ b/debian/wheezy/applications/konversation/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 diff --git a/debian/wheezy/applications/kopete-otr/debian/rules b/debian/wheezy/applications/kopete-otr/debian/rules index abfd36cfc..4edf9d96d 100755 --- a/debian/wheezy/applications/kopete-otr/debian/rules +++ b/debian/wheezy/applications/kopete-otr/debian/rules @@ -12,6 +12,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/wheezy/applications/kopete-otr/debian/source/options b/debian/wheezy/applications/kopete-otr/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/kopete-otr/debian/source/options +++ b/debian/wheezy/applications/kopete-otr/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 diff --git a/debian/wheezy/applications/kpicosim/debian/rules b/debian/wheezy/applications/kpicosim/debian/rules index 4a8c9dcdd..0a03f424b 100755 --- a/debian/wheezy/applications/kpicosim/debian/rules +++ b/debian/wheezy/applications/kpicosim/debian/rules @@ -16,6 +16,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -123,7 +126,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/wheezy/applications/kpicosim/debian/source/options b/debian/wheezy/applications/kpicosim/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/kpicosim/debian/source/options +++ b/debian/wheezy/applications/kpicosim/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 diff --git a/debian/wheezy/applications/kpilot/debian/rules b/debian/wheezy/applications/kpilot/debian/rules index abfd36cfc..4edf9d96d 100755 --- a/debian/wheezy/applications/kpilot/debian/rules +++ b/debian/wheezy/applications/kpilot/debian/rules @@ -12,6 +12,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/wheezy/applications/kpilot/debian/source/options b/debian/wheezy/applications/kpilot/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/kpilot/debian/source/options +++ b/debian/wheezy/applications/kpilot/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 diff --git a/debian/wheezy/applications/kpowersave-nohal/debian/rules b/debian/wheezy/applications/kpowersave-nohal/debian/rules index a2f0e66bb..262171bc3 100755 --- a/debian/wheezy/applications/kpowersave-nohal/debian/rules +++ b/debian/wheezy/applications/kpowersave-nohal/debian/rules @@ -14,6 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_DOCS_ALL := AUTHORS NEWS DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/wheezy/applications/kpowersave-nohal/debian/source/options b/debian/wheezy/applications/kpowersave-nohal/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/kpowersave-nohal/debian/source/options +++ b/debian/wheezy/applications/kpowersave-nohal/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 diff --git a/debian/wheezy/applications/kpowersave.cmake/debian/source/options b/debian/wheezy/applications/kpowersave.cmake/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/kpowersave.cmake/debian/source/options +++ b/debian/wheezy/applications/kpowersave.cmake/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 diff --git a/debian/wheezy/applications/kpowersave/debian/rules b/debian/wheezy/applications/kpowersave/debian/rules index 991d42479..961465395 100755 --- a/debian/wheezy/applications/kpowersave/debian/rules +++ b/debian/wheezy/applications/kpowersave/debian/rules @@ -14,6 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_DOCS_ALL := AUTHORS NEWS DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/wheezy/applications/kpowersave/debian/source/options b/debian/wheezy/applications/kpowersave/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/kpowersave/debian/source/options +++ b/debian/wheezy/applications/kpowersave/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 diff --git a/debian/wheezy/applications/kradio/debian/rules b/debian/wheezy/applications/kradio/debian/rules index d8c6c0226..41840eb6e 100755 --- a/debian/wheezy/applications/kradio/debian/rules +++ b/debian/wheezy/applications/kradio/debian/rules @@ -16,6 +16,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -121,7 +124,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/wheezy/applications/kradio/debian/source/options b/debian/wheezy/applications/kradio/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/kradio/debian/source/options +++ b/debian/wheezy/applications/kradio/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 diff --git a/debian/wheezy/applications/krename/debian/rules b/debian/wheezy/applications/krename/debian/rules index f886eacd0..4983ad699 100755 --- a/debian/wheezy/applications/krename/debian/rules +++ b/debian/wheezy/applications/krename/debian/rules @@ -15,6 +15,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + ### Libtool and Automake updates post-patches:: debian/stamp-autothings-update debian/stamp-autothings-update: diff --git a/debian/wheezy/applications/krename/debian/source/options b/debian/wheezy/applications/krename/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/krename/debian/source/options +++ b/debian/wheezy/applications/krename/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 diff --git a/debian/wheezy/applications/krusader/debian/rules b/debian/wheezy/applications/krusader/debian/rules index 139132dbb..b19073807 100755 --- a/debian/wheezy/applications/krusader/debian/rules +++ b/debian/wheezy/applications/krusader/debian/rules @@ -18,6 +18,9 @@ DEB_DESTDIR = $(CURDIR)/debian/krusader-trinity/ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/wheezy/applications/krusader/debian/source/options b/debian/wheezy/applications/krusader/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/krusader/debian/source/options +++ b/debian/wheezy/applications/krusader/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 diff --git a/debian/wheezy/applications/ksplash-engine-moodin/debian/rules b/debian/wheezy/applications/ksplash-engine-moodin/debian/rules index 047b8ca76..c41d87b76 100755 --- a/debian/wheezy/applications/ksplash-engine-moodin/debian/rules +++ b/debian/wheezy/applications/ksplash-engine-moodin/debian/rules @@ -11,6 +11,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -132,7 +135,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/wheezy/applications/ksplash-engine-moodin/debian/source/options b/debian/wheezy/applications/ksplash-engine-moodin/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/ksplash-engine-moodin/debian/source/options +++ b/debian/wheezy/applications/ksplash-engine-moodin/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 diff --git a/debian/wheezy/applications/ksquirrel/debian/rules b/debian/wheezy/applications/ksquirrel/debian/rules index 744a8d1e5..f59e43351 100755 --- a/debian/wheezy/applications/ksquirrel/debian/rules +++ b/debian/wheezy/applications/ksquirrel/debian/rules @@ -16,6 +16,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -106,7 +109,7 @@ binary-arch: build install # dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/wheezy/applications/ksquirrel/debian/source/options b/debian/wheezy/applications/ksquirrel/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/ksquirrel/debian/source/options +++ b/debian/wheezy/applications/ksquirrel/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 diff --git a/debian/wheezy/applications/kstreamripper/debian/rules b/debian/wheezy/applications/kstreamripper/debian/rules index 9f641b49a..88540f9bf 100755 --- a/debian/wheezy/applications/kstreamripper/debian/rules +++ b/debian/wheezy/applications/kstreamripper/debian/rules @@ -2,6 +2,9 @@ include /usr/share/cdbs/1/rules/debhelper.mk #DEB_INSTALL_MANPAGES_kstreamripper-trinity:=debian/kstreamripper.1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PATH := /opt/trinity/bin:$(PATH) build/kstreamripper-trinity:: diff --git a/debian/wheezy/applications/kstreamripper/debian/source/options b/debian/wheezy/applications/kstreamripper/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/kstreamripper/debian/source/options +++ b/debian/wheezy/applications/kstreamripper/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 diff --git a/debian/wheezy/applications/ksystemlog/debian/rules b/debian/wheezy/applications/ksystemlog/debian/rules index 12d493659..5b9d63684 100755 --- a/debian/wheezy/applications/ksystemlog/debian/rules +++ b/debian/wheezy/applications/ksystemlog/debian/rules @@ -15,6 +15,9 @@ DEB_INSTALL_MANPAGES_ksystemlog-trinity := ksystemlog.1 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/wheezy/applications/ksystemlog/debian/source/options b/debian/wheezy/applications/ksystemlog/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/ksystemlog/debian/source/options +++ b/debian/wheezy/applications/ksystemlog/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 diff --git a/debian/wheezy/applications/ktechlab/debian/rules b/debian/wheezy/applications/ktechlab/debian/rules index 15d1878df..227674f7f 100755 --- a/debian/wheezy/applications/ktechlab/debian/rules +++ b/debian/wheezy/applications/ktechlab/debian/rules @@ -12,6 +12,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -108,7 +111,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install unpatch diff --git a/debian/wheezy/applications/ktechlab/debian/source/options b/debian/wheezy/applications/ktechlab/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/ktechlab/debian/source/options +++ b/debian/wheezy/applications/ktechlab/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 diff --git a/debian/wheezy/applications/ktorrent/debian/rules b/debian/wheezy/applications/ktorrent/debian/rules index 5590816c2..d0046eb44 100755 --- a/debian/wheezy/applications/ktorrent/debian/rules +++ b/debian/wheezy/applications/ktorrent/debian/rules @@ -15,6 +15,9 @@ DEB_INSTALL_MANPAGES_ktorrent = ktorrent.1 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + build/ktorrent-trinity:: docbook2x-man debian/ktorrent.1.docbook diff --git a/debian/wheezy/applications/ktorrent/debian/source/options b/debian/wheezy/applications/ktorrent/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/ktorrent/debian/source/options +++ b/debian/wheezy/applications/ktorrent/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 diff --git a/debian/wheezy/applications/kuickshow/debian/rules b/debian/wheezy/applications/kuickshow/debian/rules index ee4456494..46fe966da 100755 --- a/debian/wheezy/applications/kuickshow/debian/rules +++ b/debian/wheezy/applications/kuickshow/debian/rules @@ -14,6 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/wheezy/applications/kuickshow/debian/source/options b/debian/wheezy/applications/kuickshow/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/kuickshow/debian/source/options +++ b/debian/wheezy/applications/kuickshow/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 diff --git a/debian/wheezy/applications/kvirc/debian/rules b/debian/wheezy/applications/kvirc/debian/rules index 665c61d25..fd45d5925 100755 --- a/debian/wheezy/applications/kvirc/debian/rules +++ b/debian/wheezy/applications/kvirc/debian/rules @@ -49,6 +49,9 @@ endif # DEB_COMPRESS_EXCLUDE := .kvs +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # # Run dh_shlibdeps with the correct options # diff --git a/debian/wheezy/applications/kvirc/debian/source/options b/debian/wheezy/applications/kvirc/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/kvirc/debian/source/options +++ b/debian/wheezy/applications/kvirc/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 diff --git a/debian/wheezy/applications/kvkbd/debian/rules b/debian/wheezy/applications/kvkbd/debian/rules index 305c1e4df..0f564108e 100755 --- a/debian/wheezy/applications/kvkbd/debian/rules +++ b/debian/wheezy/applications/kvkbd/debian/rules @@ -13,6 +13,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + makebuilddir/kvkbd-trinity:: make -f Makefile.cvs diff --git a/debian/wheezy/applications/kvkbd/debian/source/options b/debian/wheezy/applications/kvkbd/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/kvkbd/debian/source/options +++ b/debian/wheezy/applications/kvkbd/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 diff --git a/debian/wheezy/applications/kvpnc/debian/rules b/debian/wheezy/applications/kvpnc/debian/rules index 354c23311..f93ccb291 100755 --- a/debian/wheezy/applications/kvpnc/debian/rules +++ b/debian/wheezy/applications/kvpnc/debian/rules @@ -17,6 +17,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + makebuilddir/kvpnc-trinity:: cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh diff --git a/debian/wheezy/applications/kvpnc/debian/source/options b/debian/wheezy/applications/kvpnc/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/kvpnc/debian/source/options +++ b/debian/wheezy/applications/kvpnc/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 diff --git a/debian/wheezy/applications/piklab/debian/rules b/debian/wheezy/applications/piklab/debian/rules index cd16137c9..6d0a1d510 100755 --- a/debian/wheezy/applications/piklab/debian/rules +++ b/debian/wheezy/applications/piklab/debian/rules @@ -10,6 +10,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -111,7 +114,7 @@ binary-arch: build install dh_shlibdeps -l/opt/trinity/lib dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: config build clean binary-indep binary-arch binary install diff --git a/debian/wheezy/applications/piklab/debian/source/options b/debian/wheezy/applications/piklab/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/piklab/debian/source/options +++ b/debian/wheezy/applications/piklab/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 diff --git a/debian/wheezy/applications/potracegui/debian/rules b/debian/wheezy/applications/potracegui/debian/rules index bc559477f..4b268883c 100755 --- a/debian/wheezy/applications/potracegui/debian/rules +++ b/debian/wheezy/applications/potracegui/debian/rules @@ -20,6 +20,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -100,7 +103,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/wheezy/applications/potracegui/debian/source/options b/debian/wheezy/applications/potracegui/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/potracegui/debian/source/options +++ b/debian/wheezy/applications/potracegui/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 diff --git a/debian/wheezy/applications/qt4-tqt-theme-engine/debian/rules b/debian/wheezy/applications/qt4-tqt-theme-engine/debian/rules index bd271d7de..2cde95722 100755 --- a/debian/wheezy/applications/qt4-tqt-theme-engine/debian/rules +++ b/debian/wheezy/applications/qt4-tqt-theme-engine/debian/rules @@ -9,5 +9,8 @@ DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + QMAKE := qmake-qt4 diff --git a/debian/wheezy/applications/rosegarden/debian/rules b/debian/wheezy/applications/rosegarden/debian/rules index 32d10d6ff..3fc2b777e 100755 --- a/debian/wheezy/applications/rosegarden/debian/rules +++ b/debian/wheezy/applications/rosegarden/debian/rules @@ -22,6 +22,9 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS - DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. DEB_BUILD_PARALLEL = true @@ -56,7 +59,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install configure diff --git a/debian/wheezy/applications/rosegarden/debian/source/options b/debian/wheezy/applications/rosegarden/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/rosegarden/debian/source/options +++ b/debian/wheezy/applications/rosegarden/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 diff --git a/debian/wheezy/applications/smartcardauth/debian/rules b/debian/wheezy/applications/smartcardauth/debian/rules index a9e7e66cb..fe74e584a 100755 --- a/debian/wheezy/applications/smartcardauth/debian/rules +++ b/debian/wheezy/applications/smartcardauth/debian/rules @@ -9,3 +9,6 @@ CFLAGS=-g -Wall -fPIC DEB_MAKE_INSTALL_TARGET := install DESTDIR="$(DEB_DESTDIR)" DEB_INSTALL_DOCS_ALL := + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) diff --git a/debian/wheezy/applications/smartcardauth/debian/source/options b/debian/wheezy/applications/smartcardauth/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/smartcardauth/debian/source/options +++ b/debian/wheezy/applications/smartcardauth/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 diff --git a/debian/wheezy/applications/smb4k/debian/rules b/debian/wheezy/applications/smb4k/debian/rules index db6aa90dd..70b1248dc 100755 --- a/debian/wheezy/applications/smb4k/debian/rules +++ b/debian/wheezy/applications/smb4k/debian/rules @@ -16,6 +16,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/wheezy/applications/smb4k/debian/source/options b/debian/wheezy/applications/smb4k/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/smb4k/debian/source/options +++ b/debian/wheezy/applications/smb4k/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 diff --git a/debian/wheezy/applications/soundkonverter/debian/rules b/debian/wheezy/applications/soundkonverter/debian/rules index 831240224..d3eac8d3b 100755 --- a/debian/wheezy/applications/soundkonverter/debian/rules +++ b/debian/wheezy/applications/soundkonverter/debian/rules @@ -23,6 +23,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS = --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + install/soundkonverter-trinity:: install -D -p -m0644 debian/soundkonverter-trinity.lintian-overrides \ debian/soundkonverter-trinity/usr/share/lintian/overrides/soundkonverter-trinity diff --git a/debian/wheezy/applications/soundkonverter/debian/source/options b/debian/wheezy/applications/soundkonverter/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/soundkonverter/debian/source/options +++ b/debian/wheezy/applications/soundkonverter/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 diff --git a/debian/wheezy/applications/tde-guidance/debian/rules b/debian/wheezy/applications/tde-guidance/debian/rules index 996ad6a4d..614fdb4a9 100755 --- a/debian/wheezy/applications/tde-guidance/debian/rules +++ b/debian/wheezy/applications/tde-guidance/debian/rules @@ -15,6 +15,9 @@ PYSUPPORT_PATH = $(DEB_DESTDIR)/opt/trinity/share/python-support DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde LDFLAGS_APPEND := -L/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + install/tde-guidance-trinity:: # install icons to right place install -D -p -m0644 $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/hi32-app-daemons.png \ diff --git a/debian/wheezy/applications/tde-guidance/debian/source/options b/debian/wheezy/applications/tde-guidance/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/tde-guidance/debian/source/options +++ b/debian/wheezy/applications/tde-guidance/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 diff --git a/debian/wheezy/applications/tde-style-lipstik/debian/rules b/debian/wheezy/applications/tde-style-lipstik/debian/rules index f24b21716..eb9de9610 100755 --- a/debian/wheezy/applications/tde-style-lipstik/debian/rules +++ b/debian/wheezy/applications/tde-style-lipstik/debian/rules @@ -16,6 +16,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -122,7 +125,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/wheezy/applications/tde-style-lipstik/debian/source/options b/debian/wheezy/applications/tde-style-lipstik/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/tde-style-lipstik/debian/source/options +++ b/debian/wheezy/applications/tde-style-lipstik/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 diff --git a/debian/wheezy/applications/tde-style-qtcurve/debian/rules b/debian/wheezy/applications/tde-style-qtcurve/debian/rules index c61c340ae..685703a85 100755 --- a/debian/wheezy/applications/tde-style-qtcurve/debian/rules +++ b/debian/wheezy/applications/tde-style-qtcurve/debian/rules @@ -24,6 +24,9 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS - DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. DEB_BUILD_PARALLEL = true diff --git a/debian/wheezy/applications/tde-style-qtcurve/debian/source/options b/debian/wheezy/applications/tde-style-qtcurve/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/tde-style-qtcurve/debian/source/options +++ b/debian/wheezy/applications/tde-style-qtcurve/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 diff --git a/debian/wheezy/applications/tde-systemsettings/debian/rules b/debian/wheezy/applications/tde-systemsettings/debian/rules index 8110845eb..ed2e13a90 100755 --- a/debian/wheezy/applications/tde-systemsettings/debian/rules +++ b/debian/wheezy/applications/tde-systemsettings/debian/rules @@ -15,6 +15,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/wheezy/applications/tde-systemsettings/debian/source/options b/debian/wheezy/applications/tde-systemsettings/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/tde-systemsettings/debian/source/options +++ b/debian/wheezy/applications/tde-systemsettings/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 diff --git a/debian/wheezy/applications/tdesudo/debian/rules b/debian/wheezy/applications/tdesudo/debian/rules index 5a63a69a9..443a43aed 100755 --- a/debian/wheezy/applications/tdesudo/debian/rules +++ b/debian/wheezy/applications/tdesudo/debian/rules @@ -15,6 +15,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit DEB_INSTALL_MANPAGES_tdesudo-trinity = tdesudo-trinity.1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + build/tdesudo-trinity:: docbook2x-man debian/tdesudo-trinity.1.docbook mv tdesudo.1 tdesudo-trinity.1 diff --git a/debian/wheezy/applications/tdesudo/debian/source/options b/debian/wheezy/applications/tdesudo/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/tdesudo/debian/source/options +++ b/debian/wheezy/applications/tdesudo/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 diff --git a/debian/wheezy/applications/tdesvn/debian/rules b/debian/wheezy/applications/tdesvn/debian/rules index d3e870fba..37d2a944b 100755 --- a/debian/wheezy/applications/tdesvn/debian/rules +++ b/debian/wheezy/applications/tdesvn/debian/rules @@ -22,6 +22,9 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS - DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. DEB_BUILD_PARALLEL = true diff --git a/debian/wheezy/applications/tdesvn/debian/source/options b/debian/wheezy/applications/tdesvn/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/tdesvn/debian/source/options +++ b/debian/wheezy/applications/tdesvn/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 diff --git a/debian/wheezy/applications/tdmtheme/debian/rules b/debian/wheezy/applications/tdmtheme/debian/rules index 8e74fc2cb..0fc4f4aa4 100755 --- a/debian/wheezy/applications/tdmtheme/debian/rules +++ b/debian/wheezy/applications/tdmtheme/debian/rules @@ -15,6 +15,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/wheezy/applications/tdmtheme/debian/source/options b/debian/wheezy/applications/tdmtheme/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/tdmtheme/debian/source/options +++ b/debian/wheezy/applications/tdmtheme/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 diff --git a/debian/wheezy/applications/tellico/debian/rules b/debian/wheezy/applications/tellico/debian/rules index 84b8312a4..9e404eabf 100755 --- a/debian/wheezy/applications/tellico/debian/rules +++ b/debian/wheezy/applications/tellico/debian/rules @@ -12,6 +12,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -149,7 +152,7 @@ binary-indep: build install dh_installdeb -i dh_gencontrol -i dh_md5sums -i - dh_builddeb -i + dh_builddeb -i $(DEB_DH_BUILDDEB_ARGS) # Build architecture-dependent files here. binary-arch: build install @@ -171,7 +174,7 @@ binary-arch: build install dh_shlibdeps -a dh_gencontrol -a dh_md5sums -a - dh_builddeb -a + dh_builddeb -a $(DEB_DH_BUILDDEB_ARGS) binary: binary-arch binary-indep .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/wheezy/applications/tellico/debian/source/options b/debian/wheezy/applications/tellico/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/tellico/debian/source/options +++ b/debian/wheezy/applications/tellico/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 diff --git a/debian/wheezy/applications/twin-style-crystal/debian/rules b/debian/wheezy/applications/twin-style-crystal/debian/rules index 8cda3384a..4fb0c5bb5 100755 --- a/debian/wheezy/applications/twin-style-crystal/debian/rules +++ b/debian/wheezy/applications/twin-style-crystal/debian/rules @@ -13,6 +13,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/wheezy/applications/twin-style-crystal/debian/source/options b/debian/wheezy/applications/twin-style-crystal/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/twin-style-crystal/debian/source/options +++ b/debian/wheezy/applications/twin-style-crystal/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 diff --git a/debian/wheezy/applications/wlassistant/debian/rules b/debian/wheezy/applications/wlassistant/debian/rules index abada8378..1a8fdeafb 100755 --- a/debian/wheezy/applications/wlassistant/debian/rules +++ b/debian/wheezy/applications/wlassistant/debian/rules @@ -22,6 +22,9 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS - DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. DEB_BUILD_PARALLEL = true diff --git a/debian/wheezy/applications/wlassistant/debian/source/options b/debian/wheezy/applications/wlassistant/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/wlassistant/debian/source/options +++ b/debian/wheezy/applications/wlassistant/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 diff --git a/debian/wheezy/applications/yakuake/debian/rules b/debian/wheezy/applications/yakuake/debian/rules index f5bd922f5..aa22c8b59 100755 --- a/debian/wheezy/applications/yakuake/debian/rules +++ b/debian/wheezy/applications/yakuake/debian/rules @@ -15,6 +15,9 @@ INSTALL_DOCS_ALL := DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + ### Libtool and Automake updates post-patches:: debian/stamp-autothings-update debian/stamp-autothings-update: diff --git a/debian/wheezy/applications/yakuake/debian/source/options b/debian/wheezy/applications/yakuake/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/applications/yakuake/debian/source/options +++ b/debian/wheezy/applications/yakuake/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 diff --git a/debian/wheezy/defaultsettings b/debian/wheezy/defaultsettings new file mode 120000 index 000000000..86062d702 --- /dev/null +++ b/debian/wheezy/defaultsettings @@ -0,0 +1 @@ +../../ubuntu/maverick/defaultsettings
\ No newline at end of file diff --git a/debian/wheezy/dependencies/arts/debian/rules b/debian/wheezy/dependencies/arts/debian/rules index b0a724e1a..9c9730bda 100755 --- a/debian/wheezy/dependencies/arts/debian/rules +++ b/debian/wheezy/dependencies/arts/debian/rules @@ -23,6 +23,9 @@ DEB_BUILD_PARALLEL = true DEB_DH_STRIP_ARGS := --dbg-package=arts-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := libarts1c2a-trinity libartsc0-trinity DEB_DH_MAKESHLIBS_ARGS_ALL := -V diff --git a/debian/wheezy/dependencies/arts/debian/source/options b/debian/wheezy/dependencies/arts/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/dependencies/arts/debian/source/options +++ b/debian/wheezy/dependencies/arts/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 diff --git a/debian/wheezy/dependencies/avahi-tqt/debian/control b/debian/wheezy/dependencies/avahi-tqt/debian/control index 8b0c55500..b4838d2b0 100644 --- a/debian/wheezy/dependencies/avahi-tqt/debian/control +++ b/debian/wheezy/dependencies/avahi-tqt/debian/control @@ -5,6 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> Uploaders: Timothy Pearson <kb9vqf@pearsoncomputing.net> Build-Depends: debhelper, + cdbs, pkg-config, python-support (>= 0.6), libglib2.0-dev (>= 2.4), diff --git a/debian/wheezy/dependencies/avahi-tqt/debian/rules b/debian/wheezy/dependencies/avahi-tqt/debian/rules index c3ea0343f..54a22a44f 100755 --- a/debian/wheezy/dependencies/avahi-tqt/debian/rules +++ b/debian/wheezy/dependencies/avahi-tqt/debian/rules @@ -1,17 +1,24 @@ #!/usr/bin/make -f -%: - dh $@ +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk # Ensure at build time that the library has no dependencies on undefined # symbols, and speed up loading. export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,-z,defs -Wl,-O1 -override_dh_auto_configure: - ./autogen.sh - dh_auto_configure -- $(CONFFLAGS) \ +DEB_CONFIGURE_EXTRA_FLAGS += \ --enable-compat-libdns_sd \ --disable-mono --disable-monodoc \ --disable-gtk3 \ --with-systemdsystemunitdir=/lib/systemd/system +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + +post-patches:: debian/stamp-bootstrap + +debian/stamp-bootstrap: + ./autogen.sh + rm ./ChangeLog + touch debian/stamp-bootstrap diff --git a/debian/wheezy/dependencies/avahi-tqt/debian/source/options b/debian/wheezy/dependencies/avahi-tqt/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/dependencies/avahi-tqt/debian/source/options +++ b/debian/wheezy/dependencies/avahi-tqt/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 diff --git a/debian/wheezy/dependencies/dbus-1-tqt/debian/rules b/debian/wheezy/dependencies/dbus-1-tqt/debian/rules index b7aa427f8..3b86de7db 100755 --- a/debian/wheezy/dependencies/dbus-1-tqt/debian/rules +++ b/debian/wheezy/dependencies/dbus-1-tqt/debian/rules @@ -4,3 +4,6 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) diff --git a/debian/wheezy/dependencies/dbus-1-tqt/debian/source/options b/debian/wheezy/dependencies/dbus-1-tqt/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/dependencies/dbus-1-tqt/debian/source/options +++ b/debian/wheezy/dependencies/dbus-1-tqt/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 diff --git a/debian/wheezy/dependencies/dbus-tqt/debian/rules b/debian/wheezy/dependencies/dbus-tqt/debian/rules index 894533134..a59bed76e 100755 --- a/debian/wheezy/dependencies/dbus-tqt/debian/rules +++ b/debian/wheezy/dependencies/dbus-tqt/debian/rules @@ -10,3 +10,6 @@ include /usr/share/cdbs/1/class/cmake.mk # Strict library versioning DEB_DH_MAKESHLIBS_ARGS_ALL := -V + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) diff --git a/debian/wheezy/dependencies/dbus-tqt/debian/source/options b/debian/wheezy/dependencies/dbus-tqt/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/dependencies/dbus-tqt/debian/source/options +++ b/debian/wheezy/dependencies/dbus-tqt/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 diff --git a/debian/wheezy/dependencies/libart-lgpl/debian/rules b/debian/wheezy/dependencies/libart-lgpl/debian/rules index 4390434f7..2751eb1f2 100755 --- a/debian/wheezy/dependencies/libart-lgpl/debian/rules +++ b/debian/wheezy/dependencies/libart-lgpl/debian/rules @@ -20,3 +20,5 @@ GNOME_MODULE := libart_lgpl DEB_DH_MAKESHLIBS_ARGS_$(libart-2.0-N) += -V '$(libart-2.0-N)(>= 2.3.18)' +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) diff --git a/debian/wheezy/dependencies/libart-lgpl/debian/source/options b/debian/wheezy/dependencies/libart-lgpl/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/dependencies/libart-lgpl/debian/source/options +++ b/debian/wheezy/dependencies/libart-lgpl/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 diff --git a/debian/wheezy/dependencies/libcaldav/debian/rules b/debian/wheezy/dependencies/libcaldav/debian/rules index 0dda6ea24..fb72a35e7 100755 --- a/debian/wheezy/dependencies/libcaldav/debian/rules +++ b/debian/wheezy/dependencies/libcaldav/debian/rules @@ -5,6 +5,9 @@ include /usr/share/quilt/quilt.make # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # This has to be exported to make some magic below work. export DH_OPTIONS @@ -86,7 +89,7 @@ binary-common: dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture independent packages using the common target. binary-indep: build install diff --git a/debian/wheezy/dependencies/libcarddav/debian/rules b/debian/wheezy/dependencies/libcarddav/debian/rules index 124929739..24bdcbc93 100755 --- a/debian/wheezy/dependencies/libcarddav/debian/rules +++ b/debian/wheezy/dependencies/libcarddav/debian/rules @@ -5,6 +5,9 @@ include /usr/share/quilt/quilt.make # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # This has to be exported to make some magic below work. export DH_OPTIONS @@ -86,7 +89,7 @@ binary-common: dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture independent packages using the common target. binary-indep: build install diff --git a/debian/wheezy/dependencies/python-tqt/debian/rules b/debian/wheezy/dependencies/python-tqt/debian/rules index ebb91c6e4..86eca95c9 100755 --- a/debian/wheezy/dependencies/python-tqt/debian/rules +++ b/debian/wheezy/dependencies/python-tqt/debian/rules @@ -3,6 +3,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + export DH_OPTIONS -include /usr/share/python/python.mk @@ -158,7 +161,7 @@ endif dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture independant packages using the common target. binary-indep: install-indep diff --git a/debian/wheezy/dependencies/python-tqt/debian/source/options b/debian/wheezy/dependencies/python-tqt/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/dependencies/python-tqt/debian/source/options +++ b/debian/wheezy/dependencies/python-tqt/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 diff --git a/debian/wheezy/dependencies/qt3/debian/control b/debian/wheezy/dependencies/qt3/debian/control index 8b1654d79..e10fbcab1 100644 --- a/debian/wheezy/dependencies/qt3/debian/control +++ b/debian/wheezy/dependencies/qt3/debian/control @@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1- libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, libxcursor-dev, libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg62-dev, libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev, - libfreetype6-dev, libxft-dev, unixodbc-dev, uuid-dev, + libfreetype6-dev, libxft-dev, unixodbc-dev, uuid-dev, libglib2.0-dev, libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcups2-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev, firebird2.1-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc] | firebird2-dev [i386 amd64] diff --git a/debian/wheezy/dependencies/qt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff b/debian/wheezy/dependencies/qt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff deleted file mode 100644 index 3c6394f33..000000000 --- a/debian/wheezy/dependencies/qt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff +++ /dev/null @@ -1,32 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## kubuntu_06_fglrx_0_size_screen.diff.dpatch by <jr@pechin3> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad qt-x11-free-3.3.8really3.3.7~/src/kernel/qpaintdevice_x11.cpp qt-x11-free-3.3.8really3.3.7/src/kernel/qpaintdevice_x11.cpp ---- qt-x11-free-3.3.8really3.3.7~/src/kernel/qpaintdevice_x11.cpp 2007-04-02 20:06:28.000000000 +0100 -+++ qt-x11-free-3.3.8really3.3.7/src/kernel/qpaintdevice_x11.cpp 2007-04-02 20:12:10.000000000 +0100 -@@ -526,11 +526,16 @@ - Q_CHECK_PTR( dpisX ); - Q_CHECK_PTR( dpisY ); - for ( i = 0; i < screens; i++ ) { -- dpisX[ i ] = (DisplayWidth(dpy,i) * 254 + DisplayWidthMM(dpy,i)*5) -- -- / (DisplayWidthMM(dpy,i)*10); -- dpisY[ i ] = (DisplayHeight(dpy,i) * 254 + DisplayHeightMM(dpy,i)*5) -- / (DisplayHeightMM(dpy,i)*10); -+ if (DisplayWidthMM(dpy,i) < 1) -+ dpisX[ i ] = 75; // default the dpi to 75. -+ else -+ dpisX[ i ] = (DisplayWidth(dpy,i) * 254 + DisplayWidthMM(dpy,i)*5) -+ / (DisplayWidthMM(dpy,i)*10); -+ if (DisplayHeightMM(dpy,i) < 1) -+ dpisY[ i ] = 75; // default the dpi to 75. -+ else -+ dpisY[ i ] = (DisplayHeight(dpy,i) * 254 + DisplayHeightMM(dpy,i)*5) -+ / (DisplayHeightMM(dpy,i)*10); - } - } - diff --git a/debian/wheezy/dependencies/qt3/debian/patches/series b/debian/wheezy/dependencies/qt3/debian/patches/series index 7377c84c1..e6bdb92af 100644 --- a/debian/wheezy/dependencies/qt3/debian/patches/series +++ b/debian/wheezy/dependencies/qt3/debian/patches/series @@ -1,4 +1,3 @@ 06_disable_rpath.diff 09_amd64_lib64.diff 72_dont_trust_uname-m_use_dpkg-arch_instead.diff -kubuntu_06_fglrx_0_size_screen.diff diff --git a/debian/wheezy/dependencies/qt3/debian/rules b/debian/wheezy/dependencies/qt3/debian/rules index 09b237823..7ede42ad9 100755 --- a/debian/wheezy/dependencies/qt3/debian/rules +++ b/debian/wheezy/dependencies/qt3/debian/rules @@ -11,6 +11,9 @@ export LD_LIBRARY_PATH=$(QTDIR)/lib:$(OLD_LD_LIBRARY_PATH) OLD_PATH := $(PATH) export PATH=$(QTDIR)/bin:$(OLD_PATH) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) @@ -96,6 +99,7 @@ CONFIGURE_OPTS = \ \ -lfontconfig \ -inputmethod \ + -glibmainloop \ # End of CONFIGURE_OPTS interbase_archs := i386 amd64 sparc powerpc @@ -326,7 +330,7 @@ binary-indep: build install dh_gencontrol -i dh_md5sums -i - dh_builddeb -i + dh_builddeb -i $(DEB_DH_BUILDDEB_ARGS) binary-arch: build install @@ -468,7 +472,7 @@ binary-arch: build install dh_gencontrol -a $(IBASE) dh_md5sums -a $(IBASE) - dh_builddeb -a $(IBASE) + dh_builddeb -a $(IBASE) $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build binary-indep binary-arch binary install clean patch unpatch diff --git a/debian/wheezy/dependencies/qt3/debian/source/options b/debian/wheezy/dependencies/qt3/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/dependencies/qt3/debian/source/options +++ b/debian/wheezy/dependencies/qt3/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 diff --git a/debian/wheezy/dependencies/sip4-tqt/debian/rules b/debian/wheezy/dependencies/sip4-tqt/debian/rules index 0dd14099f..2286739d5 100755 --- a/debian/wheezy/dependencies/sip4-tqt/debian/rules +++ b/debian/wheezy/dependencies/sip4-tqt/debian/rules @@ -2,6 +2,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + export DH_OPTIONS INSTDIR=$(CURDIR)/debian @@ -134,7 +137,7 @@ endif dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture independant packages using the common target. binary-indep: diff --git a/debian/wheezy/dependencies/sip4-tqt/debian/source/options b/debian/wheezy/dependencies/sip4-tqt/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/dependencies/sip4-tqt/debian/source/options +++ b/debian/wheezy/dependencies/sip4-tqt/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 diff --git a/debian/wheezy/dependencies/tqca-tls/debian/rules b/debian/wheezy/dependencies/tqca-tls/debian/rules index 4ffaf90dc..fc9e58e55 100755 --- a/debian/wheezy/dependencies/tqca-tls/debian/rules +++ b/debian/wheezy/dependencies/tqca-tls/debian/rules @@ -6,6 +6,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) @@ -104,7 +107,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/wheezy/dependencies/tqca-tls/debian/source/options b/debian/wheezy/dependencies/tqca-tls/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/dependencies/tqca-tls/debian/source/options +++ b/debian/wheezy/dependencies/tqca-tls/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 diff --git a/debian/wheezy/dependencies/tqscintilla/debian/rules b/debian/wheezy/dependencies/tqscintilla/debian/rules index 36df66cc9..8dfaa3377 100755 --- a/debian/wheezy/dependencies/tqscintilla/debian/rules +++ b/debian/wheezy/dependencies/tqscintilla/debian/rules @@ -5,6 +5,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # This is the debhelper compatibility version to use. export QTDIR=/usr/share/tqt3 export QMAKESPEC=$(QTDIR)/mkspecs/linux-g++ @@ -82,7 +85,7 @@ binary-indep: build install dh_installdeb -i dh_gencontrol -i dh_md5sums -i - dh_builddeb -i + dh_builddeb -i $(DEB_DH_BUILDDEB_ARGS) # Build architecture-dependent files here. binary-arch: build install @@ -100,7 +103,7 @@ binary-arch: build install dh_shlibdeps -a dh_gencontrol -a dh_md5sums -a - dh_builddeb -a + dh_builddeb -a $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install configure diff --git a/debian/wheezy/dependencies/tqscintilla/debian/source/options b/debian/wheezy/dependencies/tqscintilla/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/dependencies/tqscintilla/debian/source/options +++ b/debian/wheezy/dependencies/tqscintilla/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 diff --git a/debian/wheezy/dependencies/tqt3/debian/control b/debian/wheezy/dependencies/tqt3/debian/control index 1c8b45da3..b45983f80 100644 --- a/debian/wheezy/dependencies/tqt3/debian/control +++ b/debian/wheezy/dependencies/tqt3/debian/control @@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1- libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, libxcursor-dev, libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg-dev, libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev, - libfreetype6-dev, libxft-dev, unixodbc-dev, uuid-dev, + libfreetype6-dev, libxft-dev, unixodbc-dev, uuid-dev, libglib2.0-dev, libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcups2-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev, firebird2.1-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc] | firebird2-dev [i386 amd64] diff --git a/debian/wheezy/dependencies/tqt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff b/debian/wheezy/dependencies/tqt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff deleted file mode 100644 index 3c6394f33..000000000 --- a/debian/wheezy/dependencies/tqt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff +++ /dev/null @@ -1,32 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## kubuntu_06_fglrx_0_size_screen.diff.dpatch by <jr@pechin3> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad qt-x11-free-3.3.8really3.3.7~/src/kernel/qpaintdevice_x11.cpp qt-x11-free-3.3.8really3.3.7/src/kernel/qpaintdevice_x11.cpp ---- qt-x11-free-3.3.8really3.3.7~/src/kernel/qpaintdevice_x11.cpp 2007-04-02 20:06:28.000000000 +0100 -+++ qt-x11-free-3.3.8really3.3.7/src/kernel/qpaintdevice_x11.cpp 2007-04-02 20:12:10.000000000 +0100 -@@ -526,11 +526,16 @@ - Q_CHECK_PTR( dpisX ); - Q_CHECK_PTR( dpisY ); - for ( i = 0; i < screens; i++ ) { -- dpisX[ i ] = (DisplayWidth(dpy,i) * 254 + DisplayWidthMM(dpy,i)*5) -- -- / (DisplayWidthMM(dpy,i)*10); -- dpisY[ i ] = (DisplayHeight(dpy,i) * 254 + DisplayHeightMM(dpy,i)*5) -- / (DisplayHeightMM(dpy,i)*10); -+ if (DisplayWidthMM(dpy,i) < 1) -+ dpisX[ i ] = 75; // default the dpi to 75. -+ else -+ dpisX[ i ] = (DisplayWidth(dpy,i) * 254 + DisplayWidthMM(dpy,i)*5) -+ / (DisplayWidthMM(dpy,i)*10); -+ if (DisplayHeightMM(dpy,i) < 1) -+ dpisY[ i ] = 75; // default the dpi to 75. -+ else -+ dpisY[ i ] = (DisplayHeight(dpy,i) * 254 + DisplayHeightMM(dpy,i)*5) -+ / (DisplayHeightMM(dpy,i)*10); - } - } - diff --git a/debian/wheezy/dependencies/tqt3/debian/patches/series b/debian/wheezy/dependencies/tqt3/debian/patches/series index 7377c84c1..e6bdb92af 100644 --- a/debian/wheezy/dependencies/tqt3/debian/patches/series +++ b/debian/wheezy/dependencies/tqt3/debian/patches/series @@ -1,4 +1,3 @@ 06_disable_rpath.diff 09_amd64_lib64.diff 72_dont_trust_uname-m_use_dpkg-arch_instead.diff -kubuntu_06_fglrx_0_size_screen.diff diff --git a/debian/wheezy/dependencies/tqt3/debian/rules b/debian/wheezy/dependencies/tqt3/debian/rules index 39a2ee31c..d2d66f6a7 100755 --- a/debian/wheezy/dependencies/tqt3/debian/rules +++ b/debian/wheezy/dependencies/tqt3/debian/rules @@ -11,6 +11,9 @@ export LD_LIBRARY_PATH=$(QTDIR)/lib:$(OLD_LD_LIBRARY_PATH) OLD_PATH := $(PATH) export PATH=$(QTDIR)/bin:$(OLD_PATH) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) @@ -100,6 +103,7 @@ CONFIGURE_OPTS = \ \ -lfontconfig \ -inputmethod \ + -glibmainloop \ # End of CONFIGURE_OPTS interbase_archs := i386 amd64 sparc powerpc @@ -330,7 +334,7 @@ binary-indep: build install dh_gencontrol -i dh_md5sums -i - dh_builddeb -i + dh_builddeb -i $(DEB_DH_BUILDDEB_ARGS) binary-arch: build install @@ -461,7 +465,7 @@ binary-arch: build install dh_gencontrol -a $(IBASE) dh_md5sums -a $(IBASE) - dh_builddeb -a $(IBASE) + dh_builddeb -a $(IBASE) $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build binary-indep binary-arch binary install clean patch unpatch diff --git a/debian/wheezy/dependencies/tqt3/debian/source/options b/debian/wheezy/dependencies/tqt3/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/dependencies/tqt3/debian/source/options +++ b/debian/wheezy/dependencies/tqt3/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 diff --git a/debian/wheezy/dependencies/tqtinterface/debian/rules b/debian/wheezy/dependencies/tqtinterface/debian/rules index f05e2fadd..5d8f4cb4c 100755 --- a/debian/wheezy/dependencies/tqtinterface/debian/rules +++ b/debian/wheezy/dependencies/tqtinterface/debian/rules @@ -14,6 +14,9 @@ DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) DEB_CMAKE_EXTRA_FLAGS := -DPKGCONFIG_INSTALL_DIR="/usr/lib/pkgconfig" -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/usr" -DCMAKE_LIBRARY_PATH="/usr/lib" -DCMAKE_INCLUDE_PATH="/usr/include" -DCMAKE_VERBOSE_MAKEFILE="ON" -DWITH_QT3="ON" -DQTDIR="/usr/share/qt3" -DQT_LIBRARY_DIRS="/usr/share/qt3/lib" -DBUILD_ALL="ON" -DUSE_QT3="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. DEB_BUILD_PARALLEL = true diff --git a/debian/wheezy/dependencies/tqtinterface/debian/source/options b/debian/wheezy/dependencies/tqtinterface/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/dependencies/tqtinterface/debian/source/options +++ b/debian/wheezy/dependencies/tqtinterface/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 diff --git a/debian/wheezy/libraries/kipi-plugins/debian/rules b/debian/wheezy/libraries/kipi-plugins/debian/rules index 5177da213..c9f8bd279 100755 --- a/debian/wheezy/libraries/kipi-plugins/debian/rules +++ b/debian/wheezy/libraries/kipi-plugins/debian/rules @@ -20,6 +20,9 @@ DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + clean :: rm -f po/*/*.gmo diff --git a/debian/wheezy/libraries/kipi-plugins/debian/source/options b/debian/wheezy/libraries/kipi-plugins/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/libraries/kipi-plugins/debian/source/options +++ b/debian/wheezy/libraries/kipi-plugins/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 diff --git a/debian/wheezy/libraries/libkdcraw/debian/rules b/debian/wheezy/libraries/libkdcraw/debian/rules index 7785e4bcc..f58c12e61 100755 --- a/debian/wheezy/libraries/libkdcraw/debian/rules +++ b/debian/wheezy/libraries/libkdcraw/debian/rules @@ -16,3 +16,6 @@ DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--no-undefined -Wl,--as-needed" DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) diff --git a/debian/wheezy/libraries/libkdcraw/debian/source/options b/debian/wheezy/libraries/libkdcraw/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/libraries/libkdcraw/debian/source/options +++ b/debian/wheezy/libraries/libkdcraw/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 diff --git a/debian/wheezy/libraries/libkexiv2/debian/rules b/debian/wheezy/libraries/libkexiv2/debian/rules index 28a1c06e8..705840830 100755 --- a/debian/wheezy/libraries/libkexiv2/debian/rules +++ b/debian/wheezy/libraries/libkexiv2/debian/rules @@ -19,6 +19,9 @@ DEB_KDE_ENABLE_FINAL = yes DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + get-orig-source: @@dh_testdir @@[ -d ../tarballs/. ]||mkdir -p ../tarballs diff --git a/debian/wheezy/libraries/libkexiv2/debian/source/options b/debian/wheezy/libraries/libkexiv2/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/libraries/libkexiv2/debian/source/options +++ b/debian/wheezy/libraries/libkexiv2/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 diff --git a/debian/wheezy/libraries/libkipi/debian/rules b/debian/wheezy/libraries/libkipi/debian/rules index 94eb41df3..ff0f40f12 100755 --- a/debian/wheezy/libraries/libkipi/debian/rules +++ b/debian/wheezy/libraries/libkipi/debian/rules @@ -18,6 +18,9 @@ DEB_KDE_ENABLE_FINAL = yes DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + clean :: rm -f po/*/*.gmo diff --git a/debian/wheezy/libraries/libkipi/debian/source/options b/debian/wheezy/libraries/libkipi/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/libraries/libkipi/debian/source/options +++ b/debian/wheezy/libraries/libkipi/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 diff --git a/debian/wheezy/libraries/libksquirrel/debian/rules b/debian/wheezy/libraries/libksquirrel/debian/rules index 4d113ccd7..f5bc572dc 100755 --- a/debian/wheezy/libraries/libksquirrel/debian/rules +++ b/debian/wheezy/libraries/libksquirrel/debian/rules @@ -16,6 +16,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -88,7 +91,7 @@ binary-arch: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/wheezy/libraries/libksquirrel/debian/source/options b/debian/wheezy/libraries/libksquirrel/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/libraries/libksquirrel/debian/source/options +++ b/debian/wheezy/libraries/libksquirrel/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 diff --git a/debian/wheezy/libraries/libtdeldap/debian/control b/debian/wheezy/libraries/libtdeldap/debian/control index 2f489d71e..cd0240ab3 100644 --- a/debian/wheezy/libraries/libtdeldap/debian/control +++ b/debian/wheezy/libraries/libtdeldap/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.8.4 Package: libtdeldap-trinity Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients +Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, nss-updatedb Description: LDAP interface library for TDE LDAP interface library for TDE management modules. . diff --git a/debian/wheezy/libraries/libtdeldap/debian/rules b/debian/wheezy/libraries/libtdeldap/debian/rules index 242fb2c84..9bed17b05 100755 --- a/debian/wheezy/libraries/libtdeldap/debian/rules +++ b/debian/wheezy/libraries/libtdeldap/debian/rules @@ -11,6 +11,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: diff --git a/debian/wheezy/libraries/libtqt-perl/debian/rules b/debian/wheezy/libraries/libtqt-perl/debian/rules index 7bf57d40b..1d77c70fc 100755 --- a/debian/wheezy/libraries/libtqt-perl/debian/rules +++ b/debian/wheezy/libraries/libtqt-perl/debian/rules @@ -32,6 +32,9 @@ DEB_MAKE_INSTALL_TARGET := install \ PREFIX=$(CURDIR)/debian/libtqt-perl/usr \ SITEPREFIX=$(CURDIR)/debian/libtqt-perl/usr \ +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + pre-build:: pre-build-stamp pre-build-stamp: diff --git a/debian/wheezy/libraries/libtqt-perl/debian/source/options b/debian/wheezy/libraries/libtqt-perl/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/libraries/libtqt-perl/debian/source/options +++ b/debian/wheezy/libraries/libtqt-perl/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 diff --git a/debian/wheezy/libraries/mlt++/debian/rules b/debian/wheezy/libraries/mlt++/debian/rules index 0232c83be..99606e440 100755 --- a/debian/wheezy/libraries/mlt++/debian/rules +++ b/debian/wheezy/libraries/mlt++/debian/rules @@ -10,6 +10,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + version := $(shell sed -n 's/Package: \(.*\)/\1/p' debian/control | head -n 1) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -88,7 +91,7 @@ binary-arch: build install dh_shlibdeps -l/opt/trinity/lib dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/wheezy/libraries/mlt++/debian/source/options b/debian/wheezy/libraries/mlt++/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/libraries/mlt++/debian/source/options +++ b/debian/wheezy/libraries/mlt++/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 diff --git a/debian/wheezy/libraries/mlt/debian/rules b/debian/wheezy/libraries/mlt/debian/rules index 3889b6a3a..ce607fb77 100755 --- a/debian/wheezy/libraries/mlt/debian/rules +++ b/debian/wheezy/libraries/mlt/debian/rules @@ -10,6 +10,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + version := $(shell sed -n 's/Package: \(.*\)/\1/p' debian/control | head -n 1) NCPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1) @@ -114,7 +117,7 @@ binary-arch: build install dh_shlibdeps --exclude=libmlt --exclude=libmiracle --exclude=libvalerie dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/wheezy/libraries/mlt/debian/source/options b/debian/wheezy/libraries/mlt/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/libraries/mlt/debian/source/options +++ b/debian/wheezy/libraries/mlt/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 diff --git a/debian/wheezy/libraries/pytdeextensions/debian/control b/debian/wheezy/libraries/pytdeextensions/debian/control index 0920e9e37..626311320 100644 --- a/debian/wheezy/libraries/pytdeextensions/debian/control +++ b/debian/wheezy/libraries/pytdeextensions/debian/control @@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> Build-Depends: cdbs, debhelper (>= 5), chrpath, quilt, tdelibs4c2a-trinity, libtool, libxml2-utils, libxrandr-dev, libxxf86vm-dev, pytqt-tools, python-trinity-trinity, - python-tqt-dev, python-sip4-dev, python-support (>= 0.6), python (>= 2.5), python-dev (>= 2.5) + python-tqt-dev, python-sip4-dev, python-support (>= 0.6), python (>= 2.5), python-all-dev (>= 2.5) Standards-Version: 3.8.4 Package: pytdeextensions-trinity @@ -26,7 +26,7 @@ Architecture: any Section: libdevel Replaces: libpythonize0-trinity-dev (<< 4:14.0.0) Breaks: libpythonize0-trinity-dev (<< 4:14.0.0) -Depends: libpythonize0-trinity (= ${binary:Version}), python-dev +Depends: libpythonize0-trinity (= ${binary:Version}), python-all-dev Description: Python packages to support KDE applications (development) [Trinity] PyKDE Extensions is a collection of software and Python packages to support the creation and installation of KDE applications. diff --git a/debian/wheezy/libraries/pytdeextensions/debian/rules b/debian/wheezy/libraries/pytdeextensions/debian/rules index 4dcfaaae8..b4ae203da 100755 --- a/debian/wheezy/libraries/pytdeextensions/debian/rules +++ b/debian/wheezy/libraries/pytdeextensions/debian/rules @@ -18,6 +18,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + install/pytdeextensions-trinity:: # We have no idea if the built product is site-packages or dist-packages cd debian/tmp/usr/lib/python*/ && mv site-packages/ dist-packages/ || echo "site-packages --> dist-packages" diff --git a/debian/wheezy/libraries/pytdeextensions/debian/source/options b/debian/wheezy/libraries/pytdeextensions/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/libraries/pytdeextensions/debian/source/options +++ b/debian/wheezy/libraries/pytdeextensions/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 diff --git a/debian/wheezy/libraries/python-trinity/debian/rules b/debian/wheezy/libraries/python-trinity/debian/rules index ffa56ad63..67af8c2d8 100755 --- a/debian/wheezy/libraries/python-trinity/debian/rules +++ b/debian/wheezy/libraries/python-trinity/debian/rules @@ -11,6 +11,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + include /usr/share/dpatch/dpatch.make # This has to be exported to make some magic below work. export DH_OPTIONS @@ -151,7 +154,7 @@ endif dh_shlibdeps -l /opt/trinity/lib dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Build architecture independant packages using the common target. binary-indep: install-indep diff --git a/debian/wheezy/libraries/python-trinity/debian/source/options b/debian/wheezy/libraries/python-trinity/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/libraries/python-trinity/debian/source/options +++ b/debian/wheezy/libraries/python-trinity/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 diff --git a/debian/wheezy/metapackages/meta-tde/debian/README.Debian b/debian/wheezy/metapackages/meta-tde/debian/README.Debian new file mode 100644 index 000000000..6591fa872 --- /dev/null +++ b/debian/wheezy/metapackages/meta-tde/debian/README.Debian @@ -0,0 +1,14 @@ +kde -- a metapackage for KDE +kde-core -- a metapackage for KDE core +kde-devel -- a metapackage for developing KDE Applications +---------------------------------------------------------------------------- + +This package is a metapackage, meaning that its purpose is to contain +dependencies for a complete, Debian-based environment for KDE 3. + +This package also carries optional 'Recommends' and/or 'Suggests' +package suggestions. The packages listed are suggested for +installation, but not required. + +Please file a wishlist bug against the package if you feel there are +additional packages that ought to be included with this meta-package. diff --git a/debian/wheezy/metapackages/meta-tde/debian/changelog b/debian/wheezy/metapackages/meta-tde/debian/changelog new file mode 100644 index 000000000..7c5da1b8f --- /dev/null +++ b/debian/wheezy/metapackages/meta-tde/debian/changelog @@ -0,0 +1,617 @@ +meta-kde-trinity (5:54) squeeze; urgency=low + + * Trinity version + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Mon, 05 Jul 2010 12:08:00 -0600 + +meta-kde (5:48) unstable; urgency=low + + * Remove kde-amusements. + * Update to debhelper compat 6. + * Update to Standards-Version 3.7.3, no changes required. + * Update Uploaders. + * Update copyright file. + * Move Homepage to source field. + * Update 4:3.4.3 to 4:3.5.5 now this is the KDE version in stable, + and from 1.4.2 to 1.5.5 for arts. + * Update rules file. + * Add kdbg, kdevelop (>= 4:3.3.2), kprof to kde-devel Suggests. This was + installed by, now removed, kde-devel-extras. + + -- Ana Beatriz Guerrero Lopez <ana@debian.org> Fri, 18 Jan 2008 21:14:55 +0100 + +meta-kde (5:47) unstable; urgency=low + + +++ Changes by Christopher Martin: + + * Version the metapackages' dependencies, making the metapackages + more useful for backporters. + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 11 May 2006 20:04:40 -0400 + +meta-kde (5:46) unstable; urgency=low + + +++ Changes by Christopher Martin: + + * Add kdeaccessiblity to kde's depends, and clarify the verbiage noting that + kde doesn't depend on development packages. (Closes: #353496) + + * Remove dependency on fontconfig, since libqt3-mt already depends on it. + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 10 May 2006 19:35:02 -0400 + +meta-kde (5:45) unstable; urgency=low + + +++ Changes by Christopher Martin: + + * Remove the kdelibs3-bin dummy transitional package, as Sarge is out + and thus Woody --> Sarge upgrades are no longer a concern. + (Closes: #327548) + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sat, 10 Sep 2005 18:40:13 -0400 + +meta-kde (5:44) unstable; urgency=low + + +++ Changes by Christopher Martin: + + * Overhaul the package descriptions. + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Mon, 14 Mar 2005 14:24:50 -0500 + +meta-kde (5:43) unstable; urgency=low + + * Added kdelibs3-bin dummy package to aid woody transitions. + + -- Riku Voipio <riku.voipio@iki.fi> Tue, 14 Dec 2004 00:12:46 +0200 + +meta-kde (5:42) unstable; urgency=medium + + * The "why is kde in debian still 3.1.2" Release + * Disconnect meta-kde version numbers from kde. + * Change quanta to kdewebdev (Closes: #256574) + * Fix a typo (Closes: #231491) + * Suggest x-window-system-core (Closes: #237649) + * Add myself as uploaders + + -- Riku Voipio <riku.voipio@iki.fi> Tue, 16 Nov 2004 19:10:41 +0000 + +meta-kde (4:3.1.2) unstable; urgency=low + + * Split unofficial KDE packages into meta-kde-extras source. + * Fixed a typo in description. (Closes: #190718) + + -- Christopher L Cheney <ccheney@debian.org> Tue, 6 Jan 2004 02:00:00 -0600 + +meta-kde (4:3.1.1) unstable; urgency=low + + * Fixed a typo in description. + + -- Christopher L Cheney <ccheney@debian.org> Mon, 21 Apr 2003 00:30:00 -0500 + +meta-kde (4:3.1.0) unstable; urgency=low + + * Updated for KDE 3.1.1. (Closes: #135796, #182474, #188385) + * KDM is now only Recommended. (Closes: #123466) + * Bibletime is no longer in kde-extras due to being KDE2. (Closes: #158561) + + -- Christopher L Cheney <ccheney@debian.org> Sun, 13 Apr 2003 19:00:00 -0500 + +meta-kde (4:2.2.25) unstable; urgency=high + + * Removed kyahoo from kde-extras. Closes: #144708 (RC) + Arn't meta packages fun, sigh. + + -- Joey Hess <joeyh@debian.org> Sat, 27 Apr 2002 11:39:45 -0400 + +meta-kde (4:2.2.24) unstable; urgency=high + + * Move a few more deps around + * kamera wasn't even in the list + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 14 Mar 2002 11:55:00 -0700 + +meta-kde (4:2.2.23) unstable; urgency=low + + * A few more + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 11 Mar 2002 22:00:00 -0700 + +meta-kde (4:2.2.22) unstable; urgency=low + + * knapster2, kdestudio, kdesdk, and kdepim don't build on all archs + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 11 Mar 2002 11:00:00 -0700 + +meta-kde (4:2.2.21) unstable; urgency=low + + * One more cleanup. Now we are just waiting on hppa to catch up + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 09 Mar 2002 21:40:00 -0700 + +meta-kde (4:2.2.20) unstable; urgency=low + + * Remove kfilereplace + * Move several packages to suggests as they are either buggy or not + avail on all archs + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 09 Mar 2002 02:52:00 -0700 + +meta-kde (4:2.2.19) unstable; urgency=low + + * Change maintainer + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 17 Feb 2002 18:00:00 -0700 + +meta-kde (4:2.2.18) unstable; urgency=low + + * Fix spelling (Closes: #124411, #124784) + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 17 Dec 2001 15:16:00 -0700 + +meta-kde (4:2.2.17) unstable; urgency=low + + * Allow for kde3 co-existance + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 16 Dec 2001 05:23:00 -0700 + +meta-kde (4:2.2.16) unstable; urgency=low + + * Move kdemultimedia based packages to Suggests since they are not + available for all released archs. + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 02 Dec 2001 23:46:00 -0700 + +meta-kde (4:2.2.15) unstable; urgency=low + + * Remove pointers to -cvs packages + * Don't need these versions for woody's release so get rid of them. + * Cleanup changelog + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 29 Nov 2001 06:56:00 -0700 + +meta-kde (4:2.2.14) unstable; urgency=low + + * Remove recommends of libssl as that breaks policy + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 22 Nov 2001 22:58:00 -0700 + +meta-kde (4:2.2.13) unstable; urgency=low + + * Add info on sub-pixel AA + * 2.2.2 branding + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 19 Nov 2001 23:10:00 -0700 + +meta-kde (4:2.2.12) unstable; urgency=low + + * drop back to 2.2.1 until I upload 2.2.2 just to keep things sane + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 16 Nov 2001 00:28:00 -0700 + +meta-kde (4:2.2.11) unstable; urgency=low + + * Tweak deps so that one could intermix arts stuff from kde3-cvs with kde2 + stuff + * Add libssl0.9.6 recommends just to be nice + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 10 Nov 2001 20:28:00 -0700 + +meta-kde (4:2.2.10) unstable; urgency=low + + * Updated for KDE 2.2.2 and Qt 2.3.2 + * Remove pointers to any crypto packages + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 09 Nov 2001 11:17:00 -0700 + +meta-kde (4:2.2.9) unstable; urgency=low + + * Add korinico and kreatecd + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 30 Oct 2001 22:30:00 -0700 + +meta-kde (4:2.2.8) unstable; urgency=low + + * Replace kmsn with kmerlin (Closes: #116828) + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 24 Oct 2001 10:01:00 -0700 + +meta-kde (4:2.2.7) unstable; urgency=low + + * Update versioned deps and remove unnecessary ones + * Update Standards version + * Change Build-Depends to Build-Depends-Indep since the packages being + created are indep packages and not binary specific. + * Update XftConfig example + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 20 Oct 2001 22:24:00 -0700 + +meta-kde (4:2.2.6) unstable; urgency=low + + * Update priorities + * Add ktexmaker2 (Closes: #112573) + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 17 Sep 2001 14:00:00 -0700 + +meta-kde (4:2.2.5) unstable; urgency=low + + * Updated for 2.2.1 + * Update Xft config file (Closes: #112358) + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 17 Sep 2001 11:48:00 -0700 + +meta-kde (4:2.2.4) unstable; urgency=low + + * Added knewsticker-scripts (Closes: #110315) + * Add kinkatta + * Add kcd + * Change keuklid to kgeo + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 29 Aug 2001 00:38:00 -0700 + +meta-kde (4:2.2.3) unstable; urgency=low + + * Remove kups + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 22 Aug 2001 18:45:00 -0700 + +meta-kde (4:2.2.2) unstable; urgency=low + + * Add missing packages (Closes: #109373) + * Add missing games (Closes: #109433) + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 21 Aug 2001 00:01:00 -0700 + +meta-kde (4:2.2.1) unstable; urgency=low + + * Remove skam (Closes: #109019) + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 17 Aug 2001 08:50:00 -0700 + +meta-kde (4:2.2) unstable; urgency=low + + * Update deps for final 2.2 packages - actually do version deps so that + those who just like updating the meta-package won't get hosed...this + would only be an issue for those in testing/sid land. I think for final + release I'll take out the version deps to cut down on Packages size and + all...plus there really is no need for it for the release. I can go + back to versioned deps afterwards. + * add conflicts for old task-* packages...let's make sure they get removed + * Packages removed from kde-extras: kaim + kaim had to change it's name due to AOL being stupid and claiming TM on + the name AIM and use of it. I'll add the new package name once I get + packages built for it. They plon on a 1.00 release under the new name + however it still isn't available. The new name is kinkatta. + * New packages added to kde-extras: kooka, libkscan1, kandy, kmsn, + skam, mp3kult, licq-plugin-kde, knapster2, kaptain, wordtrans-kde + * New packages added to kde-devel: kspy, kbabel + * New packages added to kde: kdelibs3-crypto, kdebase-crypto, kdessh, + aktion, kde-i18n (all as suggests) + * New packages added to kde-games: kdecarddecks + * Moved kde-games from a suggests to a recommends for kde. + * Moved plugins and artwork from kde to kde-extras + * Change dep for kdm to kdm | x-display-manager which will exist soon. + * Install the Readme into the kde-extras package like the others. + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 10 Aug 2001 03:22:00 -0700 + +meta-kde (4:2.1.44) unstable; urgency=low + + * Fix libkmid | libkmid-alsa dep (Closes: #107585) + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 03 Aug 2001 11:28:00 -0700 + +meta-kde (4:2.1.43) unstable; urgency=low + + * Fix typo (Closes: #107371) + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 01 Aug 2001 09:49:00 -0700 + +meta-kde (4:2.1.42) unstable; urgency=low + + * br translations for debconf (Closes: #107033) + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 30 Jul 2001 00:58:00 -0700 + +meta-kde (4:2.1.41) unstable; urgency=low + + * Remove kamera...got ahead of myself + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 27 Jul 2001 20:27:00 -0700 + +meta-kde (4:2.1.40) unstable; urgency=low + + * Remove ksysctrl + * Update note about NVidia drivers in howto + * Add kamera + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 27 Jul 2001 00:49:00 -0700 + +meta-kde (4:2.1.39) unstable; urgency=low + + * Remove old dep on ktimemon + * Update descriptions + * Fix deps (Closes: #106425) + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 25 Jul 2001 03:37:00 -0700 + +meta-kde (4:2.1.38) unstable; urgency=low + + * Set some versioning for certain key packages + * add some or's (Closes: #96809) + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 19 Jul 2001 14:36:00 -0700 + +meta-kde (4:2.1.37) unstable; urgency=low + + * Get rid of task- prefixes since they are closer to meta packages than + tasks and tasks are handled differently now + * Change source package name to meta-kde to avoid confusion + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 17 Jul 2001 13:47:00 -0700 + +task-kde (4:2.1.36) unstable; urgency=low + + * Fix typo - thanks Martin Sj|gren <md9ms@mdstud.chalmers.se> + * Swedish tranlations (Closes: #103141) + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 02 Jul 2001 23:00:00 -0700 + +task-kde (4:2.1.35) unstable; urgency=low + + * kworldwatch -> kworldclock + * add kdeartwork and the addons bits + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 29 Jun 2001 20:00:00 -0700 + +task-kde (4:2.1.34) unstable; urgency=low + + * Update for 2.2 + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 28 Jun 2001 22:15:00 -0700 + +task-kde (4:2.1.33) unstable; urgency=low + + * Add konverse (Closes: #101037) + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 18 Jun 2001 22:15:00 -0700 + +task-kde (4:2.1.32) unstable; urgency=low + + * Add kleandisk (Closes: #98175) + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 23 May 2001 12:06:00 -0700 + +task-kde (4:2.1.31) unstable; urgency=low + + * Add keuklid (Closes: #98046) + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 22 May 2001 00:35:00 -0700 + +task-kde (4:2.1.30) unstable; urgency=low + + * Fix task issue (Closes: #97308, #97309) + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 13 May 2001 02:10:00 -0700 + +task-kde (4:2.1.29) unstable; urgency=low + + * New depends: kscreensaver, kdebase-audiolibs + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 12 May 2001 01:11:00 -0700 + +task-kde (4:2.1.28) unstable; urgency=low + + * new translations for debconf (Closes: #96515) + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 06 May 2001 18:22:00 -0700 + +task-kde (4:2.1.27) unstable; urgency=low + + * Add kweather (Closes: #96370) + * Happy birthday dad! + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 05 May 2001 02:13:00 -0700 + +task-kde (4:2.1.26) unstable; urgency=low + + * More dependency updates + * Update descriptions + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 04 May 2001 03:53:00 -0700 + +task-kde (4:2.1.24) unstable; urgency=low + + * Major cleanup + Removed all |'s from task packages + Removed all Suggests from task packages + Removed all Recommends from task packages + New task-kde-extras package which will contain all non-essential kde + packages including those considered to *possibly* open up security + risks such as required a ftp server or a talkd server. + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 02 May 2001 00:27:00 -0700 + +task-kde (4:2.1.23) unstable; urgency=low + + * Change Recommends to Suggests for ktalkd (Closes: #95661) + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 28 Apr 2001 17:46:00 -0700 + +task-kde (4:2.1.22) unstable; urgency=low + + * Changing AA package name to anti-aliasing-howto to keep the task bigots + of my ass. + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 28 Apr 2001 03:22:00 -0700 + +task-kde (4:2.1.21) unstable; urgency=low + + * More dependency work + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 24 Apr 2001 17:42:00 -0700 + +task-kde (4:2.1.20) unstable; urgency=low + + * Do kdevelop | kdestudio (Closes: #94377) + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 19 Apr 2001 10:43:00 -0700 + +task-kde (4:2.1.19) unstable; urgency=low + + * More depends movement. + Move Recommends parts in -dev package to Depends + Move koffice to Recommends from Depends as it's not an official release + + -- Ivan E. Moore II <rkrusty@debian.org> Wed, 18 Apr 2001 01:03:00 -0700 + +task-kde (4:2.1.18) unstable; urgency=low + + * Change Depends to Recommends for xfs since it's not required + * Add in german debconf bit (Closes: #94086) + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 15 Apr 2001 20:10:00 -0700 + +task-kde (4:2.1.17) unstable; urgency=low + + * Replace individual koffice packages with single "koffice" package + * Move a few packages from Suggests to Depends + * Change Recommends to Depends for task-kde-games + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 14 Apr 2001 00:27:00 -0700 + +task-kde (4:2.1.16) unstable; urgency=low + + * Add link to Linux Planet tutorial on AA + * Add link to Keith Packard's web page + * Add in bit to XftConfig example for turning of AA for font sizes smaller + than 11pixels. Submitted by Christian Mayrhuber + * Add cervisia to task-kde-devel package + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 08 Apr 2001 04:44:00 -0700 + +task-kde (4:2.1.15) unstable; urgency=low + + * Update font pathing in XftConfig and README + * Re-arrange some of the depends for task-anti-aliasing due to some of the + items being contrib and non-free. Make all but necessary fonts Suggests. + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 08 Apr 2001 04:44:00 -0700 + +task-kde (4:2.1.14) unstable; urgency=low + + * Add kaim + * Add kyahoo + * Add aethera + * New package: task-anti-aliasing + This will depend on packages required for AA (Anti Aliasing) support + as well as other suggests/recommends. Added documentation and eventual + debconf configuration and checks to make sure basic items are setup. + + -- Ivan E. Moore II <rkrusty@debian.org> Sat, 07 Apr 2001 03:34:00 -0700 + +task-kde (4:2.1.13) unstable; urgency=low + + * Move klisa from depends to recommends + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 02 Apr 2001 10:10:00 -0700 + +task-kde (4:2.1.12) unstable; urgency=low + + * Add kcpuload to suggests (Closes: #92016) + * Rearrange kdesdk deps (Closes: #92017) + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 30 Mar 2001 21:22:00 -0700 + +task-kde (4:2.1.11) unstable; urgency=low + + * Change dependency for lisa to klisa and moving to depends + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 27 Mar 2001 03:42:00 -0700 + +task-kde (4:2.1.10) unstable; urgency=low + + * New package: task-kde-games which will act like the task-gnome-games and + will recommend all kde based games or toys + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 26 Mar 2001 11:36:00 -0700 + +task-kde (4:2.1.9) unstable; urgency=low + + * Remove old kformula + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 11 Mar 2001 23:48:00 -0700 + +task-kde (4:2.1.8) unstable; urgency=low + + * Fix task-kde-devel depends for xlib6g|xlibs + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 11 Mar 2001 07:25:00 -0700 + +task-kde (4:2.1.7) unstable; urgency=low + + * Add other non-core kde apps to Suggests + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 08 Mar 2001 02:52:00 -0700 + +task-kde (4:2.1.6) unstable; urgency=low + + * Add Recommend for kprof (Closes: #88659) + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 05 Mar 2001 23:44:00 -0700 + +task-kde (4:2.1.5) unstable; urgency=low + + * Add in suggests/recommends for some font packages and whatnot needed for + AA use. + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 01 Mar 2001 07:23:00 -0700 + +task-kde (4:2.1.4) unstable; urgency=low + + * Take into account new qt package + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 23 Feb 2001 10:15:00 -0700 + +task-kde (4:2.1.3) unstable; urgency=low + + * Adding in depends/recommends/suggests for kdesdk and kdebindings packages + that are either in now or will be with 2.1 + * Adding in missing depends for ldap and cdparanoia -dev + + -- Ivan E. Moore II <rkrusty@debian.org> Tue, 20 Feb 2001 02:37:00 -0700 + +task-kde (4:2.1.2) unstable; urgency=low + + * Updating Depends to not include some non-base type packages and putting + them in recommends/suggests + + -- Ivan E. Moore II <rkrusty@debian.org> Mon, 19 Feb 2001 00:54:00 -0700 + +task-kde (4:2.1.1) unstable; urgency=low + + * Changing depends from libqt2.2-dev to libqt-dev and from kdelibs3-dev + to kdelibs-dev + + -- Ivan E. Moore II <rkrusty@debian.org> Thu, 15 Feb 2001 03:45:00 -0700 + +task-kde (4:2.1.0) unstable; urgency=low + + * Broke out task packages + + -- Ivan E. Moore II <rkrusty@debian.org> Fri, 09 Feb 2001 02:31:00 -0700 + +task-kde (4:2.0.0) unstable; urgency=low + + * More work on nspluginscan to avoid problems with faulty plugins + * Several small bug fixes from upstream + * Adding xutils to task-kde-devel package + * Fixing conflict with kfind (Closes: #83709) + * Fixing default bs for konsole for those not using "linux" or "vt100" + (Closes: #83705) + * Adding notation to konqueror about page about kdelibs3-crypto + * Applying German debconf template (Closes: #83871) + * Should also handle upgrade cleanup better. This is across the board but + affects base more than any other package. (Closes: #83543) + * Fixes problem with symbols in konsole (Closes: #83987) + + -- Ivan E. Moore II <rkrusty@debian.org> Sun, 28 Jan 2001 01:30:00 -0700 diff --git a/debian/wheezy/metapackages/meta-tde/debian/compat b/debian/wheezy/metapackages/meta-tde/debian/compat new file mode 100644 index 000000000..1e8b31496 --- /dev/null +++ b/debian/wheezy/metapackages/meta-tde/debian/compat @@ -0,0 +1 @@ +6 diff --git a/debian/wheezy/metapackages/meta-tde/debian/control b/debian/wheezy/metapackages/meta-tde/debian/control new file mode 100644 index 000000000..12ddd9aaf --- /dev/null +++ b/debian/wheezy/metapackages/meta-tde/debian/control @@ -0,0 +1,60 @@ +Source: meta-kde-trinity +Section: kde +Priority: optional +Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Sune Vuorela <debian@pusling.com>, Fathi Boudra <fabo@debian.org>, Armin Berres <trigger+debian@space-based.de> +Build-Depends: debhelper (>= 6) +Standards-Version: 3.7.3 +Homepage: http://www.kde.org + +Package: kde-trinity +Architecture: all +Section: kde +Priority: optional +Depends: kde-core-trinity (>= 5:47), kde-core-trinity (>= 5:47), kdeedu-trinity (>= 4:3.5.5), kdegames-trinity (>= 4:3.5.5), kdetoys-trinity (>= 4:3.5.5), kdeaccessibility-trinity (>= 4:3.5.5), kdeaddons-trinity (>= 4:3.5.5), kdeadmin-trinity (>= 4:3.5.5), kdeartwork-trinity (>= 4:3.5.5), kdegraphics-trinity (>= 4:3.5.5), kdemultimedia-trinity (>= 4:3.5.5), kdenetwork-trinity (>= 4:3.5.5), kdepim-trinity (>= 4:3.5.5), kdeutils-trinity (>= 4:3.5.5), kdewebdev-trinity (>= 4:3.5.5), desktop-base-trinity +Suggests: kde-i18n-trinity (>= 4:3.5.5), x-window-system-core, kdesudo-trinity, debian-kgtk-trinity +Description: the K Desktop Environment official modules [Trinity] + KDE (the K Desktop Environment) is a powerful Open Source graphical + desktop environment for Unix workstations. It combines ease of use, + contemporary functionality, and outstanding graphical design with the + technological superiority of the Unix operating system. + . + This metapackage includes all the official modules released with KDE that + are not specific to development. In addition to the core KDE modules, this + includes multimedia, networking, personal information manager (PIM), + graphics, education, games, web development, system administration tools, + and other artwork and utilities. + + +Package: kde-core-trinity +Architecture: all +Section: kde +Priority: optional +Depends: arts-trinity (>= 1.5.5), kdebase-trinity (>= 4:3.5.5), kdelibs-trinity (>= 4:3.5.5), sudo-trinity +Suggests: kde-i18n-trinity (>= 4:3.5.5) +Description: the K Desktop Environment core modules [Trinity] + KDE (the K Desktop Environment) is a powerful Open Source graphical + desktop environment for Unix workstations. It combines ease of use, + contemporary functionality, and outstanding graphical design with the + technological superiority of the Unix operating system. + . + This metapackage includes the core official modules released with KDE. This + includes just the basic desktop (browser, file manager, text editor, control + center, panel, etc.) and important libraries and data, in addition to the + aRts soundserver. + +Package: kde-devel-trinity +Architecture: all +Section: kde +Priority: optional +Depends: kde-core-trinity (>= 5:48), kdesdk-trinity (>= 4:3.5.5), libartsc0-trinity-dev (>= 1.5.5), libarts1-trinity-dev (>= 1.5.5), kdelibs4-trinity-dev (>= 4:3.5.5), kdebase-trinity-dev (>= 4:3.5.5), libkonq4-trinity-dev (>= 4:3.5.5), qt3-designer +Suggests: kde-i18n-trinity (>= 4:3.5.5), kdbg-trinity, kdevelop-trinity (>= 4:3.3.5), kprof-trinity +Description: the K Desktop Environment development files and modules [Trinity] + KDE (the K Desktop Environment) is a powerful Open Source graphical + desktop environment for Unix workstations. It combines ease of use, + contemporary functionality, and outstanding graphical design with the + technological superiority of the Unix operating system. + . + This metapackage includes official KDE modules that are useful to developers, + including KDE's software development kit (SDK), Qt3's designer tool, and all + core KDE header and development packages. diff --git a/debian/wheezy/metapackages/meta-tde/debian/copyright b/debian/wheezy/metapackages/meta-tde/debian/copyright new file mode 100644 index 000000000..a007b7115 --- /dev/null +++ b/debian/wheezy/metapackages/meta-tde/debian/copyright @@ -0,0 +1,20 @@ +This package was created by Ivan E. Moore II <rkrusty@debian.org>. + +Copyright (C) 2001 Ivan E. Moore II +Copyright (C) 2003 Christopher L. Cheney +Copyright (C) 2004-2008 Debian Qt/KDE Maintainers + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABLILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. You should have received a +copy of the GNU General Public License along with this program; if +not, write to the Free Software Foundation, Inc, 51 Franklin St, +Fifth Floor, Boston, MA 02110-1301, USA. + +Please see /usr/share/common-licenses/GPL for the full license. diff --git a/debian/wheezy/metapackages/meta-tde/debian/kde-core.README.Debian b/debian/wheezy/metapackages/meta-tde/debian/kde-core.README.Debian new file mode 120000 index 000000000..903888432 --- /dev/null +++ b/debian/wheezy/metapackages/meta-tde/debian/kde-core.README.Debian @@ -0,0 +1 @@ +README.Debian
\ No newline at end of file diff --git a/debian/wheezy/metapackages/meta-tde/debian/kde-devel.README.Debian b/debian/wheezy/metapackages/meta-tde/debian/kde-devel.README.Debian new file mode 120000 index 000000000..903888432 --- /dev/null +++ b/debian/wheezy/metapackages/meta-tde/debian/kde-devel.README.Debian @@ -0,0 +1 @@ +README.Debian
\ No newline at end of file diff --git a/debian/wheezy/metapackages/meta-tde/debian/kde.README.Debian b/debian/wheezy/metapackages/meta-tde/debian/kde.README.Debian new file mode 120000 index 000000000..903888432 --- /dev/null +++ b/debian/wheezy/metapackages/meta-tde/debian/kde.README.Debian @@ -0,0 +1 @@ +README.Debian
\ No newline at end of file diff --git a/debian/wheezy/metapackages/meta-tde/debian/rules b/debian/wheezy/metapackages/meta-tde/debian/rules new file mode 100755 index 000000000..a3fbf99a7 --- /dev/null +++ b/debian/wheezy/metapackages/meta-tde/debian/rules @@ -0,0 +1,55 @@ +#!/usr/bin/make -f + +#export DH_VERBOSE=1 + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + +configure: configure-stamp +configure-stamp: + dh_testdir + + touch configure-stamp + +build: build-stamp + +build-stamp: configure-stamp + dh_testdir + touch $@ + +clean: + dh_testdir + dh_testroot + rm -f build-arch-stamp build-indep-stamp configure-stamp + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k -i + dh_installdirs -i + + +binary-arch: build install + +binary-indep: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installexamples +# dh_install +# dh_installinfo + dh_installman + dh_link + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure diff --git a/debian/wheezy/metapackages/sudo-trinity/debian/rules b/debian/wheezy/metapackages/sudo-trinity/debian/rules index 087848532..f8c89d5db 100755 --- a/debian/wheezy/metapackages/sudo-trinity/debian/rules +++ b/debian/wheezy/metapackages/sudo-trinity/debian/rules @@ -6,3 +6,6 @@ CFLAGS=-g -Wall -fPIC DEB_MAKE_INSTALL_TARGET := install DESTDIR="$(DEB_DESTDIR)" DEB_INSTALL_DOCS_ALL := + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) diff --git a/debian/wheezy/metapackages/sudo-trinity/debian/source/options b/debian/wheezy/metapackages/sudo-trinity/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/metapackages/sudo-trinity/debian/source/options +++ b/debian/wheezy/metapackages/sudo-trinity/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 diff --git a/debian/wheezy/tde-i18n/debian/control b/debian/wheezy/tde-i18n/debian/control index 11d0c979e..37422390f 100644 --- a/debian/wheezy/tde-i18n/debian/control +++ b/debian/wheezy/tde-i18n/debian/control @@ -25,7 +25,7 @@ Replaces: kde-i18n-ar-trinity (<< 4:14.0.0) Breaks: kde-i18n-ar-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde -Provides: tde-i18n-trinity-trinity +Provides: tde-i18n-trinity Description: Arabic (ar) internationalized (i18n) files for KDE This package contains the Arabic internationalized (i18n) files for all KDE core applications. @@ -505,7 +505,7 @@ Replaces: kde-i18n-nb-trinity (<< 4:14.0.0) Breaks: kde-i18n-nb-trinity (<< 4:14.0.0) Depends: tdelibs4c2a-trinity Suggests: kde -Provides: tde-i18n-trinity, tde-i18n-no +Provides: tde-i18n-trinity, tde-i18n-no-trinity Description: Norwegian Bookmal (nb) internationalized (i18n) files for KDE This package contains the Norwegian Bookmal internationalized (i18n) files for all KDE core applications. diff --git a/debian/wheezy/tde-i18n/debian/rules b/debian/wheezy/tde-i18n/debian/rules index e275e35df..b60af22ee 100755 --- a/debian/wheezy/tde-i18n/debian/rules +++ b/debian/wheezy/tde-i18n/debian/rules @@ -31,6 +31,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + debian/debiandirs: scripts/admin/debianrules perl -w scripts/admin/debianrules echodirs > debian/debiandirs @@ -107,7 +110,7 @@ binary-indep: build install dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb $(DEB_DH_BUILDDEB_ARGS) # Below here is fairly generic really diff --git a/debian/wheezy/tde-i18n/debian/source/options b/debian/wheezy/tde-i18n/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/tde-i18n/debian/source/options +++ b/debian/wheezy/tde-i18n/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 diff --git a/debian/wheezy/tdeaccessibility/debian/rules b/debian/wheezy/tdeaccessibility/debian/rules index f5c6caf43..4fdbdb6c3 100755 --- a/debian/wheezy/tdeaccessibility/debian/rules +++ b/debian/wheezy/tdeaccessibility/debian/rules @@ -18,6 +18,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := \ DEB_DH_STRIP_ARGS := --dbg-package=tdeaccessibility-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := kttsd-trinity ksayit-trinity #shlibs_ver = 4:3.5.0 diff --git a/debian/wheezy/tdeaccessibility/debian/source/options b/debian/wheezy/tdeaccessibility/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/tdeaccessibility/debian/source/options +++ b/debian/wheezy/tdeaccessibility/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 diff --git a/debian/wheezy/tdeaddons/debian/rules b/debian/wheezy/tdeaddons/debian/rules index 5d337bfab..e2158a506 100755 --- a/debian/wheezy/tdeaddons/debian/rules +++ b/debian/wheezy/tdeaddons/debian/rules @@ -16,6 +16,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := --without-xmms --prefix=/opt/trinity --with-extra-l DEB_DH_STRIP_ARGS := --dbg-package=tdeaddons-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DOC_HTML_PRUNE := konq-plugins-trinity/smbmounter binary-install/konq-plugins-trinity:: diff --git a/debian/wheezy/tdeaddons/debian/source/options b/debian/wheezy/tdeaddons/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/tdeaddons/debian/source/options +++ b/debian/wheezy/tdeaddons/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 diff --git a/debian/wheezy/tdeadmin/debian/rules b/debian/wheezy/tdeadmin/debian/rules index 9c9ccadda..849de5f21 100755 --- a/debian/wheezy/tdeadmin/debian/rules +++ b/debian/wheezy/tdeadmin/debian/rules @@ -14,6 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_STRIP_ARGS := --dbg-package=tdeadmin-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_CONFIGURE_EXTRA_FLAGS := \ --without-rpm --with-pam=kde --with-shadow --with-nis \ --with-private-groups --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib diff --git a/debian/wheezy/tdeadmin/debian/source/options b/debian/wheezy/tdeadmin/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/tdeadmin/debian/source/options +++ b/debian/wheezy/tdeadmin/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 diff --git a/debian/wheezy/tdeartwork/debian/control b/debian/wheezy/tdeartwork/debian/control index 514fae94e..ee0ae9ba5 100644 --- a/debian/wheezy/tdeartwork/debian/control +++ b/debian/wheezy/tdeartwork/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-trinity-dev, gawk, gettext, sharutils, tdebase-trinity-dev, twin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), cmake, autotools-dev, tdelibs4-trinity-dev, gawk, gettext, sharutils, tdebase-trinity-dev, twin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies, automake, autoconf, libtool, libltdl-dev Build-Conflicts: autoconf2.13, nvidia-glx Standards-Version: 3.8.4 diff --git a/debian/wheezy/tdeartwork/debian/rules b/debian/wheezy/tdeartwork/debian/rules index be9adbbcd..4e236c044 100755 --- a/debian/wheezy/tdeartwork/debian/rules +++ b/debian/wheezy/tdeartwork/debian/rules @@ -1,6 +1,7 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk @@ -14,8 +15,22 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ARTS="ON" + DEB_DH_STRIP_ARGS := --dbg-package=tdeartwork-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + clean:: rm -f IconThemes/kdeclassic/22x22/actions/kde/kde.png rm -f IconThemes/kdeclassic/32x32/actions/kde/kde.png diff --git a/debian/wheezy/tdeartwork/debian/source/options b/debian/wheezy/tdeartwork/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/tdeartwork/debian/source/options +++ b/debian/wheezy/tdeartwork/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 diff --git a/debian/wheezy/tdebase/debian/80ubuntu-xmodmap b/debian/wheezy/tdebase/debian/80ubuntu-xmodmap index 27a318d73..7774dd9b8 100644 --- a/debian/wheezy/tdebase/debian/80ubuntu-xmodmap +++ b/debian/wheezy/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/debian/wheezy/tdebase/debian/control b/debian/wheezy/tdebase/debian/control index 39819b4ea..7f0ff08d3 100644 --- a/debian/wheezy/tdebase/debian/control +++ b/debian/wheezy/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/debian/wheezy/tdebase/debian/rules b/debian/wheezy/tdebase/debian/rules index a5183fe19..c72887aaa 100755 --- a/debian/wheezy/tdebase/debian/rules +++ b/debian/wheezy/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/debian/wheezy/tdebase/debian/source/options b/debian/wheezy/tdebase/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/tdebase/debian/source/options +++ b/debian/wheezy/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 diff --git a/debian/wheezy/tdebindings/debian/rules b/debian/wheezy/tdebindings/debian/rules index 6a0e11dc7..b503f7580 100755 --- a/debian/wheezy/tdebindings/debian/rules +++ b/debian/wheezy/tdebindings/debian/rules @@ -35,6 +35,9 @@ DEB_CONFIGURE_EXTRA_FLAGS = $(WITH_JAVA) \ DEB_COMPRESS_EXCLUDE += .java .ui .js .rb .map .wav .bmp .cpp .sk +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # These are not all the packages with libraries, but only those that # need to be in DEB_SHLIBDEPS_INCLUDE... PACKAGES_WITH_LIBS = libqt3-jni-trinity libsmokeqt1-trinity libsmokekde1-trinity libkjsembed1-trinity diff --git a/debian/wheezy/tdebindings/debian/source/options b/debian/wheezy/tdebindings/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/tdebindings/debian/source/options +++ b/debian/wheezy/tdebindings/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 diff --git a/debian/wheezy/tdeedu/debian/rules b/debian/wheezy/tdeedu/debian/rules index d1258cdf0..9f81df4c0 100755 --- a/debian/wheezy/tdeedu/debian/rules +++ b/debian/wheezy/tdeedu/debian/rules @@ -16,6 +16,9 @@ DEB_DH_INSTALL_SOURCEDIR := $(DEB_DESTDIR) DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + # Ensure that kig's python scripting built successfully. common-build-arch:: test -e $(DEB_BUILDDIR)/kig/scripting/libscripting.la diff --git a/debian/wheezy/tdeedu/debian/source/options b/debian/wheezy/tdeedu/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/tdeedu/debian/source/options +++ b/debian/wheezy/tdeedu/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 diff --git a/debian/wheezy/tdegames/debian/rules b/debian/wheezy/tdegames/debian/rules index a979e0440..085eb8404 100755 --- a/debian/wheezy/tdegames/debian/rules +++ b/debian/wheezy/tdegames/debian/rules @@ -26,6 +26,9 @@ DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if DEB_INSTALL_CHANGELOGS_tdegames := $(DEB_SRCDIR)/ChangeLog +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_DH_MAKESHLIBS_ARGS_libtdegames1-trinity := -V'libtdegames1-trinity' DEB_DH_MAKESHLIBS_ARGS_atlantik-trinity := -V DEB_DH_MAKESHLIBS_ARGS_kolf-trinity := -V diff --git a/debian/wheezy/tdegames/debian/source/options b/debian/wheezy/tdegames/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/tdegames/debian/source/options +++ b/debian/wheezy/tdegames/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 diff --git a/debian/wheezy/tdegraphics/debian/rules b/debian/wheezy/tdegraphics/debian/rules index 927f3faf8..9aedb5fcf 100755 --- a/debian/wheezy/tdegraphics/debian/rules +++ b/debian/wheezy/tdegraphics/debian/rules @@ -24,6 +24,9 @@ DEB_BUILD_PARALLEL = true DEB_DH_STRIP_ARGS := --dbg-package=tdegraphics-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := kfaxview-trinity kghostview-trinity kmrml-trinity kpovmodeler-trinity ksvg-trinity \ kuickshow-trinity kview-trinity kviewshell-trinity libkscan1-trinity diff --git a/debian/wheezy/tdegraphics/debian/source/options b/debian/wheezy/tdegraphics/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/tdegraphics/debian/source/options +++ b/debian/wheezy/tdegraphics/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 diff --git a/debian/wheezy/tdelibs/debian/rules b/debian/wheezy/tdelibs/debian/rules index 3c7a4b8a7..44ac6deda 100755 --- a/debian/wheezy/tdelibs/debian/rules +++ b/debian/wheezy/tdelibs/debian/rules @@ -36,6 +36,9 @@ DEB_FIXPERMS_EXCLUDE := \ DEB_DH_STRIP_ARGS := --dbg-package=tdelibs-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + binary-install/tdelibs-data-trinity:: install -p -D -m644 kded/applications.menu debian/tdelibs-data-trinity/opt/trinity/etc/xdg/menus/kde-applications.menu install -p -D -m644 debian/trinitylibs.conf debian/tdelibs-data-trinity/etc/ld.so.conf.d/trinitylibs.conf diff --git a/debian/wheezy/tdelibs/debian/source/options b/debian/wheezy/tdelibs/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/tdelibs/debian/source/options +++ b/debian/wheezy/tdelibs/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 diff --git a/debian/wheezy/tdemultimedia/debian/rules b/debian/wheezy/tdemultimedia/debian/rules index 336c7e70d..1e7e0647c 100755 --- a/debian/wheezy/tdemultimedia/debian/rules +++ b/debian/wheezy/tdemultimedia/debian/rules @@ -23,6 +23,9 @@ DOC_HTML_PRUNE := kcontrol-trinity DEB_DH_STRIP_ARGS := --dbg-package=tdemultimedia-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := artsbuilder-trinity tdemultimedia-kio-plugins-trinity kmid-trinity kmix-trinity krec-trinity \ libarts1-akode-trinity libarts1-audiofile-trinity libarts1-mpeglib-trinity libarts1-xine-trinity \ libkcddb1-trinity mpeglib-trinity noatun-trinity diff --git a/debian/wheezy/tdemultimedia/debian/source/options b/debian/wheezy/tdemultimedia/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/tdemultimedia/debian/source/options +++ b/debian/wheezy/tdemultimedia/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 diff --git a/debian/wheezy/tdenetwork/debian/control b/debian/wheezy/tdenetwork/debian/control index 637a8912d..a1a2dcb2b 100644 --- a/debian/wheezy/tdenetwork/debian/control +++ b/debian/wheezy/tdenetwork/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>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com>, Sarah Hobbs <hobbsee@ubuntu.com>, Sune Vuorela <debian@pusling.com> -Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs4-trinity-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), cmake, autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs4-trinity-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: tdenetwork-trinity @@ -149,7 +149,7 @@ Architecture: any Replaces: kopete-trinity (<< 4:14.0.0) Breaks: kopete-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends} -Recommends: qca-tls +Recommends: tqca-tls Suggests: tdeartwork-emoticons-trinity, khelpcenter-trinity, imagemagick, gnupg, gnomemeeting Description: instant messenger for Trinity Kopete is an instant messenger program which can communicate with a variety diff --git a/debian/wheezy/tdenetwork/debian/control.in b/debian/wheezy/tdenetwork/debian/control.in index ec41ae06a..1c7fc62f9 100644 --- a/debian/wheezy/tdenetwork/debian/control.in +++ b/debian/wheezy/tdenetwork/debian/control.in @@ -132,7 +132,7 @@ Package: kopete Section: tde Architecture: any Depends: ${shlibs:Depends} -Recommends: qca-tls +Recommends: tqca-tls Suggests: tdeartwork-emoticons, khelpcenter, imagemagick, gnupg, gnomemeeting Replaces: konversation (<= 0.14.0-4), sim (<= 0.9.3-2) Description: instant messenger for KDE diff --git a/debian/wheezy/tdenetwork/debian/rules b/debian/wheezy/tdenetwork/debian/rules index bab6267ec..2579d07e3 100755 --- a/debian/wheezy/tdenetwork/debian/rules +++ b/debian/wheezy/tdenetwork/debian/rules @@ -13,6 +13,7 @@ export DH_OPTIONS # include debian/cdbs/buildvars.mk include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk @@ -26,8 +27,26 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_WEBCAM="ON" \ + -DWITH_ARTS="ON" \ + -DWITH_SLP="ON" \ + -DBUILD_KOPETE_PROTOCOL_ALL="ON" \ + -DBUILD_KOPETE_PLUGIN_ALL="ON" + DEB_DH_STRIP_ARGS := --dbg-package=tdenetwork-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := librss1-trinity kopete-trinity ksirc-trinity kwifimanager-trinity #shlibs_ver = 4:3.5.0-1 diff --git a/debian/wheezy/tdenetwork/debian/source/options b/debian/wheezy/tdenetwork/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/tdenetwork/debian/source/options +++ b/debian/wheezy/tdenetwork/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 diff --git a/debian/wheezy/tdepim/debian/rules b/debian/wheezy/tdepim/debian/rules index b20b4a7b9..0e1c5356b 100755 --- a/debian/wheezy/tdepim/debian/rules +++ b/debian/wheezy/tdepim/debian/rules @@ -32,6 +32,9 @@ DEB_INSTALL_DOCS_ALL := DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if test -s $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; then echo $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; break; fi; done) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + shlibs_ver=4:3.5.7 DEB_DH_MAKESHLIBS_ARGS_libindex0-trinity := -V'libindex0-trinity (>= $(shlibs_ver))' DEB_DH_MAKESHLIBS_ARGS_libkcal2b-trinity := -V'libkcal2b-trinity (>= $(shlibs_ver))' diff --git a/debian/wheezy/tdepim/debian/source/options b/debian/wheezy/tdepim/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/tdepim/debian/source/options +++ b/debian/wheezy/tdepim/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 diff --git a/debian/wheezy/tdesdk/debian/control b/debian/wheezy/tdesdk/debian/control index 16d2c2e6b..5305f7b08 100644 --- a/debian/wheezy/tdesdk/debian/control +++ b/debian/wheezy/tdesdk/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>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, +Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), cmake, autotools-dev, gawk, gettext, pkg-config, tdelibs4-trinity-dev, binutils-dev, bison, flex, tdepim-trinity-dev, libapr1-dev, libkcal2-trinity-dev, libktnef1-trinity-dev, libsvn-dev, libdb-dev, diff --git a/debian/wheezy/tdesdk/debian/rules b/debian/wheezy/tdesdk/debian/rules index 3675e531a..36d49b7c7 100755 --- a/debian/wheezy/tdesdk/debian/rules +++ b/debian/wheezy/tdesdk/debian/rules @@ -1,6 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk @@ -14,8 +15,23 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_STRIP_ARGS := --dbg-package=tdesdk-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_DBSEARCHENGINE="ON" \ + -DWITH_KCAL="ON" + PACKAGES_WITH_LIBS := kbabel-trinity kompare-trinity kspy-trinity kunittest-trinity libcvsservice0-trinity umbrello-trinity #shlibs_ver = 4:3.5.0-1 diff --git a/debian/wheezy/tdesdk/debian/source/options b/debian/wheezy/tdesdk/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/tdesdk/debian/source/options +++ b/debian/wheezy/tdesdk/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 diff --git a/debian/wheezy/tdetoys/debian/control b/debian/wheezy/tdetoys/debian/control index e583487ae..a603814b4 100644 --- a/debian/wheezy/tdetoys/debian/control +++ b/debian/wheezy/tdetoys/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>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com> -Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-trinity-dev, gawk, gettext, sharutils, automake, autoconf, libtool, libltdl-dev +Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), cmake, autotools-dev, tdelibs4-trinity-dev, gawk, gettext, sharutils, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: tdetoys-trinity diff --git a/debian/wheezy/tdetoys/debian/rules b/debian/wheezy/tdetoys/debian/rules index 60a5a9cf4..da1268d9f 100755 --- a/debian/wheezy/tdetoys/debian/rules +++ b/debian/wheezy/tdetoys/debian/rules @@ -1,6 +1,7 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk @@ -14,7 +15,20 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" + DEB_DH_STRIP_ARGS := --dbg-package=tdetoys-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + DEB_INSTALL_CHANGELOGS_kodo-trinity := kodo/ChangeLog DEB_INSTALL_CHANGELOGS_kteatime-trinity := kteatime/ChangeLog diff --git a/debian/wheezy/tdetoys/debian/source/options b/debian/wheezy/tdetoys/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/tdetoys/debian/source/options +++ b/debian/wheezy/tdetoys/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 diff --git a/debian/wheezy/tdeutils/debian/control b/debian/wheezy/tdeutils/debian/control index 8af135969..23132b0e0 100644 --- a/debian/wheezy/tdeutils/debian/control +++ b/debian/wheezy/tdeutils/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>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, 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, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, sharutils, automake, autoconf, libtool, libltdl-dev +Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), cmake, autotools-dev, gawk, gettext, tdelibs4-trinity-dev, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, sharutils, automake, autoconf, libtool, libltdl-dev Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc Standards-Version: 3.8.4 diff --git a/debian/wheezy/tdeutils/debian/rules b/debian/wheezy/tdeutils/debian/rules index f0a8e0d00..19848196e 100755 --- a/debian/wheezy/tdeutils/debian/rules +++ b/debian/wheezy/tdeutils/debian/rules @@ -1,6 +1,7 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk @@ -16,10 +17,32 @@ DEB_KDE_APIDOX := yes DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_DPMS="ON" \ + -DWITH_ASUS="ON" \ + -DWITH_VAIO="ON" \ + -DWITH_THINKPAD="ON" \ + -DWITH_I8K="ON" \ + -DWITH_SNMP="ON" \ + -DWITH_SENSORS="ON" \ + -DWITH_XMMS="ON" \ + -DWITH_KNEWSTUFF="ON" + DOC_HTML_PRUNE := kcontrol-trinity kinfocenter-trinity ktimer-trinity kcharselect-trinity ksim-trinity DEB_DH_STRIP_ARGS := --exclude=examples --dbg-package=tdeutils-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := khexedit-trinity klaptopdaemon-trinity kmilo-trinity kregexpeditor-trinity ksim-trinity #shlibs_ver = 4:3.5.0-1 diff --git a/debian/wheezy/tdeutils/debian/source/options b/debian/wheezy/tdeutils/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/tdeutils/debian/source/options +++ b/debian/wheezy/tdeutils/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 diff --git a/debian/wheezy/tdevelop/debian/control b/debian/wheezy/tdevelop/debian/control index 6203fd52d..ba0e5814b 100644 --- a/debian/wheezy/tdevelop/debian/control +++ b/debian/wheezy/tdevelop/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Jeremy Lain <jeremy.laine@m4x.org> -Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), tdelibs4-trinity-dev, gettext, tdelibs4-trinity-doc, libtqtinterface-doc, flex, python, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, libdb-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), cmake, tdelibs4-trinity-dev, gettext, tdelibs4-trinity-doc, libtqtinterface-doc, flex, python, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, libdb-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: tdevelop-trinity diff --git a/debian/wheezy/tdevelop/debian/rules b/debian/wheezy/tdevelop/debian/rules index 74b304533..95a3981ea 100755 --- a/debian/wheezy/tdevelop/debian/rules +++ b/debian/wheezy/tdevelop/debian/rules @@ -5,6 +5,7 @@ makebuilddir:: [ -f debian/control.tmp ] || cp debian/control debian/control.tmp include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk @@ -16,6 +17,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := tdevelop-trinity DEB_KDE_ENABLE_FINAL := @@ -53,6 +57,20 @@ DEB_CONFIGURE_EXTRA_FLAGS := \ --prefix=/opt/trinity \ --with-extra-libs=/opt/trinity/lib +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_BUILDTOOL_ALL="ON" \ + -DWITH_LANGUAGE_ALL="ON" \ + -DWITH_VCS_ALL="ON" \ + -DQT_DOCDIR="/usr/share/qt3/doc/html" + binary-install/tdevelop-trinity:: mkdir -p debian/tdevelop-trinity/opt/trinity/share/pixmaps cp debian/tdevelop.xpm debian/tdevelop-trinity/opt/trinity/share/pixmaps diff --git a/debian/wheezy/tdevelop/debian/source/options b/debian/wheezy/tdevelop/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/tdevelop/debian/source/options +++ b/debian/wheezy/tdevelop/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 diff --git a/debian/wheezy/tdewebdev/debian/rules b/debian/wheezy/tdewebdev/debian/rules index 5a5ea2fd9..ad4eb9d85 100755 --- a/debian/wheezy/tdewebdev/debian/rules +++ b/debian/wheezy/tdewebdev/debian/rules @@ -28,6 +28,9 @@ endif DEB_DH_STRIP_ARGS := --dbg-package=tdewebdev-trinity-dbg +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + PACKAGES_WITH_LIBS := kommander-trinity #shlibs_ver = 4:3.5.0-1 diff --git a/debian/wheezy/tdewebdev/debian/source/options b/debian/wheezy/tdewebdev/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/debian/wheezy/tdewebdev/debian/source/options +++ b/debian/wheezy/tdewebdev/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 |