[Openvas-commits] r3232 - in trunk/openvas-libnasl: . packaging/debian packaging/debian/patches

[scm-commit@wald.intevation.org]

Author: waja
Date: 2009-05-05 10:12:46 +0200 (Tue, 05 May 2009)
New Revision: 3232

Added:
   trunk/openvas-libnasl/packaging/debian/patches/
   trunk/openvas-libnasl/packaging/debian/patches/00list
   trunk/openvas-libnasl/packaging/debian/patches/10_fix_gcrypt.dpatch
Modified:
   trunk/openvas-libnasl/ChangeLog
   trunk/openvas-libnasl/packaging/debian/changelog
   trunk/openvas-libnasl/packaging/debian/control
   trunk/openvas-libnasl/packaging/debian/rules
Log:
add gcrypt fix

Modified: trunk/openvas-libnasl/ChangeLog
===================================================================
--- trunk/openvas-libnasl/ChangeLog	2009-05-04 23:51:49 UTC (rev 3231)
+++ trunk/openvas-libnasl/ChangeLog	2009-05-05 08:12:46 UTC (rev 3232)
@@ -2,6 +2,11 @@
 
 	* packaging/debian/changelog: Add new version and insert last changes
 
+	* packaging/debian/control, packaging/debian/rules: include dpatch
+	infrastructure
+
+	* packaging/debian/patches: Add gcrypt fix
+
 2009-04-20  Michael Wiegand <michael.wiegand at intevation.de>
 
 	* packaging/debian/control: Adjusted overly strict build dependencies

Modified: trunk/openvas-libnasl/packaging/debian/changelog
===================================================================
--- trunk/openvas-libnasl/packaging/debian/changelog	2009-05-04 23:51:49 UTC (rev 3231)
+++ trunk/openvas-libnasl/packaging/debian/changelog	2009-05-05 08:12:46 UTC (rev 3232)
@@ -3,6 +3,8 @@
   [ Jan Wagner ]
   * New upstream release
   * Update the changelog
+  * include dpatch infrastructure
+  * add 10_fix_gcrypt.dpatch
 
   [ Michael Wiegand ]
   * Build-Depend on libpcap-dev instead of libpcap0.8-dev and rais to

Modified: trunk/openvas-libnasl/packaging/debian/control
===================================================================
--- trunk/openvas-libnasl/packaging/debian/control	2009-05-04 23:51:49 UTC (rev 3231)
+++ trunk/openvas-libnasl/packaging/debian/control	2009-05-05 08:12:46 UTC (rev 3232)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian OpenVAS Maintainers <openvas-distro-deb at wald.intevation.org>
 Uploaders: Tim Brown <timb at nth-dimension.org.uk>, Javier Fernandez-Sanguino Pen~a <jfs at debian.org>, Jan Wagner <waja at cyconet.org>
-Build-Depends: debhelper (>= 5), autotools-dev, libopenvas2-dev (>= 2.0.1) , libgpgme11-dev (>= 1.1.2), bison, libpcap-dev, libgcrypt11-dev, libgnutls-dev, libglib2.0-dev
+Build-Depends: debhelper (>= 5), autotools-dev, libopenvas2-dev (>= 2.0.1) , libgpgme11-dev (>= 1.1.2), bison, libpcap-dev, libgcrypt11-dev, libgnutls-dev, libglib2.0-dev, dpatch
 Homepage: http://www.openvas.org/
 Vcs-Browser: http://wald.intevation.org/plugins/scmsvn/viewcvs.php/trunk/openvas-libnasl/packaging/debian/?root=openvas
 Vcs-Svn: https://svn.wald.intevation.org/svn/openvas/trunk/openvas-libnasl/packaging/debian/

Added: trunk/openvas-libnasl/packaging/debian/patches/00list
===================================================================
--- trunk/openvas-libnasl/packaging/debian/patches/00list	2009-05-04 23:51:49 UTC (rev 3231)
+++ trunk/openvas-libnasl/packaging/debian/patches/00list	2009-05-05 08:12:46 UTC (rev 3232)
@@ -0,0 +1 @@
+10_fix_gcrypt.dpatch

Added: trunk/openvas-libnasl/packaging/debian/patches/10_fix_gcrypt.dpatch
===================================================================
--- trunk/openvas-libnasl/packaging/debian/patches/10_fix_gcrypt.dpatch	2009-05-04 23:51:49 UTC (rev 3231)
+++ trunk/openvas-libnasl/packaging/debian/patches/10_fix_gcrypt.dpatch	2009-05-05 08:12:46 UTC (rev 3232)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_fix_gcrypt.dpatch by Jan Wagner <waja at cyconet.org>
+##
+## DP: add gcrypt to flags
+
+ at DPATCH@
+diff -urNad openvas-libnasl-2.0.1~/nasl/Makefile openvas-libnasl-2.0.1/nasl/Makefile
+--- openvas-libnasl-2.0.1~/nasl/Makefile	2009-01-26 08:24:46.000000000 +0100
++++ openvas-libnasl-2.0.1/nasl/Makefile	2009-05-05 09:46:46.000000000 +0200
+@@ -24,7 +24,7 @@
+ 
+ include ../nasl.tmpl
+ NESSUS_CFLAGS= -I../include $(OPTIMIZE) `$(LIBOPENVASCONFIG) --cflags` `$(GPGME_CONFIG) --cflags` -DNESSUS_EXTENSIONS $(GLIB_CFLAGS)
+-NESSUS_LIBS = $(LIBS) `$(LIBOPENVASCONFIG) --libs` `$(GPGME_CONFIG) --libs` $(GLIB_LIBS)
++NESSUS_LIBS = $(LIBS) -lgcrypt `$(LIBOPENVASCONFIG) --libs` `$(GPGME_CONFIG) --libs` $(GLIB_LIBS)
+ 
+ NESSUS_INCLUDE = $(NESSUS_CFLAGS) $(include) $(DEFS)
+ 


Property changes on: trunk/openvas-libnasl/packaging/debian/patches/10_fix_gcrypt.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/openvas-libnasl/packaging/debian/rules
===================================================================
--- trunk/openvas-libnasl/packaging/debian/rules	2009-05-04 23:51:49 UTC (rev 3231)
+++ trunk/openvas-libnasl/packaging/debian/rules	2009-05-05 08:12:46 UTC (rev 3232)
@@ -21,8 +21,8 @@
 endif
 
 
+include /usr/share/dpatch/dpatch.make
 
-
 # shared library versions, option 1
 version=2.0.5
 major=2
@@ -32,7 +32,7 @@
 #major=`ls src/.libs/lib*.so.* | \
 # awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
 
-config.status: configure
+config.status: patch-stamp configure
 	dh_testdir
 	# Add here commands to configure the package.
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
@@ -52,7 +52,7 @@
 	$(MAKE)
 	touch $@
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp