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

11 files changed, 204 insertions, 2 deletions

diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/control b/ubuntu/maverick/dependencies/python-tqt/debian/control
index c0d48d37a..9354c760b 100644
--- a/ubuntu/maverick/dependencies/python-tqt/debian/control
+++ b/ubuntu/maverick/dependencies/python-tqt/debian/control
@@ -4,13 +4,13 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
 Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org>
-Build-Depends: debhelper (>= 6.0.7~), python-all-dev (>= 2.3.5-10), libtqt-mt-dev (>= 3:3.3.4-4), tqt-dev-tools (>= 3:3.3.4-4), tqt-apps-dev (>= 3:3.3.4-4), python-sip-dev (>= 4.10.0-2ubuntu1), libqscintilla-dev (>= 1.7), python-support (>= 0.7.1), python-sip-dbg, python-all-dbg
+Build-Depends: debhelper (>= 6.0.7~), python-all-dev (>= 2.3.5-10), libtqt3-mt-dev (>= 3:3.3.4-4), tqt3-dev-tools (>= 3:3.3.4-4), tqt3-apps-dev (>= 3:3.3.4-4), python-sip-dev (>= 4.10.0-2ubuntu1), libqscintilla-dev (>= 1.7), python-support (>= 0.7.1), python-sip-dbg, python-all-dbg
 Standards-Version: 3.8.4
 
 Package: python-tqt
 Architecture: any
 Depends: ${shlibs:Depends}, ${python:Depends}, ${sip:Depends}, ${misc:Depends}
-Suggests: python-tqt-gl, python-tqt-doc, libtqt-mt-mysql|libtqt-mt-odbc|libtqt-mt-psql
+Suggests: python-tqt-gl, python-tqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql
 Provides: ${python:Provides}
 Description: TQt bindings for Python
  Python binding module that allows use of TQt X Window toolkit v3.
