rev 6927 - branches/kde4/packages/qca/debian

Jan Niehusmann jan at alioth.debian.org
Thu Aug 2 18:07:15 UTC 2007 

Author: jan
Date: 2007-08-02 18:07:15 +0000 (Thu, 02 Aug 2007)
New Revision: 6927

Modified:
   branches/kde4/packages/qca/debian/
   branches/kde4/packages/qca/debian/changelog
   branches/kde4/packages/qca/debian/control
   branches/kde4/packages/qca/debian/libqca2-dev.install
   branches/kde4/packages/qca/debian/libqca2.install
   branches/kde4/packages/qca/debian/libqca2.manpages
   branches/kde4/packages/qca/debian/rules
Log:
Updated to current upstream version (beta7)
Reverted packaging changes by Sune, because qca didn't compile correctly with 
cmake and upstream told me to use ./configure instead



Property changes on: branches/kde4/packages/qca/debian
___________________________________________________________________
Name: svn:externals
   - cdbs svn://svn.debian.org/pkg-kde/branches/kde4/cdbs/


   + 


Modified: branches/kde4/packages/qca/debian/changelog
===================================================================
--- branches/kde4/packages/qca/debian/changelog	2007-08-02 17:43:47 UTC (rev 6926)
+++ branches/kde4/packages/qca/debian/changelog	2007-08-02 18:07:15 UTC (rev 6927)
@@ -1,12 +1,16 @@
-qca (2.0~beta2+svn20070527-1) experimental; urgency=low
+qca (2.0.0~beta7-1) experimental; urgency=low
 
-  * New upstream snapshot.
-  * Update build-dependencies.
-  * Convert rules file to use the build system as used in kde4 packages,
+  * New upstream release
+  * Some packaging cleanups (fixed lintian warnings etc.)
+  * Added libxss-dev build dependency (like Ubuntu did a while ago)
+  * removed libqt4-debug-dev from Build-Depends (Closes: Bug#407802, Bug#432619)
+ 
+  And a few changes by Sune Vuorela:
+
   * Add manpage for qcatool.
   * Remove obsolete dirs files.
 
- -- Sune Vuorela <debian at pusling.com>  Sun, 27 May 2007 21:15:09 +0200
+ -- Jan Niehusmann <jan at debian.org>  Tue, 24 Jul 2007 16:35:39 +0200
 
 qca (2.0~beta2-1) experimental; urgency=low
 

Modified: branches/kde4/packages/qca/debian/control
===================================================================
--- branches/kde4/packages/qca/debian/control	2007-08-02 17:43:47 UTC (rev 6926)
+++ branches/kde4/packages/qca/debian/control	2007-08-02 18:07:15 UTC (rev 6927)
@@ -2,14 +2,14 @@
 Priority: optional
 Section: libs
 Maintainer: Jan Niehusmann <jan at debian.org>
-Build-Depends: debhelper (>= 4.0.0), cdbs, quilt, cmake, libqt4-dev (>= 4.1.0-3), libsasl2-dev, libgcrypt11-dev
-Build-Conflicts: qca-dev
+Build-Depends: debhelper (>= 4.0.0), cmake, libqt4-dev (>= 4.1.0-3), libxss-dev, docbook-to-man
+Build-Conflicts: qca-dev, libqca2-dev
 Standards-Version: 3.7.2
 
 Package: libqca2-dev
 Section: libdevel
 Architecture: any
-Depends: libqca2 (= ${Source-Version})
+Depends: libqca2 (= ${binary:Version})
 Conflicts: qca-dev
 Description: Qt Cryptographic Architecture - development files
  Taking a hint from the similarly-named Java Cryptography Architecture,

Modified: branches/kde4/packages/qca/debian/libqca2-dev.install
===================================================================
--- branches/kde4/packages/qca/debian/libqca2-dev.install	2007-08-02 17:43:47 UTC (rev 6926)
+++ branches/kde4/packages/qca/debian/libqca2-dev.install	2007-08-02 18:07:15 UTC (rev 6927)
@@ -3,4 +3,4 @@
 usr/lib/lib*.so
 usr/lib/pkgconfig/*
 /usr/lib/*.la
-usr/mkspecs/features/crypto.prf usr/share/qt4/mkspecs/features/crypto.prf
+usr/share/qt4/mkspecs/features/crypto.prf

Modified: branches/kde4/packages/qca/debian/libqca2.install
===================================================================
--- branches/kde4/packages/qca/debian/libqca2.install	2007-08-02 17:43:47 UTC (rev 6926)
+++ branches/kde4/packages/qca/debian/libqca2.install	2007-08-02 18:07:15 UTC (rev 6927)
@@ -1,8 +1,3 @@
-usr/lib/lib*.so.*
-usr/bin/qcatool
-usr/lib/qt4/plugins/crypto/libqca-cyrus-sasl.so
-usr/lib/qt4/plugins/crypto/libqca-gcrypt.so
-usr/lib/qt4/plugins/crypto/libqca-gnupg.so
-usr/lib/qt4/plugins/crypto/libqca-logger.so
-usr/lib/qt4/plugins/crypto/libqca-ossl.so
-usr/lib/qt4/plugins/crypto/libqca-softstore.so
+usr/lib/lib*.so.*[0-9]
+usr/bin/qcatool2
+

Modified: branches/kde4/packages/qca/debian/libqca2.manpages
===================================================================
--- branches/kde4/packages/qca/debian/libqca2.manpages	2007-08-02 17:43:47 UTC (rev 6926)
+++ branches/kde4/packages/qca/debian/libqca2.manpages	2007-08-02 18:07:15 UTC (rev 6927)
@@ -1 +1 @@
-debian/man-out/qcatool.1
+man/qcatool2.1

Modified: branches/kde4/packages/qca/debian/rules
===================================================================
--- branches/kde4/packages/qca/debian/rules	2007-08-02 17:43:47 UTC (rev 6926)
+++ branches/kde4/packages/qca/debian/rules	2007-08-02 18:07:15 UTC (rev 6927)
@@ -1,10 +1,126 @@
-#! /usr/bin/make -f
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
 
-include debian/cdbs/kde.mk
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-install/libqca2::
-	mkdir -p debian/man-out ;
-	docbook-to-man man/qcatool.docbook > debian/man-out/qcatool.1
 
-clean::
-	rm -rf debian/man-out
+# 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/
+
+build: build-stamp
+build-stamp:  config.status
+	dh_testdir
+
+	# add here commands to compile the package.
+	$(MAKE)
+
+	docbook-to-man man/qcatool.docbook > man/qcatool2.1
+
+	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
+	-rm man/qcatool2.1
+
+#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

More information about the pkg-kde-commits mailing list