rev 9277 - branches/kde4/packages trunk/packages trunk/packages/qca trunk/packages/qca/qca2/debian trunk/packages/qca/qca2/debian/patches
Matthew Rosewarne
mukidohime-guest at alioth.debian.org
Mon Feb 4 18:50:57 UTC 2008
Author: mukidohime-guest
Date: 2008-02-04 18:50:57 +0000 (Mon, 04 Feb 2008)
New Revision: 9277
Added:
trunk/packages/qca/
trunk/packages/qca/qca2-plugin-gnupg/
trunk/packages/qca/qca2-plugin-ossl/
trunk/packages/qca/qca2-plugin-pkcs11/
trunk/packages/qca/qca2-plugin-sasl/
trunk/packages/qca/qca2/
trunk/packages/qca/qca2/debian/libqca2-doc.install
trunk/packages/qca/qca2/debian/patches/
trunk/packages/qca/qca2/debian/patches/separate_plugins.diff
trunk/packages/qca/qca2/debian/patches/series
trunk/packages/qca/qca2/debian/watch
Removed:
branches/kde4/packages/qca2-plugin-gnupg/
branches/kde4/packages/qca2-plugin-ossl/
branches/kde4/packages/qca2/
Modified:
trunk/packages/qca/qca2/debian/changelog
trunk/packages/qca/qca2/debian/compat
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:
* moving qca2 to trunk
* replace rules with CDBS+cmake
* patch for cmakelists.txt
* add -doc and -dbg
* compat = 6
* S-V = 3.7.3
* descriptions
* homepage
* watch file
Copied: trunk/packages/qca/qca2 (from rev 9242, branches/kde4/packages/qca2)
Modified: trunk/packages/qca/qca2/debian/changelog
===================================================================
--- branches/kde4/packages/qca2/debian/changelog 2008-02-02 05:15:52 UTC (rev 9242)
+++ trunk/packages/qca/qca2/debian/changelog 2008-02-04 18:50:57 UTC (rev 9277)
@@ -1,8 +1,20 @@
qca2 (2.0.0-4) UNRELEASED; urgency=low
+ +++ Changes by Matthew Rosewarne:
+
+ * Switch rules to CMake with CDBS.
+ * Add patch separate_plugins.diff to ignore non-existant plugins directory.
+ * Create API documentation package.
+ * Create debug package.
+ * Install qmake mkspecs file in libqca2-dev.
+ * Bump compat to 6.
+ * Bump Standards-Version to 3.7.3.
+ * Tweak package descriptions.
* Add Homepage: to control.
+ * Suggest qca2 plugins.
+ * Add watch file.
- -- Matthew Rosewarne <mrosewarne at inoutbox.com> Tue, 08 Jan 2008 12:54:11 -0500
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Mon, 04 Feb 2008 12:25:10 -0500
qca2 (2.0.0-3) unstable; urgency=low
Modified: trunk/packages/qca/qca2/debian/compat
===================================================================
--- branches/kde4/packages/qca2/debian/compat 2008-02-02 05:15:52 UTC (rev 9242)
+++ trunk/packages/qca/qca2/debian/compat 2008-02-04 18:50:57 UTC (rev 9277)
@@ -1 +1 @@
-4
+6
Modified: trunk/packages/qca/qca2/debian/control
===================================================================
--- branches/kde4/packages/qca2/debian/control 2008-02-02 05:15:52 UTC (rev 9242)
+++ trunk/packages/qca/qca2/debian/control 2008-02-04 18:50:57 UTC (rev 9277)
@@ -2,44 +2,61 @@
Priority: optional
Section: libs
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Jan Niehusmann <jan at debian.org>
-Build-Depends: debhelper (>= 4.0.0), libqt4-dev (>= 4.1.0-3), docbook-to-man
+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-Conflicts: qca-dev, libqca2-dev
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
Homepage: http://delta.affinix.com/qca/
+Package: libqca2
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: libqca2-plugin-gnupg, libqca2-plugin-ossl
+Conflicts: libqca2-plugin-gnupg (<< 0.1~20070904-1), libqca2-plugin-ossl (<< 0.1~20070904-1)
+Description: libraries 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.
+
+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
Depends: libqca2 (= ${binary:Version}), libqt4-dev
+Suggests: libqca2-doc (= ${source:Version})
Conflicts: qca-dev
-Description: Qt Cryptographic Architecture - development files
- Taking a hint from the similarly-named Java Cryptography Architecture,
- QCA aims to provide a straightforward and cross-platform crypto API,
- using Qt datatypes and conventions. QCA separates the API from the
- implementation, using plugins known as Providers. The advantage of
- this model is to allow applications to avoid linking to or explicitly
- depending on any particular cryptographic library. This allows one to
- easily change or upgrade crypto implementations without even needing
- to recompile the application!
+Description: development files 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 the files necessary to compile applications
- using qca.
+ This package contains development files for building software that uses the
+ Qt Cryptographic Architecture.
-Package: libqca2
-Section: libs
-Architecture: any
+Package: libqca2-doc
+Section: doc
+Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libqca2-plugin-gnupg (<< 0.1~20070904-1), libqca2-plugin-ossl (<< 0.1~20070904-1)
-Description: Qt Cryptographic Architecture - shared library
- Taking a hint from the similarly-named Java Cryptography Architecture,
- QCA aims to provide a straightforward and cross-platform crypto API,
- using Qt datatypes and conventions. QCA separates the API from the
- implementation, using plugins known as Providers. The advantage of
- this model is to allow applications to avoid linking to or explicitly
- depending on any particular cryptographic library. This allows one to
- easily change or upgrade crypto implementations without even needing
- to recompile the application!
+Recommends: qt4-doc
+Suggests: libqca2-dev (= ${source:Version})
+Description: API documentation 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 the files necessary to run applications
- using qca.
+ This package contains documentation for developers working with the
+ Qt Cryptographic Architecture.
Modified: trunk/packages/qca/qca2/debian/libqca2-dev.install
===================================================================
--- branches/kde4/packages/qca2/debian/libqca2-dev.install 2008-02-02 05:15:52 UTC (rev 9242)
+++ trunk/packages/qca/qca2/debian/libqca2-dev.install 2008-02-04 18:50:57 UTC (rev 9277)
@@ -1,6 +1,4 @@
-usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
-/usr/lib/*.la
-usr/share/qt4/mkspecs/features/crypto.prf
+debian/tmp/usr/include/QtCrypto
+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
Added: trunk/packages/qca/qca2/debian/libqca2-doc.install
===================================================================
--- trunk/packages/qca/qca2/debian/libqca2-doc.install (rev 0)
+++ trunk/packages/qca/qca2/debian/libqca2-doc.install 2008-02-04 18:50:57 UTC (rev 9277)
@@ -0,0 +1,4 @@
+apidocs/html/*.css usr/share/doc/libqca2-doc/html/
+apidocs/html/*.gif usr/share/doc/libqca2-doc/html/
+apidocs/html/*.html usr/share/doc/libqca2-doc/html/
+apidocs/html/*.png usr/share/doc/libqca2-doc/html/
Modified: trunk/packages/qca/qca2/debian/libqca2.install
===================================================================
--- branches/kde4/packages/qca2/debian/libqca2.install 2008-02-02 05:15:52 UTC (rev 9242)
+++ trunk/packages/qca/qca2/debian/libqca2.install 2008-02-04 18:50:57 UTC (rev 9277)
@@ -1,3 +1,3 @@
-usr/lib/lib*.so.*[0-9]
-usr/bin/qcatool2
-
+debian/tmp/usr/lib/libqca.so.2
+debian/tmp/usr/lib/libqca.so.2.0.0
+debian/tmp/usr/bin/qcatool2
Added: trunk/packages/qca/qca2/debian/patches/separate_plugins.diff
===================================================================
--- trunk/packages/qca/qca2/debian/patches/separate_plugins.diff (rev 0)
+++ trunk/packages/qca/qca2/debian/patches/separate_plugins.diff 2008-02-04 18:50:57 UTC (rev 9277)
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -131,7 +131,7 @@
+
+ add_subdirectory(src)
+ add_subdirectory(tools)
+-add_subdirectory(plugins)
++#add_subdirectory(plugins)
+ if(BUILD_TESTS)
+ ENABLE_TESTING()
+ add_subdirectory(unittest)
Added: trunk/packages/qca/qca2/debian/patches/series
===================================================================
--- trunk/packages/qca/qca2/debian/patches/series (rev 0)
+++ trunk/packages/qca/qca2/debian/patches/series 2008-02-04 18:50:57 UTC (rev 9277)
@@ -0,0 +1 @@
+separate_plugins.diff
Modified: trunk/packages/qca/qca2/debian/rules
===================================================================
--- branches/kde4/packages/qca2/debian/rules 2008-02-02 05:15:52 UTC (rev 9242)
+++ trunk/packages/qca/qca2/debian/rules 2008-02-04 18:50:57 UTC (rev 9277)
@@ -1,123 +1,14 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+
+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
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+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"
-
-# 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)}'`
-
-config.status: configure
- dh_testdir
- # add here commands to configure the package.
- cflags="$(cflags)" ./configure --prefix=/usr --qtdir=/usr/share/qt4/ --disable-tests
-
-build: build-stamp
-build-stamp: config.status
- dh_testdir
-
- # add here commands to compile the package.
- $(MAKE)
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- # add here commands to clean up after the build process.
- [ ! -f Makefile ] || $(MAKE) distclean
- -rm confapp_unix.pri
- -rm conf.log
- -rm conf.pri
- -rm crypto.prf
- -rm lib/libqca.prl
- -rm lib/libqca.so.2.0.0
- -rm lib/qca2.pc
- -rmdir lib
- -rm makefile
- -rm qca2.pc
-
-#ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-# cp -f /usr/share/misc/config.sub config.sub
-#endif
-#ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-# cp -f /usr/share/misc/config.guess config.guess
-#endif
-
- 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_ROOT="`pwd`/debian/tmp/" install
-
-
-# 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
+build/libqca2-doc::
+ $(CURDIR)/apidocs/html/installdox -q -lqt.tag@/usr/share/qt4/doc/html $(CURDIR)/apidocs/html/*.html
Added: trunk/packages/qca/qca2/debian/watch
===================================================================
--- trunk/packages/qca/qca2/debian/watch (rev 0)
+++ trunk/packages/qca/qca2/debian/watch 2008-02-04 18:50:57 UTC (rev 9277)
@@ -0,0 +1,3 @@
+version=3
+
+http://delta.affinix.com/download/qca/2.0/qca-(.*).tar\.bz2
Copied: trunk/packages/qca/qca2-plugin-gnupg (from rev 9242, branches/kde4/packages/qca2-plugin-gnupg)
Copied: trunk/packages/qca/qca2-plugin-ossl (from rev 9242, branches/kde4/packages/qca2-plugin-ossl)
More information about the pkg-kde-commits
mailing list