rev 7357 - branches/kde4/packages/qca2/debian

[Jan Niehusmann]

Author: jan
Date: 2007-10-07 15:11:07 +0000 (Sun, 07 Oct 2007)
New Revision: 7357

Modified:
   branches/kde4/packages/qca2/debian/changelog
   branches/kde4/packages/qca2/debian/control
   branches/kde4/packages/qca2/debian/rules
Log:
New upstream version of qca2


Modified: branches/kde4/packages/qca2/debian/changelog
===================================================================
--- branches/kde4/packages/qca2/debian/changelog	2007-10-07 10:10:21 UTC (rev 7356)
+++ branches/kde4/packages/qca2/debian/changelog	2007-10-07 15:11:07 UTC (rev 7357)
@@ -1,3 +1,12 @@
+qca2 (2.0.0-1) experimental; urgency=low
+
+  * New upstream release
+  * Remove the bogous dependency on libxss-dev. This should have gone to psi,
+    not qca2
+  * libqca2-dev now depends on libqt4-dev (Closes: Bug#441264, Bug#441266)
+
+ -- Jan Niehusmann <jan at debian.org>  Sun, 07 Oct 2007 15:02:41 +0200
+
 qca2 (2.0.0~beta7-3) experimental; urgency=low
 
   * updated debian/copyright to mention all copyright holders and licenses

Modified: branches/kde4/packages/qca2/debian/control
===================================================================
--- branches/kde4/packages/qca2/debian/control	2007-10-07 10:10:21 UTC (rev 7356)
+++ branches/kde4/packages/qca2/debian/control	2007-10-07 15:11:07 UTC (rev 7357)
@@ -3,14 +3,14 @@
 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), libxss-dev, docbook-to-man
+Build-Depends: debhelper (>= 4.0.0), libqt4-dev (>= 4.1.0-3), docbook-to-man
 Build-Conflicts: qca-dev, libqca2-dev
 Standards-Version: 3.7.2
 
 Package: libqca2-dev
 Section: libdevel
 Architecture: any
-Depends: libqca2 (= ${binary:Version})
+Depends: libqca2 (= ${binary:Version}), libqt4-dev
 Conflicts: qca-dev
 Description: Qt Cryptographic Architecture - development files
  Taking a hint from the similarly-named Java Cryptography Architecture,
@@ -29,6 +29,7 @@
 Section: libs
 Architecture: any
 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,

Modified: branches/kde4/packages/qca2/debian/rules
===================================================================
--- branches/kde4/packages/qca2/debian/rules	2007-10-07 10:10:21 UTC (rev 7356)
+++ branches/kde4/packages/qca2/debian/rules	2007-10-07 15:11:07 UTC (rev 7357)
@@ -45,8 +45,6 @@
 	# add here commands to compile the package.
 	$(MAKE)
 
-	docbook-to-man man/qcatool.docbook > man/qcatool2.1
-
 	touch build-stamp
 
 clean:
@@ -66,7 +64,6 @@
 	-rmdir lib
 	-rm makefile
 	-rm qca2.pc
-	-rm man/qcatool2.1
 
 #ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 #	cp -f /usr/share/misc/config.sub config.sub