Author: timb
Date: 2008-10-12 20:35:14 +0200 (Sun, 12 Oct 2008)
New Revision: 1517
Removed:
trunk/openvas-libraries/packaging/debian/libopenvas1-dev.install
trunk/openvas-libraries/packaging/debian/libopenvas1.install
Modified:
trunk/openvas-libraries/ChangeLog
trunk/openvas-libraries/packaging/debian/changelog
trunk/openvas-libraries/packaging/debian/control
trunk/openvas-libraries/packaging/debian/copyright
trunk/openvas-libraries/packaging/debian/rules
Log:
New upstream release
Cleaned up the rules
Updated copyright
Modified: trunk/openvas-libraries/ChangeLog
===================================================================
--- trunk/openvas-libraries/ChangeLog 2008-10-12 18:10:54 UTC (rev 1516)
+++ trunk/openvas-libraries/ChangeLog 2008-10-12 18:35:14 UTC (rev 1517)
@@ -1,3 +1,11 @@
+2008-10-12 Tim Brown <[EMAIL PROTECTED]>
+
+ * openvas-client/packaging/debian/changelog: Updated.
+
+ * openvas-client/packaging/debian/copyright: Updated.
+
+ * openvas-client/packaging/debian/rules: Cleaned up.
+
2008-10-09 Michael Wiegand <[EMAIL PROTECTED]>
* libopenvas/pcap.c: Added missing include for config.h; this fixes a
Modified: trunk/openvas-libraries/packaging/debian/changelog
===================================================================
--- trunk/openvas-libraries/packaging/debian/changelog 2008-10-12 18:10:54 UTC
(rev 1516)
+++ trunk/openvas-libraries/packaging/debian/changelog 2008-10-12 18:35:14 UTC
(rev 1517)
@@ -1,3 +1,11 @@
+openvas-libraries (2.0.0.beta1-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ * Cleaned up the rules
+ * Updated copyright
+
+ -- Tim Brown <[EMAIL PROTECTED]> Sun, 12 Oct 2008 19:23:20 +0100
+
openvas-libraries (1.0.2-2) UNRELEASED; urgency=low
* Not released yet
@@ -48,7 +56,7 @@
* Minor updates to control file, now lists jfs as uploader, fixed deprecated
${Source-Version} substvar, Build-Depends directive
* Minor update to rules file, DH_COMPAT environment variable no longer
required
- * Minor update to libopenvas1-dev.install
+ * Minor update to libopenvas2-dev.install
-- Tim Brown <[EMAIL PROTECTED]> Wed, 16 Apr 2008 05:21:09 +0100
Modified: trunk/openvas-libraries/packaging/debian/control
===================================================================
--- trunk/openvas-libraries/packaging/debian/control 2008-10-12 18:10:54 UTC
(rev 1516)
+++ trunk/openvas-libraries/packaging/debian/control 2008-10-12 18:35:14 UTC
(rev 1517)
@@ -9,10 +9,11 @@
Vcs-Svn:
https://svn.wald.intevation.org/svn/openvas/trunk/openvas-libraries/packaging/debian/
Standards-Version: 3.8.0
-Package: libopenvas1-dev
+Package: libopenvas2-dev
Section: libdevel
Architecture: any
-Depends: libopenvas1 (= ${binary:Version}), libgnutls-dev, libpcap-dev
+Depends: libopenvas2 (= ${binary:Version}), libgnutls-dev, libpcap-dev
+Replaces: libopenvas1-dev
Description: OpenVAS static libraries and headers
The OpenVAS Security Scanner is a security auditing tool. It makes
possible to test security modules in an attempt to find vulnerable
@@ -25,10 +26,11 @@
This package contains the required static libraries, headers, and
openvas-config script.
-Package: libopenvas1
+Package: libopenvas2
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: libopenvas1
Description: OpenVAS shared libraries
The OpenVAS Security Scanner is a security auditing tool. It makes
possible to test security modules in an attempt to find vulnerable
Modified: trunk/openvas-libraries/packaging/debian/copyright
===================================================================
--- trunk/openvas-libraries/packaging/debian/copyright 2008-10-12 18:10:54 UTC
(rev 1516)
+++ trunk/openvas-libraries/packaging/debian/copyright 2008-10-12 18:35:14 UTC
(rev 1517)
@@ -31,6 +31,11 @@
* Renaud Deraison
* Michael Arboi
+ * Bernhard Herzog <[EMAIL PROTECTED]>
+ * Jan-Oliver Wagner <[EMAIL PROTECTED]>
+ * Michael Wiegand <[EMAIL PROTECTED]>
+ * Tim Brown <[EMAIL PROTECTED]>
+ * Vlatko Kosturjak <[EMAIL PROTECTED]>
License:
Deleted: trunk/openvas-libraries/packaging/debian/libopenvas1-dev.install
===================================================================
--- trunk/openvas-libraries/packaging/debian/libopenvas1-dev.install
2008-10-12 18:10:54 UTC (rev 1516)
+++ trunk/openvas-libraries/packaging/debian/libopenvas1-dev.install
2008-10-12 18:35:14 UTC (rev 1517)
@@ -1,6 +0,0 @@
-usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/*.la
-usr/share/man/man1/libopenvas-config.1
-usr/bin/libopenvas-config
Deleted: trunk/openvas-libraries/packaging/debian/libopenvas1.install
===================================================================
--- trunk/openvas-libraries/packaging/debian/libopenvas1.install
2008-10-12 18:10:54 UTC (rev 1516)
+++ trunk/openvas-libraries/packaging/debian/libopenvas1.install
2008-10-12 18:35:14 UTC (rev 1517)
@@ -1 +0,0 @@
-usr/lib/lib*.so.*
Modified: trunk/openvas-libraries/packaging/debian/rules
===================================================================
--- trunk/openvas-libraries/packaging/debian/rules 2008-10-12 18:10:54 UTC
(rev 1516)
+++ trunk/openvas-libraries/packaging/debian/rules 2008-10-12 18:35:14 UTC
(rev 1517)
@@ -1,64 +1,94 @@
#!/usr/bin/make -f
-# Derived from dh_make example.
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-export DH_OPTIONS
-version := $(shell cat VERSION)
-tmp := $(CURDIR)/debian/tmp
-CFLAGS := -g -Wall -D_REENTRANT
-ifneq "$(findstring noopt,$(DEB_BUILD_OPTIONS))" ""
-CFLAGS += -O0
+# 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)
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
else
-CFLAGS += -O2
+CROSS= --build $(DEB_BUILD_GNU_TYPE)
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.
+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
+ ./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man
--infodir=\$${prefix}/share/info --localstatedir=/var CFLAGS="$(CFLAGS)"
LDFLAGS="-Wl,-z,defs"
+
+
build: build-stamp
build-stamp: config.status
dh_testdir
- $(MAKE) localstatedir=/var
+
+ # Add here commands to compile the package.
+ $(MAKE)
touch $@
-config.status: configure
- CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --mandir='$${prefix}/share/man' \
- --enable-static --enable-cipher
-
clean:
dh_testdir
dh_testroot
+ rm -f build-stamp
+
+ # Add here commands to clean up after the build process.
touch openvas-libraries.tmpl
[ ! -f Makefile ] || $(MAKE) distclean
- dh_clean build-stamp
+ rm -f config.sub config.guess
-install: DH_OPTIONS=
-install: build-stamp
+ dh_clean
+
+install: build
dh_testdir
dh_testroot
dh_clean -k
- $(MAKE) install prefix=$(tmp)/usr
- dh_installdirs -plibopenvas1-dev usr/share/doc/libopenvas1
- dh_install --sourcedir=debian/tmp
- find debian/libopenvas1/usr -type d -empty | xargs -r rmdir -p
--ignore-fail-on-non-empty
- find debian/libopenvas1-dev/usr -type d -empty | xargs -r rmdir -p
--ignore-fail-on-non-empty
+ dh_installdirs
-binary-indep:
-# Nothing.
+ # Add here commands to install the package into debian/tmp
+ $(MAKE) prefix=$(CURDIR)/debian/tmp/usr install
-binary-arch: DH_OPTIONS=-a
-binary-arch: 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 ChangeLog
dh_installdocs
- ( cd debian/libopenvas1-dev/usr/share/doc/ ; rm -rf libopenvas1-dev; ln
-s libopenvas1 libopenvas1-dev; )
- dh_installchangelogs
-ifeq "$(findstring nostrip,$(DEB_BUILD_OPTIONS))" ""
+ dh_install --sourcedir=debian/tmp
+ ( cd debian/libopenvas2-dev/usr/share/doc/ ; rm -rf libopenvas2-dev; ln
-s libopenvas2 libopenvas2-dev; )
dh_strip
-endif
dh_compress
dh_fixperms
- dh_makeshlibs -V "libopenvas1 (>= $(version))"
+ dh_makeshlibs -V
dh_installdeb
dh_shlibdeps
dh_gencontrol
_______________________________________________
Openvas-commits mailing list
[email protected]
http://lists.wald.intevation.org/mailman/listinfo/openvas-commits
