[Pkg-clamav-commits] [libclamunrar] 06/08: prepare 0.99-0+deb6u1

Sebastian Andrzej Siewior bigeasy at moszumanska.debian.org
Wed Mar 2 16:45:39 UTC 2016 

This is an automated email from the git hooks/post-receive script.

bigeasy pushed a commit to branch squeeze
in repository libclamunrar.

commit 28c8deb6abe7cd09a28de285c989e18a871cee12
Author: Sebastian Andrzej Siewior <sebastian at breakpoint.cc>
Date:   Wed Mar 2 17:37:28 2016 +0100

    prepare 0.99-0+deb6u1
    
    Signed-off-by: Sebastian Andrzej Siewior <sebastian at breakpoint.cc>
---
 debian/changelog                | 18 ++++++++++++++++++
 debian/control                  | 10 +++++-----
 debian/copyright                |  5 ++++-
 debian/libclamunrar6.links      |  7 -------
 debian/libclamunrar6.symbols    | 13 -------------
 debian/libclamunrar7.links      |  7 +++++++
 debian/libclamunrar7.symbols    | 13 +++++++++++++
 debian/rules                    |  4 ++--
 debian/upstream/signing-key.asc | 26 ++++++++++++++++++++++++++
 debian/watch                    |  5 ++---
 10 files changed, 77 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5ef8664..1b8b56c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+libclamunrar (0.99-0+deb6u1) squeeze-lts; urgency=medium
+
+  [ Scott Kitterman ]
+  * Correct debian/copyright to add missing copyright declarations/dates
+  * Manually autreconf and add as patch since dh-autoreconf in squeeze
+    is too old.
+
+  [ Sebastian Andrzej Siewior ]
+  * Bumped standards version to 3.9.6 (no changes required).
+  * Import new upstream. This is required because clamav's major .so version
+    changed.
+  * switch from libclamunrar6 to libclamunrar7
+  * copy clamav's watch file
+  * add pkg-config to dependencies so autoreconf does not break
+  * don't link against libpcre if available.
+
+ -- Scott Kitterman <scott at kitterman.com>  Sat, 27 Feb 2016 19:58:01 -0500
+
 libclamunrar (0.98.5-0+deb6u1) squeeze-lts; urgency=medium
 
   [ Sebastian Andrzej Siewior ]
diff --git a/debian/control b/debian/control
index 76c2544..7677e21 100644
--- a/debian/control
+++ b/debian/control
@@ -3,16 +3,16 @@ Priority: extra
 Section: non-free/libs
 Maintainer: ClamAV Team <pkg-clamav-devel at lists.alioth.debian.org>
 Uploaders: Michael Tautschnig <mt at debian.org>, Stephen Gran <sgran at debian.org>, Sebastian Andrzej Siewior <sebastian at breakpoint.cc>
-Build-Depends: debhelper (>= 8), autotools-dev, zlib1g-dev, libbz2-dev, dh-autoreconf, automake, libssl-dev
-Standards-Version: 3.9.5
+Build-Depends: debhelper (>= 8), autotools-dev, zlib1g-dev, libbz2-dev, dh-autoreconf, automake, libssl-dev, pkg-config
+Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-clamav/libclamunrar.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-clamav/libclamunrar.git;a=summary
 Homepage: http://www.clamav.net/
 XS-Autobuild: yes
 
-Package: libclamunrar6
+Package: libclamunrar7
 Architecture: any