diff --git a/ubuntu/maverick/dependencies/tqscintilla/debian/changelog b/ubuntu/maverick/dependencies/tqscintilla/debian/changelog
new file mode 100644
index 000000000..bf84dfd0f
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqscintilla/debian/changelog
@@ -0,0 +1,5 @@
+tqscintilla (1.7.1-0ubuntu0) lucid; urgency=low
+
+  * Initial TQt builds
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 30 Nov 2011 11:40:00 -0600
diff --git a/ubuntu/maverick/dependencies/tqscintilla/debian/compat b/ubuntu/maverick/dependencies/tqscintilla/debian/compat
new file mode 100644
index 000000000..7ed6ff82d
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqscintilla/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/ubuntu/maverick/dependencies/tqscintilla/debian/control b/ubuntu/maverick/dependencies/tqscintilla/debian/control
new file mode 100644
index 000000000..b6651b56b
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqscintilla/debian/control
@@ -0,0 +1,42 @@
+Source: tqscintilla
+Section: libs
+Priority: optional
+Maintainer: Ricardo Javier Cardenes Medina <rcardenes@debian.org>
+Uploaders: Torsten Marek <shlomme@debian.org>
+Build-Depends: debhelper (>> 5.0.0), libtqt3-mt-dev, tqt3-dev-tools
+Standards-Version: 3.7.2
+
+Package: libtqscintilla7
+Section: libs
+Architecture: any
+Replaces: libtqscintilla6
+Depends: ${shlibs:Depends}
+Description: TQt source code editing component based on Scintilla
+ Scintilla is a free source code editing component. It has features found
+ in standard editing components, as well as features especially useful
+ when editing and debugging source code.
+ .
+ TQScintilla is a port or Scintilla to the TQt GUI toolkit.
+
+Package: libtqscintilla-dev
+Section: libdevel
+Architecture: all
+Depends: libtqscintilla7 (>= ${source:Version})
+Description: TQt source code editing component - development files
+ Scintilla is a free source code editing component. It has features found
+ in standard editing components, as well as features especially useful
+ when editing and debugging source code.
+ .
+ TQScintilla is a port of Scintilla to the TQt GUI toolkit. These are the
+ development files (headers and static libs).
+
+Package: libtqscintilla-doc
+Section: doc
+Architecture: all
+Suggests: libtqscintilla-dev
+Description: TQt source code editing component - documentation
+ Scintilla is a free source code editing component. It has features found
+ in standard editing components, as well as features especially useful
+ when editing and debugging source code.
+ .
+ This package contain HTML files describing TQScintilla classes.
diff --git a/ubuntu/maverick/dependencies/tqscintilla/debian/copyright b/ubuntu/maverick/dependencies/tqscintilla/debian/copyright
new file mode 100644
index 000000000..445a8ff70
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqscintilla/debian/copyright
@@ -0,0 +1,39 @@
+This package was debianized by Ricardo Javier Cardenes Medina <rcardenes@debian.org> on
+Sun, 24 Nov 2002 05:09:21 +0000.
+
+It was downloaded from http://www.riverbankcomputing.co.uk
+
+Upstream Authors:
+
+  Scintilla:  Neil Hodgson <neilh@scintilla.org>
+  QScintilla: Phil Thompson <phil@riverbankcomputing.co.uk>
+
+Copyright:
+
+ Copyright 2005 by Riverbank Computing Limited <info@riverbankcomputing.co.uk>
+
+QScintilla is released under GPL version 2, or (at your option) any later
+version. You can read the full version of this license in your system at
+
+  /usr/share/common-licenses/GPL-2
+
+Scintilla comes with this license:
+
+ Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
+
+ All Rights Reserved
+
+ Permission to use, copy, modify, and distribute this software and its
+ documentation for any purpose and without fee is hereby granted,
+ provided that the above copyright notice appear in all copies and that
+ both that copyright notice and this permission notice appear in
+ supporting documentation.
+
+ NEIL HODGSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS, IN NO EVENT SHALL NEIL HODGSON BE LIABLE FOR ANY
+ SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
+ OR PERFORMANCE OF THIS SOFTWARE."
diff --git a/ubuntu/maverick/dependencies/tqscintilla/debian/dirs b/ubuntu/maverick/dependencies/tqscintilla/debian/dirs
new file mode 100644
index 000000000..ca882bbb7
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqscintilla/debian/dirs
@@ -0,0 +1,2 @@
+usr/bin
+usr/sbin
diff --git a/ubuntu/maverick/dependencies/tqscintilla/debian/docs b/ubuntu/maverick/dependencies/tqscintilla/debian/docs
new file mode 100644
index 000000000..edc007104
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqscintilla/debian/docs
@@ -0,0 +1 @@
+NEWS
diff --git a/ubuntu/maverick/dependencies/tqscintilla/debian/libtqscintilla-dev.install b/ubuntu/maverick/dependencies/tqscintilla/debian/libtqscintilla-dev.install
new file mode 100644
index 000000000..e183cf963
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqscintilla/debian/libtqscintilla-dev.install
@@ -0,0 +1,2 @@
+usr/include
+usr/lib/*.so
diff --git a/ubuntu/maverick/dependencies/tqscintilla/debian/libtqscintilla-doc.install b/ubuntu/maverick/dependencies/tqscintilla/debian/libtqscintilla-doc.install
new file mode 100644
index 000000000..37ac20176
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqscintilla/debian/libtqscintilla-doc.install
@@ -0,0 +1 @@
+usr/share/doc/libqscintilla-doc
diff --git a/ubuntu/maverick/dependencies/tqscintilla/debian/libtqscintilla7.install b/ubuntu/maverick/dependencies/tqscintilla/debian/libtqscintilla7.install
new file mode 100644
index 000000000..9497944d7
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqscintilla/debian/libtqscintilla7.install
@@ -0,0 +1,3 @@
+usr/lib/*.so.*
+usr/lib/qt3/plugins/designer/*.so
+usr/share/qt3/translations/*.qm
diff --git a/ubuntu/maverick/dependencies/tqscintilla/debian/rules b/ubuntu/maverick/dependencies/tqscintilla/debian/rules
new file mode 100755
index 000000000..36df66cc9
--- /dev/null
+++ b/ubuntu/maverick/dependencies/tqscintilla/debian/rules
@@ -0,0 +1,106 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This is the debhelper compatibility version to use.
+export QTDIR=/usr/share/tqt3
+export QMAKESPEC=$(QTDIR)/mkspecs/linux-g++
+DOCDEST=$(CURDIR)/debian/tmp/usr/share/doc/libtqscintilla-doc/html
+HEADERDEST=$(CURDIR)/debian/tmp/usr/include/tqscintilla
+LIBSDEST=$(CURDIR)/debian/tmp/usr/lib
+TRANSDEST=$(CURDIR)/debian/tmp/$(QTDIR)/translations
+PLUGINDEST=$(CURDIR)/debian/tmp/usr/lib/tqt3/plugins/designer
+
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -g
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	cd qt; qmake "DESTDIR=$(CURDIR)/tmplib"
+	cd designer; qmake
+	touch configure-stamp
+
+
+build: build-stamp
+build-stamp: configure-stamp 
+	dh_testdir
+
+	install -d $(CURDIR)/tmplib
+	$(MAKE) -C qt
+	$(MAKE) -C designer
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+
+	[ ! -f qt/Makefile ] || $(MAKE) -C qt clean
+	[ ! -f designer/Makefile ] || $(MAKE) -C designer clean
+	-find -name 'Makefile' -exec rm {} \;
+	-rm -rf tmplib
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	install -d $(HEADERDEST)/private
+	install -d $(DOCDEST)
+	install -d $(TRANSDEST)
+	install -d $(LIBSDEST)
+	install -d $(PLUGINDEST)
+	for i in qt/qextscintilla*.h; do install -m 644 $$i $(HEADERDEST); done
+	for i in include/*.h; do install -m 644 $$i $(HEADERDEST)/private; done
+	for i in doc/html/*; do install -m 644 $$i $(DOCDEST); done
+	for i in qt/*.qm; do install -m 644 $$i $(TRANSDEST); done
+	mv designer/*.so $(PLUGINDEST)
+	for i in tmplib/*; do mv $$i $(LIBSDEST); done
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_testdir -i
+	dh_testroot -i
+	dh_install -i --sourcedir=$(CURDIR)/debian/tmp
+	dh_installdocs -i
+	dh_installchangelogs -i ChangeLog
+	dh_link -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir -a
+	dh_testroot -a
+	dh_install -a --sourcedir=$(CURDIR)/debian/tmp
+	dh_installdocs -a
+	dh_installchangelogs -a ChangeLog
+	dh_link -a
+	dh_strip -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_makeshlibs -a -V
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure