[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. 99ae9353f6834da0cb73f59f4b32d1f0ae1263fa

Stephen Gran steve at lobefin.net
Thu Sep 4 12:37:08 UTC 2008


The following commit has been merged in the debian/unstable branch:
commit 9716eb455bf0d3ad668983d4a3993bd74286da3b
Author: Stephen Gran <steve at lobefin.net>
Date:   Thu Sep 4 13:25:55 2008 +0100

    Revert "syn in with trunk"
    
    This reverts commit d9761d904c4033c6d2350e617ad259d39a2ac9ed.

diff --git a/contrib/Windows/Projects/clamAV/clamd/clamd.vcproj b/contrib/Windows/Projects/clamAV/clamd/clamd.vcproj
index a323a90..1b50492 100755
--- a/contrib/Windows/Projects/clamAV/clamd/clamd.vcproj
+++ b/contrib/Windows/Projects/clamAV/clamd/clamd.vcproj
@@ -69,7 +69,7 @@
 				UseUnicodeResponseFiles="false"
 				AdditionalOptions="/SAFESEH"
 				AdditionalDependencies="&quot;$(TargetDir)\libclamav.lib&quot; ws2_32.lib"
-				Version="0.93"
+				Version="0.92"
 				LinkIncremental="2"
 				GenerateManifest="true"
 				DelayLoadDLLs=""
@@ -157,7 +157,7 @@
 				UseUnicodeResponseFiles="false"
 				AdditionalOptions="/SAFESEH"
 				AdditionalDependencies="&quot;$(TargetDir)\libclamav.lib&quot; ws2_32.lib"
-				Version="0.93"
+				Version="0.92"
 				LinkIncremental="1"
 				GenerateManifest="true"
 				DelayLoadDLLs=""
diff --git a/contrib/Windows/Projects/clamAV/freshclam/freshclam.vcproj b/contrib/Windows/Projects/clamAV/freshclam/freshclam.vcproj
index 742f5b3..526c7ea 100755
--- a/contrib/Windows/Projects/clamAV/freshclam/freshclam.vcproj
+++ b/contrib/Windows/Projects/clamAV/freshclam/freshclam.vcproj
@@ -67,8 +67,8 @@
 				Name="VCLinkerTool"
 				UseUnicodeResponseFiles="false"
 				AdditionalOptions="/SAFESEH"
-				AdditionalDependencies="dnsapi.lib ws2_32.lib &quot;$(TargetDir)\libclamav.lib&quot;"
-				Version="0.93"
+				AdditionalDependencies="dnsapi.lib ws2_32.lib"
+				Version="0.0.1"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -152,8 +152,8 @@
 				Name="VCLinkerTool"
 				UseUnicodeResponseFiles="false"
 				AdditionalOptions="/SAFESEH"
-				AdditionalDependencies="dnsapi.lib ws2_32.lib &quot;$(TargetDir)\libclamav.lib&quot;"
-				Version="0.93"
+				AdditionalDependencies="dnsapi.lib ws2_32.lib"
+				Version="0.0.1"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -268,10 +268,6 @@
 				RelativePath="..\shared\output.c"
 				>
 			</File>
-			<File
-				RelativePath="..\shared\tar.c"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -307,7 +303,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\shared\tar.h"
+				RelativePath=".\resource1.h"
 				>
 			</File>
 		</Filter>
@@ -321,7 +317,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\libclamav\clamAV.ico"
+				RelativePath=".\icon1.ico"
 				>
 			</File>
 		</Filter>
diff --git a/contrib/Windows/Projects/clamAV/libclamav/libclamav.def b/contrib/Windows/Projects/clamAV/libclamav/libclamav.def
index 4a3a1dc..9083c31 100755
--- a/contrib/Windows/Projects/clamAV/libclamav/libclamav.def
+++ b/contrib/Windows/Projects/clamAV/libclamav/libclamav.def
@@ -1,5 +1,5 @@
 LIBRARY libClamAV
-VERSION 0.93
+VERSION 0.92.1
 EXPORTS cl_scandesc @1
 EXPORTS cl_scanfile @2
 EXPORTS cl_load @3
diff --git a/contrib/Windows/Projects/clamAV/libclamav/libclamav.vcproj b/contrib/Windows/Projects/clamAV/libclamav/libclamav.vcproj
index a6a0a73..9105bf3 100644
--- a/contrib/Windows/Projects/clamAV/libclamav/libclamav.vcproj
+++ b/contrib/Windows/Projects/clamAV/libclamav/libclamav.vcproj
@@ -70,7 +70,7 @@
 				Name="VCLinkerTool"
 				UseUnicodeResponseFiles="false"
 				AdditionalDependencies="ws2_32.lib &quot;$(ProjectDir)pthread\pthreadVC2.lib&quot; &quot;$(TargetDir)\libclamunrar_iface.lib&quot;"
-				Version="0.93"
+				Version="0.92.1"
 				ModuleDefinitionFile="$(InputDir)/libclamav.def"
 				GenerateDebugInformation="true"
 				AssemblyDebug="1"
@@ -156,7 +156,7 @@
 				Name="VCLinkerTool"
 				UseUnicodeResponseFiles="false"
 				AdditionalDependencies="ws2_32.lib &quot;$(ProjectDir)pthread\pthreadVC2.lib&quot; &quot;$(TargetDir)\libclamunrar_iface.lib&quot;"
-				Version="0.93"
+				Version="0.92.1"
 				ModuleDefinitionFile="$(InputDir)/libclamav.def"
 				SubSystem="2"
 			/>
@@ -299,6 +299,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\jscript.c"
+				>
+			</File>
+			<File
 				RelativePath=".\line.c"
 				>
 			</File>
@@ -379,6 +383,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\pst.c"
+				>
+			</File>
+			<File
 				RelativePath=".\readdb.c"
 				>
 			</File>
@@ -689,6 +697,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\jscript.h"
+				>
+			</File>
+			<File
 				RelativePath=".\libclamav.h"
 				>
 			</File>
@@ -773,6 +785,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\pst.h"
+				>
+			</File>
+			<File
 				RelativePath=".\readdb.h"
 				>
 			</File>
diff --git a/contrib/Windows/Projects/clamAV/libclamunrar/libclamunrar.def b/contrib/Windows/Projects/clamAV/libclamunrar/libclamunrar.def
index a264f0d..de8a797 100755
--- a/contrib/Windows/Projects/clamAV/libclamunrar/libclamunrar.def
+++ b/contrib/Windows/Projects/clamAV/libclamunrar/libclamunrar.def
@@ -1,7 +1,7 @@
 LIBRARY libClamunrar
-VERSION 0.93
+VERSION 0.92.1
 EXPORTS rar_unpack @1
 EXPORTS rar_init_filters @2
 EXPORTS ppm_destructor @3
 EXPORTS ppm_constructor @4
-EXPORTS rarvm_free @5
+EXPORTS rarvm_free @5
\ No newline at end of file
diff --git a/contrib/Windows/Projects/clamAV/libclamunrar/libclamunrar.vcproj b/contrib/Windows/Projects/clamAV/libclamunrar/libclamunrar.vcproj
index ad2b0d1..8de720a 100755
--- a/contrib/Windows/Projects/clamAV/libclamunrar/libclamunrar.vcproj
+++ b/contrib/Windows/Projects/clamAV/libclamunrar/libclamunrar.vcproj
@@ -72,7 +72,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				UseUnicodeResponseFiles="false"
-				Version="0.93"
+				Version="0.92.1"
 				LinkIncremental="2"
 				ModuleDefinitionFile="$(InputDir)/libclamunrar.def"
 				GenerateDebugInformation="true"
@@ -159,7 +159,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				UseUnicodeResponseFiles="false"
-				Version="0.93"
+				Version="0.92.1"
 				LinkIncremental="1"
 				ModuleDefinitionFile="$(InputDir)/libclamunrar.def"
 				GenerateDebugInformation="true"
diff --git a/contrib/Windows/Projects/clamAV/libclamunrar_iface/libclamunrar_iface.def b/contrib/Windows/Projects/clamAV/libclamunrar_iface/libclamunrar_iface.def
index 0a8d291..6448f8e 100644
--- a/contrib/Windows/Projects/clamAV/libclamunrar_iface/libclamunrar_iface.def
+++ b/contrib/Windows/Projects/clamAV/libclamunrar_iface/libclamunrar_iface.def
@@ -1,6 +1,6 @@
 LIBRARY libClamunrar_iface
-VERSION 0.93
+VERSION 0.92.1
 EXPORTS unrar_extract_next @1
 EXPORTS unrar_extract_next_prepare @2
 EXPORTS unrar_open @3
-EXPORTS unrar_close @4
+EXPORTS unrar_close @4
\ No newline at end of file

-- 
Debian repository for ClamAV



More information about the Pkg-clamav-commits mailing list