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

9 files changed, 242 insertions, 2 deletions

diff --git a/debian/squeeze/dependencies/tqca-tls/debian/changelog b/debian/squeeze/dependencies/tqca-tls/debian/changelog
new file mode 100644
index 000000000..080b12959
--- /dev/null
+++ b/debian/squeeze/dependencies/tqca-tls/debian/changelog
@@ -0,0 +1,84 @@
+tqca-tls (1.0-0) squeeze; urgency=low
+
+  * TQt upload
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 17 Dec 2011 19:48:00 -0600
+
+qca-tls (1.0-5) natty; urgency=low
+
+  * Natty upload
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 15 Aug 2011 13:51:00 -0600
+
+qca-tls (1.0-4) unstable; urgency=low
+
+  * Honour DEB_BUILD_OPTIONS=nostrip (Closes: Bug#437850)
+  * Fixed a intian warning
+
+ -- Jan Niehusmann <jan@debian.org>  Tue, 14 Aug 2007 17:13:06 +0200
+
+qca-tls (1.0-3) unstable; urgency=low
+
+  * Changed two type conversions to const to make gcc happy
+    (Closes: Bug#337449)
+  * Set Standards-Version to 3.6.2.0
+
+ -- Jan Niehusmann <jan@debian.org>  Thu, 15 Dec 2005 22:59:09 +0100
+
+qca-tls (1.0-2) unstable; urgency=low
+
+  * Recompiled for C++ ABI transition.
+
+ -- Jan Niehusmann <jan@debian.org>  Fri, 26 Aug 2005 18:10:30 +0000
+
+qca-tls (1.0-1) unstable; urgency=low
+
+  * Most of the following changes were done by Peter Palfrader
+    <weasel@debian.org> - many thanks to him!
+  * New upstream version (closes: #235093).
+  * qca-tls is a non-native package now (closes: #235084).
+  * Clean up properly in clean target:
+    rm -rf .ui .moc .obj Makefile conf.log conf.pri extra.pri
+    (closes: #235089).
+  * Do not copy over config.{sub,guess} from /usr/share during
+    build.  They are not needed at all (closes: #235085).
+  * Remove debian/qca.doc-base.EX example file (closes: #235092).
+  * Do not ship readme in the binary package:  it's just install
+    instructions (closes: #234939).
+  * Something changed that makes the configure script make the
+    Makefile install the .so into usr/lib, as opposed to usr/share
+    (closes: #233530).  At any rate, we will not claim to have
+    built a working package if it happens again:
+  * Make the build fail if we don't have a
+    usr/lib/qt3/plugins/crypto/libqca-tls.so file after install.
+  * Make stamps in debian/rules actually work.
+  * Update copyright file to list current download link
+  * Added QMAKE_PROJECT_DEPTH=0 to .pro file to make qca-tls build in
+    nested directory structures.
+
+ -- Jan Niehusmann <jan@debian.org>  Sat, 28 Feb 2004 13:35:28 +0100
+
+qca-tls (0.0-CVS-20031209-1.3) unstable; urgency=low
+
+  * Damn. Added build-depends on libssl-dev...
+
+ -- Jan Niehusmann <jan@debian.org>  Fri, 13 Feb 2004 15:06:45 +0100
+
+qca-tls (0.0-CVS-20031209-1.2) unstable; urgency=low
+
+  * Added build-depends on libqt3-mt-dev
+
+ -- Jan Niehusmann <jan@debian.org>  Fri, 13 Feb 2004 13:27:34 +0100
+
+qca-tls (0.0-CVS-20031209-1.1) unstable; urgency=low
+
+  * Upload to unstable
+
+ -- Jan Niehusmann <jan@debian.org>  Thu, 12 Feb 2004 20:28:19 +0100
+
+qca-tls (0.0-CVS-20031209-1) experimental; urgency=low
+
+  * Initial Release.
+  * New upstream version
+
+ -- Jan Niehusmann <jan@debian.org>  Wed, 10 Dec 2003 12:21:07 +0100
diff --git a/debian/squeeze/dependencies/tqca-tls/debian/compat b/debian/squeeze/dependencies/tqca-tls/debian/compat
new file mode 100644
index 000000000..b8626c4cf
--- /dev/null
+++ b/debian/squeeze/dependencies/tqca-tls/debian/compat
@@ -0,0 +1 @@
+4
diff --git a/debian/squeeze/dependencies/tqca-tls/debian/control b/debian/squeeze/dependencies/tqca-tls/debian/control
new file mode 100644
index 000000000..844290974
--- /dev/null
+++ b/debian/squeeze/dependencies/tqca-tls/debian/control
@@ -0,0 +1,21 @@
+Source: tqca-tls
+Section: libs
+Priority: optional
+Maintainer: Jan Niehusmann <jan@debian.org>
+Build-Depends: debhelper (>= 4.0.0), libtqtinterface-dev, libssl-dev
+Standards-Version: 3.8.4
+
+Package: tqca-tls
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: TLS plugin for the TQt Cryptographic Architecture (TQCA)
+ This is a plugin to provide SSL/TLS capability to programs that
+ utilize the TQt Cryptographic Architecture (TQCA).
+ .
+ TQCA is a library providing an easy API for several cryptographic algorithms 
+ to TQt programs.
+ .
+ At the moment only the tqca-tls plugin is packaged for debian, as it's
+ used by the package 'psi'. The generic library and several other plugins
+ will be packaged when upstream releases them.
diff --git a/debian/squeeze/dependencies/tqca-tls/debian/copyright b/debian/squeeze/dependencies/tqca-tls/debian/copyright
new file mode 100644
index 000000000..e64397c08
--- /dev/null
+++ b/debian/squeeze/dependencies/tqca-tls/debian/copyright
@@ -0,0 +1,20 @@
+This package was debianized by Jan Niehusmann <jan@debian.org> on
+Tue,  9 Dec 2003 19:30:45 +0100.
+
+It was downloaded from http://psi.affinix.com/?page=download
+
+
+Upstream Author: Justin Karneges <justin-psi@affinix.com>
+
+Copyright: 
+
+Copyright (C) 2003  Justin Karneges
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+On Debian systems, the complete text of the GNU Lesser General Public
+License can be found in /usr/share/common-licenses/LGPL file.
+
diff --git a/debian/squeeze/dependencies/tqca-tls/debian/dirs b/debian/squeeze/dependencies/tqca-tls/debian/dirs
new file mode 100644
index 000000000..ca882bbb7
--- /dev/null
+++ b/debian/squeeze/dependencies/tqca-tls/debian/dirs
@@ -0,0 +1,2 @@
+usr/bin
+usr/sbin
diff --git a/debian/squeeze/dependencies/tqca-tls/debian/docs b/debian/squeeze/dependencies/tqca-tls/debian/docs
new file mode 100644
index 000000000..e845566c0
--- /dev/null
+++ b/debian/squeeze/dependencies/tqca-tls/debian/docs
@@ -0,0 +1 @@
+README
diff --git a/debian/squeeze/dependencies/tqca-tls/debian/rules b/debian/squeeze/dependencies/tqca-tls/debian/rules
new file mode 100755
index 000000000..4ffaf90dc
--- /dev/null
+++ b/debian/squeeze/dependencies/tqca-tls/debian/rules
@@ -0,0 +1,110 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# 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
+
+
+# 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)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
+
+# shared library versions, option 1
+version=2.0.5
+major=2
+# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
+#version=`ls src/.libs/lib*.so.* | \
+# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
+#major=`ls src/.libs/lib*.so.* | \
+# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	# Add here commands to configure the package.
+	CFLAGS="$(CFLAGS)" ./configure
+	touch configure-stamp
+
+build: configure-stamp build-stamp
+build-stamp:
+	dh_testdir
+
+	# Add here commands to compile the package.
+	$(MAKE)
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+
+	# Add here commands to clean up after the build process.
+	[ ! -f Makefile ] || $(MAKE) distclean
+	rm -rf .ui .moc .obj Makefile conf.log conf.pri extra.pri
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	# Add here commands to install the package into debian/tmp
+	$(MAKE) install INSTALL_ROOT=$(CURDIR)/debian/tmp/
+	[ -e $(CURDIR)/debian/tmp/usr/lib/tqt3/plugins/crypto/libqca-tls.so ] || ( echo "libqca-tls.so not in usr/lib/tqt3/plugins/crypto/libqca-tls.so" && exit 1 )
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs
+	dh_installdocs
+	dh_installexamples
+	dh_install --sourcedir=debian/tmp --list-missing
+#	dh_installmenu
+#	dh_installdebconf
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+#	dh_perl
+#	dh_python
+#	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
diff --git a/debian/squeeze/dependencies/tqca-tls/debian/tqca-tls.install b/debian/squeeze/dependencies/tqca-tls/debian/tqca-tls.install
new file mode 100644
index 000000000..d165ec389
--- /dev/null
+++ b/debian/squeeze/dependencies/tqca-tls/debian/tqca-tls.install
@@ -0,0 +1 @@
+usr/lib/tqt3/plugins/crypto/*
diff --git a/debian/squeeze/dependencies/tqt3/debian/control b/debian/squeeze/dependencies/tqt3/debian/control
index 2d2668e54..2bd245709 100644
--- a/debian/squeeze/dependencies/tqt3/debian/control
+++ b/debian/squeeze/dependencies/tqt3/debian/control
@@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1-
  libxrandr-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4),
  libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4),
  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,
+ 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, libiodbc2-dev (>= 3.51.2-4),
  libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcups2-dev,
@@ -91,7 +91,7 @@ Depends: libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4),
  libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4),
  libice-dev (>= 4.3.0.dfsg.1-4), 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),
+ libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg-dev, libmng-dev (>= 1.0.3),
  libpng12-dev | libpng12-0-dev, libfontconfig1-dev, libfreetype6-dev,
  libxft-dev, libaudio-dev, libcups2-dev, libgl1-mesa-dev | libgl-dev,
  libglu1-mesa-dev | libglu-dev, libc6-dev, libtqt3-mt (= ${binary:Version}),