Browse code

Removed rc moniker for the 0.100.0 stable release. Added docs/html back so it may be packaged in the release tarball.

Micah Snyder authored on 2018/11/28 10:42:50
Showing 9 changed files
... ...
@@ -1,6 +1,6 @@
1 1
 #! /bin/sh
2 2
 # Guess values for system-dependent variables and create Makefiles.
3
-# Generated by GNU Autoconf 2.69 for ClamAV 0.101.0-rc.
3
+# Generated by GNU Autoconf 2.69 for ClamAV 0.101.0.
4 4
 #
5 5
 # Report bugs to <https://bugzilla.clamav.net/>.
6 6
 #
... ...
@@ -592,8 +592,8 @@ MAKEFLAGS=
592 592
 # Identity of this package.
593 593
 PACKAGE_NAME='ClamAV'
594 594
 PACKAGE_TARNAME='clamav'
595
-PACKAGE_VERSION='0.101.0-rc'
596
-PACKAGE_STRING='ClamAV 0.101.0-rc'
595
+PACKAGE_VERSION='0.101.0'
596
+PACKAGE_STRING='ClamAV 0.101.0'
597 597
 PACKAGE_BUGREPORT='https://bugzilla.clamav.net/'
598 598
 PACKAGE_URL='https://www.clamav.net/'
599 599
 
... ...
@@ -1543,7 +1543,7 @@ if test "$ac_init_help" = "long"; then
1543 1543
   # Omit some internal or obsolete options to make the list less imposing.
1544 1544
   # This message is too long to be a string in the A/UX 3.1 sh.
1545 1545
   cat <<_ACEOF
