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

6 files changed, 18 insertions, 18 deletions

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 <chrsmrtn@debian.org>
-Build-Depends-Indep: kdelibs4-trinity-dev (>= 4:3.4.3)
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+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.
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 <kb9vqf@pearsoncomputing.net>
 Uploaders: Francois Marier <francois@debian.org>, Fathi Boudra <fabo@debian.org>
 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..2048362b9 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
@@ -70,7 +73,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
 
@@ -83,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
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 \
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