From 3d082b0a7744791a2900f2021e50fa62b9c41ca3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 30 Aug 2012 03:00:49 +0200 Subject: Fix kstreamripper FTBFS on Debian and Ubuntu --- ubuntu/maverick/applications/kstreamripper/debian/rules | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'ubuntu/maverick/applications') diff --git a/ubuntu/maverick/applications/kstreamripper/debian/rules b/ubuntu/maverick/applications/kstreamripper/debian/rules index 5a873ce9b..9f641b49a 100755 --- a/ubuntu/maverick/applications/kstreamripper/debian/rules +++ b/ubuntu/maverick/applications/kstreamripper/debian/rules @@ -1,14 +1,14 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -DEB_INSTALL_MANPAGES_kstreamripper:=debian/kstreamripper.1 +#DEB_INSTALL_MANPAGES_kstreamripper-trinity:=debian/kstreamripper.1 PATH := /opt/trinity/bin:$(PATH) -build/kstreamripper:: - env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/tqt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde DESTDIR=$(DEB_DESTDIR)/opt/trinity $(MAKE) +build/kstreamripper-trinity:: + env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/tqt3 $(MAKE) -install/kstreamripper:: - env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/tqt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) install +install/kstreamripper-trinity:: + env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/tqt3 DESTDIR=$(DEB_DESTDIR) $(MAKE) install mkdir -p $(DEB_DESTDIR)/opt/trinity/share/pixmaps/ mkdir -p $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/ install -m 644 ./src/hi32-app-kstreamripper.png \ -- cgit v1.2.1 From 3a9fe8643c50dc700786a29b720a85692f64e211 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 30 Aug 2012 12:50:41 -0500 Subject: Fix gwenview-i18n FTBFS on Debian and Ubuntu --- ubuntu/maverick/applications/gwenview-i18n/debian/control | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'ubuntu/maverick/applications') diff --git a/ubuntu/maverick/applications/gwenview-i18n/debian/control b/ubuntu/maverick/applications/gwenview-i18n/debian/control index 392702700..56f3ee508 100644 --- a/ubuntu/maverick/applications/gwenview-i18n/debian/control +++ b/ubuntu/maverick/applications/gwenview-i18n/debian/control @@ -1,8 +1,8 @@ Source: gwenview-i18n-trinity -Section: kde +Section: tde Priority: optional -Maintainer: Christopher Martin -Build-Depends-Indep: kdelibs4-trinity-dev (>= 4:3.4.3) +Maintainer: Timothy Pearson +Build-Depends-Indep: tdelibs4-trinity-dev Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 6.0.0), quilt, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.0 Homepage: http://gwenview.sourceforge.net @@ -11,7 +11,7 @@ Package: gwenview-i18n-trinity Architecture: all Depends: gwenview-trinity (>= 1.4.2) Replaces: gwenview-trinity (<< 1.4.0-1) -Description: Internationalization (i18n) for Gwenview, an image viewer for KDE +Description: Internationalization (i18n) for Gwenview, an image viewer for TDE This package provides internationalization (i18n) files (translations) for - Gwenview, an image viewer for the K Desktop Environment. See the 'gwenview' + Gwenview, an image viewer for the Trinity Desktop Environment. See the 'gwenview' package description for more information. -- cgit v1.2.1 From 56a080ec706bbe821a66a76310a5bcf72aa60f4f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 30 Aug 2012 12:53:33 -0500 Subject: Fix k3b-i18n FTBFS on Debian and Ubuntu --- ubuntu/maverick/applications/k3b-i18n/debian/control | 7 ++----- ubuntu/maverick/applications/k3b-i18n/debian/rules | 1 - 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'ubuntu/maverick/applications') diff --git a/ubuntu/maverick/applications/k3b-i18n/debian/control b/ubuntu/maverick/applications/k3b-i18n/debian/control index cb9475d6d..507ddcece 100644 --- a/ubuntu/maverick/applications/k3b-i18n/debian/control +++ b/ubuntu/maverick/applications/k3b-i18n/debian/control @@ -1,14 +1,11 @@ Source: k3b-i18n-trinity -Section: otherosfs +Section: tde Priority: optional Maintainer: Timothy Pearson Uploaders: Francois Marier , Fathi Boudra Build-Depends: debhelper (>= 6), quilt, automake, autoconf, libtool, libltdl-dev Build-Depends-Indep: tdelibs4-trinity-dev -Standards-Version: 3.7.3 -Homepage: http://www.k3b.org -Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/k3b-i18n/trunk/ -Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/k3b/trunk/ +Standards-Version: 3.8.3 Package: k3b-i18n-trinity Architecture: all diff --git a/ubuntu/maverick/applications/k3b-i18n/debian/rules b/ubuntu/maverick/applications/k3b-i18n/debian/rules index 108c07633..def409839 100755 --- a/ubuntu/maverick/applications/k3b-i18n/debian/rules +++ b/ubuntu/maverick/applications/k3b-i18n/debian/rules @@ -70,7 +70,6 @@ endif ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif - -find . -name *gmo | xargs rm dh_clean -- cgit v1.2.1 From 55642292818f51e3cfee733f8ee38d30f95880b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 30 Aug 2012 20:24:18 +0200 Subject: Fix tde-style-qtcurve FTBFS on Debian and Ubuntu --- ubuntu/maverick/applications/tde-style-qtcurve/debian/rules | 2 ++ .../tde-style-qtcurve/debian/tde-style-qtcurve-trinity.install | 1 + 2 files changed, 3 insertions(+) create mode 100644 ubuntu/maverick/applications/tde-style-qtcurve/debian/tde-style-qtcurve-trinity.install (limited to 'ubuntu/maverick/applications') diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/rules b/ubuntu/maverick/applications/tde-style-qtcurve/debian/rules index abada8378..c61c340ae 100755 --- a/ubuntu/maverick/applications/tde-style-qtcurve/debian/rules +++ b/ubuntu/maverick/applications/tde-style-qtcurve/debian/rules @@ -1,5 +1,7 @@ #!/usr/bin/make -f +PATH := /opt/trinity/bin:$(PATH) + # Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function # Also include the main Trinity path ifeq ("$(LD_LIBRARY_PATH)", "") diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/tde-style-qtcurve-trinity.install b/ubuntu/maverick/applications/tde-style-qtcurve/debian/tde-style-qtcurve-trinity.install new file mode 100644 index 000000000..003761370 --- /dev/null +++ b/ubuntu/maverick/applications/tde-style-qtcurve/debian/tde-style-qtcurve-trinity.install @@ -0,0 +1 @@ +debian/tmp/opt -- cgit v1.2.1 From 4d86e5015204b881ae64ba42bd17ae923396dd4c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 30 Aug 2012 15:56:19 -0500 Subject: Fix k3b-i18n FTBFS on Debian and Ubuntu --- ubuntu/maverick/applications/k3b-i18n/debian/rules | 3 +++ 1 file changed, 3 insertions(+) (limited to 'ubuntu/maverick/applications') diff --git a/ubuntu/maverick/applications/k3b-i18n/debian/rules b/ubuntu/maverick/applications/k3b-i18n/debian/rules index def409839..9ee44ce14 100755 --- a/ubuntu/maverick/applications/k3b-i18n/debian/rules +++ b/ubuntu/maverick/applications/k3b-i18n/debian/rules @@ -29,6 +29,9 @@ endif config.status: configure dh_testdir +configure: + dh_testdir + # Regenerate build system ! [ -f /usr/share/libtool/ltmain.sh ] || \ cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh -- cgit v1.2.1 From a157fc2b7c19bae23b66a90a2b1f38190b022d3f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 30 Aug 2012 16:53:00 -0500 Subject: Fix yet another k3b-i18n FTBFS on Debian and Ubuntu --- ubuntu/maverick/applications/k3b-i18n/debian/rules | 2 -- 1 file changed, 2 deletions(-) (limited to 'ubuntu/maverick/applications') diff --git a/ubuntu/maverick/applications/k3b-i18n/debian/rules b/ubuntu/maverick/applications/k3b-i18n/debian/rules index 9ee44ce14..2048362b9 100755 --- a/ubuntu/maverick/applications/k3b-i18n/debian/rules +++ b/ubuntu/maverick/applications/k3b-i18n/debian/rules @@ -85,8 +85,6 @@ install: build # Add here commands to install the package into debian/k3b-i18n-trinity. $(MAKE) install DESTDIR=$(CURDIR)/debian/k3b-i18n-trinity mkdir -p $(CURDIR)/debian/k3b-i18n-trinity$(DEB_CONFIGURE_PREFIX)/share/doc/tde/ - mv $(CURDIR)/debian/k3b-i18n-trinity$(DEB_CONFIGURE_PREFIX)/share/doc/HTML $(CURDIR)/debian/k3b-i18n-trinity$(DEB_CONFIGURE_PREFIX)/share/doc/tde/ - # Build architecture-independent files here. binary-indep: build install -- cgit v1.2.1