-Depends: libclamav6, ${shlibs:Depends}, ${misc:Depends}
+Depends: libclamav7, ${shlibs:Depends}, ${misc:Depends}
 Description: anti-virus utility for Unix - unrar support
  Clam AntiVirus is an anti-virus toolkit for Unix. The main purpose of
  this software is the integration with mail servers (attachment
@@ -20,7 +20,7 @@ Description: anti-virus utility for Unix - unrar support
  multi-threaded daemon in the clamav-daemon package, a command-line
  scanner in the clamav package, and a tool for automatic updating via
  the Internet in the clamav-freshclam package. The programs are based
- on libclamav6, which can be used by other software.
+ on libclamav7, which can be used by other software.
  .
  This package provides support for RAR packaged files or mail attachments.
  Support will be available once this package is installed and clamd or a local
diff --git a/debian/copyright b/debian/copyright
index 9da5cb0..291f0ad 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -44,7 +44,8 @@ Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
 
 libclamunrar_iface/unrar_iface.c and libclamunrar_iface/unrar_iface.h are
-Copyright (C) 2007 Sourcefire, Inc.
+Copyright (C) 2015 Cisco Systems, Inc. and/or its affiliates. All rights reserved.
+Copyright (C) 2007-2013 Sourcefire, Inc.
 
 and are licensed under the terms of the LGPL:
 
@@ -69,6 +70,8 @@ libclamunrar/unrarhlp.c and libclamunrar/unrarhlp.h are
 Copyright (C) 2007 Sourcefire, Inc.
 All other source files in libclamunrar/ are
 Copyright (C) 2005,2006 trog at uncon.org and based on the work of Alexander L. Roshal (C)
+libclamunrar/unrar.c, unrarvm.c, and unrar20.c patches added by Sourcefire,
+Inc. Copyright (C) 2007-2013
 All source files in libclamunrar/ are licences under the terms of the UNRAR
 license:
 
diff --git a/debian/libclamunrar6.links b/debian/libclamunrar6.links
deleted file mode 100644
index da2a136..0000000
--- a/debian/libclamunrar6.links
+++ /dev/null
@@ -1,7 +0,0 @@
-/usr/share/doc/libclamav6/AUTHORS /usr/share/doc/libclamunrar6/AUTHORS
-/usr/share/doc/libclamav6/BUGS /usr/share/doc/libclamunrar6/BUGS
-/usr/share/doc/libclamav6/FAQ /usr/share/doc/libclamunrar6/FAQ
-/usr/share/doc/libclamav6/README.gz /usr/share/doc/libclamunrar6/README.gz
-/usr/share/doc/libclamav6/README.Debian.gz /usr/share/doc/libclamunrar6/README.Debian.gz
-/usr/share/doc/libclamav6/NEWS.Debian.gz /usr/share/doc/libclamunrar6/NEWS.Debian.gz
-/usr/share/doc/libclamav6/changelog.gz /usr/share/doc/libclamunrar6/changelog.gz
diff --git a/debian/libclamunrar6.symbols b/debian/libclamunrar6.symbols
deleted file mode 100644
index 75b358d..0000000
--- a/debian/libclamunrar6.symbols
+++ /dev/null
@@ -1,13 +0,0 @@
-libclamunrar.so.6 libclamunrar6 #MINVER#
- CLAMAV_PRIVATE_UNRAR at CLAMAV_PRIVATE_UNRAR 0.98.1
- ppm_constructor at CLAMAV_PRIVATE_UNRAR 0.98.1
- ppm_destructor at CLAMAV_PRIVATE_UNRAR 0.98.1
- rar_init_filters at CLAMAV_PRIVATE_UNRAR 0.98.1
- rar_unpack at CLAMAV_PRIVATE_UNRAR 0.98.1
- rarvm_free at CLAMAV_PRIVATE_UNRAR 0.98.1
-libclamunrar_iface.so.6 libclamunrar6 #MINVER#
- CLAMAV_PRIVATE at CLAMAV_PRIVATE 0.98.1
- libclamunrar_iface_LTX_unrar_close at CLAMAV_PRIVATE 0.98.1
- libclamunrar_iface_LTX_unrar_extract_next at CLAMAV_PRIVATE 0.98.1
- libclamunrar_iface_LTX_unrar_extract_next_prepare at CLAMAV_PRIVATE 0.98.1
- libclamunrar_iface_LTX_unrar_open at CLAMAV_PRIVATE 0.98.1
diff --git a/debian/libclamunrar7.links b/debian/libclamunrar7.links
new file mode 100644
index 0000000..876ecb0
--- /dev/null
+++ b/debian/libclamunrar7.links
@@ -0,0 +1,7 @@
+/usr/share/doc/libclamav7/AUTHORS /usr/share/doc/libclamunrar7/AUTHORS
+/usr/share/doc/libclamav7/BUGS /usr/share/doc/libclamunrar7/BUGS
+/usr/share/doc/libclamav7/FAQ /usr/share/doc/libclamunrar7/FAQ
+/usr/share/doc/libclamav7/README.gz /usr/share/doc/libclamunrar7/README.gz
+/usr/share/doc/libclamav7/README.Debian.gz /usr/share/doc/libclamunrar7/README.Debian.gz
+/usr/share/doc/libclamav7/NEWS.Debian.gz /usr/share/doc/libclamunrar7/NEWS.Debian.gz
+/usr/share/doc/libclamav7/changelog.gz /usr/share/doc/libclamunrar7/changelog.gz
diff --git a/debian/libclamunrar7.symbols b/debian/libclamunrar7.symbols
new file mode 100644
index 0000000..3be75f5
--- /dev/null
+++ b/debian/libclamunrar7.symbols
@@ -0,0 +1,13 @@
+libclamunrar.so.7 libclamunrar7 #MINVER#
+ CLAMAV_PRIVATE_UNRAR at CLAMAV_PRIVATE_UNRAR 0.99
+ ppm_constructor at CLAMAV_PRIVATE_UNRAR 0.99
+ ppm_destructor at CLAMAV_PRIVATE_UNRAR 0.99
+ rar_init_filters at CLAMAV_PRIVATE_UNRAR 0.99
+ rar_unpack at CLAMAV_PRIVATE_UNRAR 0.99
+ rarvm_free at CLAMAV_PRIVATE_UNRAR 0.99
+libclamunrar_iface.so.7 libclamunrar7 #MINVER#
+ CLAMAV_PRIVATE at CLAMAV_PRIVATE 0.99
+ libclamunrar_iface_LTX_unrar_close at CLAMAV_PRIVATE 0.99
+ libclamunrar_iface_LTX_unrar_extract_next at CLAMAV_PRIVATE 0.99
+ libclamunrar_iface_LTX_unrar_extract_next_prepare at CLAMAV_PRIVATE 0.99
+ libclamunrar_iface_LTX_unrar_open at CLAMAV_PRIVATE 0.99
diff --git a/debian/rules b/debian/rules
index ea84775..f9c1523 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,5 +21,5 @@ override_dh_auto_build:
 
 override_dh_auto_install:
 	dh_auto_install
-	rm debian/libclamunrar6/usr/lib/*.la
-	rm debian/libclamunrar6/usr/lib/*.so
+	rm debian/libclamunrar7/usr/lib/*.la
+	rm debian/libclamunrar7/usr/lib/*.so
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 0000000..bd0a142
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQGiBFUuscERBAChEuHjPMqJMY6N9OpR1HppjLLLIEyOfCwt7jIysw92K5tfa1P1
+sC714WaSPrjzvqSUcUpEAy3IvcWQjMil3zQdcIR/kzdTLN7e6iyqST3uZe2KtjpT
+cYHIdH31i7wS5BtnE+3kw8KLPhjE6p1lD2V3Pv7nAa5cMkdi9R5HCk1TNwCg5HMj
+8Jx13nEcGIDjQP39eHdaYHcD/1tlzPJZ0vj6WrAoZFPvVEl/Mhgn5xfC6kXioSy7
+CG3DmXuUszpncFAlA9y2qXRkjBg65Z3c9ed95W2QPQLmY0DgBzcg/7lTxI+8/EJC
+VMwSebzlEBKxMxuy5LdWvDelIZQuT0EHEQFzR+uTGp7HcYOLTj9ROy9LfT+rw3WV
+bXfXA/9wOX4WU2mUf62/c4Bz5SiNq8Jtrq1KoPXyLAkRXFIaMP2ay3qZRYPRo2qV
+wRB35hQlfLbK06yPvRYYUY47lA5pU6hTyrZQc8qGraKndVl07/8sMB2yTb/8IybQ
+lyCTyzzmXrGzW+j2GbTYTPTf5ectbNR//irDGs8S+zNwsj5RxbQvVGFsb3MgKFRh
+bG9zIEdQRyBLZXkpIDxyZXNlYXJjaEBzb3VyY2VmaXJlLmNvbT6IZQQTEQIAJgUC
+VS6xwQIbAwUJA8JnAAYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJELPVNCwmBCmg
+MU0AnjZF4V3ogtU/xCddQbORpbgEtio9AJjJ3FADpCuNI/CHNmsft5inVZuEiEYE
+EBECAAYFAlUus34ACgkQQLjqI2QiHVO57ACfW9Sy9zM1FIsfS4lAPrJszhdy0xkA
+n1KLqgeS/PKkOk/WHozknx92s3N2uQENBFUuscQQBACsbQDPfGgKScmeryK5eHVo
+UtOF2mmlaD5MgFE+3jPH/b/p4+uIRDc/MRB+VWO/0g6ZzXd+f/h9jpFP4fstMnvX
+0/DdqD2cIWNJnl6Mr9/BTiMki91mugdeL3/IAYhS2rAmHgdNnMq4XcMHnU7VBr1O
+PCOQQ1rGYne1d4HQDMu+xwADBQQAkjf9BV82XQaFdwtpNadLDGFz2WwlG/DViP9G
+rE5or1C3k1jc7UfgvuSIq1wBG3MW5KZaSs6aJ9mHkC8tj16C/ct1Z4t3CYZLXM83
+VwLEqRYvChBWqwT1VXTXFvfZ1VHHUELrYu6zhRXm+NlRkAyQ8JHR+YAmJGKZvufn
+fiCvKbSITwQYEQIADwUCVS6xxAIbDAUJA8JnAAAKCRCz1TQsJgQpoL3GAKCiF3sE
+GvyBCihREm45qqScpVpMnACfUVexUPkgeMq4ZiEpMQbZfjq08f8=
+=Ybvy
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/debian/watch b/debian/watch
index ed9ac3d..5df23e4 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,3 @@
 version=3
-opts=uversionmangle=s/(\d+)(rc)/$1~$2/,dversionmangle=s/\+dfsg// \
-http://sf.net/clamav/clamav-(.*).tar.gz debian uupdate
-
+opts="uversionmangle=s/(\d+)-*(beta|rc)/$1~$2/,dversionmangle=s/\+dfsg//,pgpsigurlmangle=s/$/.sig/" \
+http://www.clamav.net/download.html /downloads/.*/clamav-(.*).tar.gz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-clamav/libclamunrar.git

More information about the Pkg-clamav-commits mailing list