1546
-\`configure' configures ClamAV 0.101.0-rc to adapt to many kinds of systems.
1546
+\`configure' configures ClamAV 0.101.0 to adapt to many kinds of systems.
1547 1547
 
1548 1548
 Usage: $0 [OPTION]... [VAR=VALUE]...
1549 1549
 
... ...
@@ -1614,7 +1614,7 @@ fi
1614 1614
 
1615 1615
 if test -n "$ac_init_help"; then
1616 1616
   case $ac_init_help in
1617
-     short | recursive ) echo "Configuration of ClamAV 0.101.0-rc:";;
1617
+     short | recursive ) echo "Configuration of ClamAV 0.101.0:";;
1618 1618
    esac
1619 1619
   cat <<\_ACEOF
1620 1620
 
... ...
@@ -1838,7 +1838,7 @@ fi
1838 1838
 test -n "$ac_init_help" && exit $ac_status
1839 1839
 if $ac_init_version; then
1840 1840
   cat <<\_ACEOF
1841
-ClamAV configure 0.101.0-rc
1841
+ClamAV configure 0.101.0
1842 1842
 generated by GNU Autoconf 2.69
1843 1843
 
1844 1844
 Copyright (C) 2012 Free Software Foundation, Inc.
... ...
@@ -2428,7 +2428,7 @@ cat >config.log <<_ACEOF
2428 2428
 This file contains any messages produced by compilers while
2429 2429
 running configure, to aid debugging if configure makes a mistake.
2430 2430
 
2431
-It was created by ClamAV $as_me 0.101.0-rc, which was
2431
+It was created by ClamAV $as_me 0.101.0, which was
2432 2432
 generated by GNU Autoconf 2.69.  Invocation command line was
2433 2433
 
2434 2434
   $ $0 $@
... ...
@@ -4185,7 +4185,7 @@ fi
4185 4185
 
4186 4186
 # Define the identity of the package.
4187 4187
  PACKAGE='clamav'
4188
- VERSION='0.101.0-rc'
4188
+ VERSION='0.101.0'
4189 4189
 
4190 4190
 
4191 4191
 # Some tools Automake needs.
... ...
@@ -5913,7 +5913,7 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
5913 5913
 
5914 5914
 
5915 5915
 
5916
-VERSION="0.101.0-rc"
5916
+VERSION="0.101.0"
5917 5917
 
5918 5918
 LC_CURRENT=9
5919 5919
 LC_REVISION=0
... ...
@@ -29787,7 +29787,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
29787 29787
 # report actual input values of CONFIG_FILES etc. instead of their
29788 29788
 # values after options handling.
29789 29789
 ac_log="
29790
-This file was extended by ClamAV $as_me 0.101.0-rc, which was
29790
+This file was extended by ClamAV $as_me 0.101.0, which was
29791 29791
 generated by GNU Autoconf 2.69.  Invocation command line was
29792 29792
 
29793 29793
   CONFIG_FILES    = $CONFIG_FILES
... ...
@@ -29854,7 +29854,7 @@ _ACEOF
29854 29854
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
29855 29855
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
29856 29856
 ac_cs_version="\\
29857
-ClamAV config.status 0.101.0-rc
29857
+ClamAV config.status 0.101.0
29858 29858
 configured by $0, generated by GNU Autoconf 2.69,
29859 29859
   with options \\"\$ac_cs_config\\"
29860 29860
 
... ...
@@ -32670,7 +32670,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
32670 32670
 # report actual input values of CONFIG_FILES etc. instead of their
32671 32671
 # values after options handling.
32672 32672
 ac_log="
32673
-This file was extended by ClamAV $as_me 0.101.0-rc, which was
32673
+This file was extended by ClamAV $as_me 0.101.0, which was
32674 32674
 generated by GNU Autoconf 2.69.  Invocation command line was
32675 32675
 
32676 32676
   CONFIG_FILES    = $CONFIG_FILES
... ...
@@ -32737,7 +32737,7 @@ _ACEOF
32737 32737
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
32738 32738
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
32739 32739
 ac_cs_version="\\
32740
-ClamAV config.status 0.101.0-rc
32740
+ClamAV config.status 0.101.0
32741 32741
 configured by $0, generated by GNU Autoconf 2.69,
32742 32742
   with options \\"\$ac_cs_config\\"
32743 32743
 
... ...
@@ -20,7 +20,7 @@ dnl   MA 02110-1301, USA.
20 20
 AC_PREREQ([2.59])
21 21
 dnl For a release change [devel] to the real version [0.xy]
22 22
 dnl also change VERSION below
23
-AC_INIT([ClamAV], [0.101.0-rc], [https://bugzilla.clamav.net/], [clamav], [https://www.clamav.net/])
23
+AC_INIT([ClamAV], [0.101.0], [https://bugzilla.clamav.net/], [clamav], [https://www.clamav.net/])
24 24
 
25 25
 dnl enable C++
26 26
 AC_PROG_CXX()
... ...
@@ -16,7 +16,7 @@
16 16
 #  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
17 17
 #  MA 02110-1301, USA.
18 18
 
19
-EXTRA_DIST = UserManual UserManual.md $(top_srcdir)/docs/man/*.in  
19
+EXTRA_DIST = html UserManual UserManual.md $(top_srcdir)/docs/man/*.in  
20 20
 man_MANS = man/clamscan.1 man/freshclam.1 man/sigtool.1 man/clamd.8 man/clamd.conf.5 man/clamdscan.1 man/clamav-milter.8 man/clamav-milter.conf.5 man/freshclam.conf.5 man/clamconf.1 man/clamdtop.1 man/clambc.1
21 21
 
22 22
 if ENABLE_CLAMSUBMIT
... ...
@@ -464,7 +464,7 @@ target_vendor = @target_vendor@
464 464
 top_build_prefix = @top_build_prefix@
465 465
 top_builddir = @top_builddir@
466 466
 top_srcdir = @top_srcdir@
467
-EXTRA_DIST = UserManual UserManual.md $(top_srcdir)/docs/man/*.in  
467
+EXTRA_DIST = html UserManual UserManual.md $(top_srcdir)/docs/man/*.in  
468 468
 man_MANS = man/clamscan.1 man/freshclam.1 man/sigtool.1 man/clamd.8 \
469 469
 	man/clamd.conf.5 man/clamdscan.1 man/clamav-milter.8 \
470 470
 	man/clamav-milter.conf.5 man/freshclam.conf.5 man/clamconf.1 \
471 471
new file mode 100644
... ...
@@ -1,6 +1,6 @@
1 1
 dnl change this on a release
2 2
 dnl VERSION="devel-`date +%Y%m%d`"
3
-VERSION="0.101.0-rc"
3
+VERSION="0.101.0"
4 4
 
5 5
 LC_CURRENT=9
6 6
 LC_REVISION=0
... ...
@@ -20,7 +20,7 @@ UninstallDisplayName=ClamAV
20 20
 Compression=lzma2
21 21
 SolidCompression=yes
22 22
 OutputDir=.
23
-OutputBaseFilename=ClamAV-0.101.0-rc
23
+OutputBaseFilename=ClamAV-0.101.0
24 24
 WizardImageFile=demon.bmp
25 25
 WizardSmallImageFile=talos.bmp
26 26
 
... ...
@@ -87,8 +87,7 @@ Source: "..\COPYING.zlib"; DestDir: "{app}\COPYING"; DestName: "COPYING.zlib"
87 87
 Source: "..\ChangeLog.md"; DestDir: "{app}\docs"; DestName: "ChangeLog.md"
88 88
 Source: "..\NEWS.md"; DestDir: "{app}\docs"; DestName: "NEWS.md"              
89 89
 Source: "..\README.md"; DestDir: "{app}"; DestName: "README.md"
90
-Source: "..\docs\UserManual.md"; DestDir: "{app}\docs"; DestName: "UserManual.md"
91
-Source: "..\docs\UserManual\*"; DestDir: "{app}\docs\UserManual"; Flags: recursesubdirs
90
+Source: "..\docs\html\*"; DestDir: "{app}\docs"; Flags: recursesubdirs
92 91
 
93 92
 [Dirs]
94 93
 Name: "{app}\database"
... ...
@@ -99,7 +98,7 @@ Name: "{app}\database"
99 99
 [Run]
100 100
 Filename: "{tmp}\vc_redist.x86.exe"; Parameters: "/q /norestart"; Check: not Is64BitInstallMode and VCRedistNeedsInstall; WorkingDir: {app}\redist; StatusMsg: Installing VC++ 2015 Redistributables...; Flags: shellexec
101 101
 Filename: "{tmp}\vc_redist.x64.exe"; Parameters: "/q /norestart"; Check: Is64BitInstallMode and VCRedistNeedsInstall; WorkingDir: {app}\redist; StatusMsg: Installing VC++ 2015 Redistributables...; Flags: shellexec
102
-Filename: https://github.com/Cisco-Talos/clamav-devel/blob/dev/0.101/README.md; Description: "View Readme on GitHub"; Flags: postinstall shellexec
102
+Filename: file://{app}/docs/UserManual.html; Description: "Open the User Manual in the default browser"; Flags: postinstall shellexec
103 103
 
104 104
 [Code]
105 105
 #IFDEF UNICODE
... ...
@@ -469,7 +469,7 @@
469 469
 #define PACKAGE_NAME "ClamAV"
470 470
 
471 471
 /* Define to the full name and version of this package. */
472
-#define PACKAGE_STRING "ClamAV 0.101.0-rc"
472
+#define PACKAGE_STRING "ClamAV 0.101.0"
473 473
 
474 474
 /* Define to the one symbol short name of this package. */
475 475
 #define PACKAGE_TARNAME "clamav"
... ...
@@ -478,7 +478,7 @@
478 478
 #define PACKAGE_URL "https://www.clamav.net/"
479 479
 
480 480
 /* Define to the version of this package. */
481
-#define PACKAGE_VERSION "0.101.0-rc"
481
+#define PACKAGE_VERSION "0.101.0"
482 482
 
483 483
 /* scan buffer size */
484 484
 #define SCANBUFF 131072
... ...
@@ -514,7 +514,7 @@
514 514
 /* #undef USE_SYSLOG */
515 515
 
516 516
 /* Version number of package */
517
-#define VERSION "0.101.0-rc"
517
+#define VERSION "0.101.0"
518 518
 
519 519
 /* Version suffix for package */
520 520
 #define VERSION_SUFFIX ""
... ...
@@ -7,7 +7,7 @@
7 7
 #endif
8 8
 
9 9
 #define RES_VER_Q 0,101,0,0
10
-#define RES_VER_S "ClamAV 0.101.0-rc"
10
+#define RES_VER_S "ClamAV 0.101.0"
11 11
 
12 12
 VS_VERSION_INFO VERSIONINFO
13 13
     FILEVERSION RES_VER_Q