rev 9313 - trunk/packages/qca/qca2/debian

[Matthew Rosewarne]

Author: mukidohime-guest
Date: 2008-02-06 10:05:58 +0000 (Wed, 06 Feb 2008)
New Revision: 9313

Removed:
   trunk/packages/qca/qca2/debian/patches/
Modified:
   trunk/packages/qca/qca2/debian/changelog
   trunk/packages/qca/qca2/debian/control
   trunk/packages/qca/qca2/debian/libqca2-dev.install
   trunk/packages/qca/qca2/debian/libqca2.install
   trunk/packages/qca/qca2/debian/rules
Log:
"Life swings like a pendulum backward and forward between pain and boredom, so Use QConf."
* Re-rewrite rules, this time using the official QConf build system instead of CMake

* axe -dbg for now...
* still a lintian warning about an old FSF address


Modified: trunk/packages/qca/qca2/debian/changelog
===================================================================
--- trunk/packages/qca/qca2/debian/changelog	2008-02-06 09:29:12 UTC (rev 9312)
+++ trunk/packages/qca/qca2/debian/changelog	2008-02-06 10:05:58 UTC (rev 9313)
@@ -2,11 +2,9 @@
 
   +++ Changes by Matthew Rosewarne:
 
-  * Switch rules to CMake with CDBS.
-  * Add patch separate_plugins.diff to ignore non-existant plugins directory.
+  * Switch rules to CDBS.
   * Create API documentation package.
-  * Create debug package.
-  * Install qmake mkspecs file in libqca2-dev.
+  * Install qmake data files in libqca2-dev.
   * Bump compat to 6.
   * Bump Standards-Version to 3.7.3.
   * Tweak package descriptions.
@@ -14,7 +12,7 @@
   * Suggest qca2 plugins.
   * Add watch file.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 04 Feb 2008 12:25:10 -0500
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 06 Feb 2008 02:43:55 -0500
 
 qca2 (2.0.0-3) unstable; urgency=low
 

Modified: trunk/packages/qca/qca2/debian/control
===================================================================
--- trunk/packages/qca/qca2/debian/control	2008-02-06 09:29:12 UTC (rev 9312)
+++ trunk/packages/qca/qca2/debian/control	2008-02-06 10:05:58 UTC (rev 9313)
@@ -3,8 +3,8 @@
 Section: libs
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Jan Niehusmann <jan at debian.org>, Matthew Rosewarne <mrosewarne at inoutbox.com>
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6.0.0), quilt, cmake,
- libqt4-dev (>= 4.1.0-3), docbook-to-man
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6.0.0), quilt, cmake, libqt4-dev,
+ ca-certificates
 Build-Conflicts: qca-dev, libqca2-dev
 Standards-Version: 3.7.3
 Homepage: http://delta.affinix.com/qca/
@@ -20,19 +20,6 @@
  platform API for a range of cryptographic features, including SSL/TLS,
  X.509 certificates, SASL, OpenPGP, S/MIME CMS, and smart cards.
 
-Package: libqca2-dbg
-Section: libdevel
-Architecture: any
-Depends: libqca2 (= ${binary:Version})
-Recommends: libqt4-debug
-Description: debugging symbols for the Qt Cryptographic Architecture
- The Qt Cryptographic Architecture provides a straightforward and cross-
- platform API for a range of cryptographic features, including SSL/TLS,
- X.509 certificates, SASL, OpenPGP, S/MIME CMS, and smart cards.
- .
- This package contains debugging files used to investigate problems with
- binaries included in the Qt Cryptographic Architecture packages.
-
 Package: libqca2-dev
 Section: libdevel
 Architecture: any

Modified: trunk/packages/qca/qca2/debian/libqca2-dev.install
===================================================================
--- trunk/packages/qca/qca2/debian/libqca2-dev.install	2008-02-06 09:29:12 UTC (rev 9312)
+++ trunk/packages/qca/qca2/debian/libqca2-dev.install	2008-02-06 10:05:58 UTC (rev 9313)
@@ -1,4 +1,5 @@
 debian/tmp/usr/include/QtCrypto
+debian/tmp/usr/lib/libqca.prl
 debian/tmp/usr/lib/libqca.so
-debian/tmp/usr/lib/pkgconfig/qca.pc
-debian/tmp/usr/mkspecs/features/crypto.prf usr/share/qt4/mkspecs/features/crypto.prf
+debian/tmp/usr/lib/pkgconfig/qca2.pc
+debian/tmp/usr/share/qt4/mkspecs/features/crypto.prf

Modified: trunk/packages/qca/qca2/debian/libqca2.install
===================================================================
--- trunk/packages/qca/qca2/debian/libqca2.install	2008-02-06 09:29:12 UTC (rev 9312)
+++ trunk/packages/qca/qca2/debian/libqca2.install	2008-02-06 10:05:58 UTC (rev 9313)
@@ -1,3 +1,4 @@
 debian/tmp/usr/lib/libqca.so.2
+debian/tmp/usr/lib/libqca.so.2.0
 debian/tmp/usr/lib/libqca.so.2.0.0
 debian/tmp/usr/bin/qcatool2

Modified: trunk/packages/qca/qca2/debian/rules
===================================================================
--- trunk/packages/qca/qca2/debian/rules	2008-02-06 09:29:12 UTC (rev 9312)
+++ trunk/packages/qca/qca2/debian/rules	2008-02-06 10:05:58 UTC (rev 9313)
@@ -1,14 +1,25 @@
 #!/usr/bin/make -f
   
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/class/makefile.mk
 
-DEB_CMAKE_EXTRA_FLAGS += -DBUILD_TESTS:BOOL=OFF \
-			-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
-			-DCMAKE_MODULE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
-			-DCMAKE_EXE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed"
+# QMake targets
+DEB_MAKE_INSTALL_TARGET = install INSTALL_ROOT=$(DEB_DESTDIR)
+DEB_MAKE_CLEAN_TARGET = distclean
 
+# QConf breaks with CDBS default DEB_MAKE_INVOKE
+DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) make -C $(DEB_BUILDDIR)
+
+# QConf configure script
+# DEB_BUILD_OPTIONS is not supported!
+common-configure-arch::
+	./configure --prefix=/usr --qtdir=/usr/share/qt4 --disable-tests
+
+# Clean up QConf
+clean::
+	rm -rf confapp_unix.pri conf.log conf.pri crypto.prf lib/
+
+# Point links in API documentation towards qt4-doc
 build/libqca2-doc::
 	$(CURDIR)/apidocs/html/installdox -q -lqt.tag@/usr/share/qt4/doc/html $(CURDIR)/apidocs/html/*.html