[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

aCaB acab at clamav.net
Sun Apr 4 01:07:45 UTC 2010


The following commit has been merged in the debian/unstable branch:
commit fc3306e49e4693026bc1c601b00bceebce20bd45
Author: aCaB <acab at clamav.net>
Date:   Mon Oct 12 23:38:00 2009 +0200

    win32: reorder libclamav's vcproj to avoid filename clashes

diff --git a/win32/clamav-config.h b/win32/clamav-config.h
index 70862cd..087f49e 100644
--- a/win32/clamav-config.h
+++ b/win32/clamav-config.h
@@ -444,7 +444,7 @@
 /* #undef NEED_USCORE */
 
 /* bzip funtions do not have bz2 prefix */
-/* #undef NOBZ2PREFIX */
+/* #define NOBZ2PREFIX */
 
 /* "no fd_set" */
 /* #undef NO_FD_SET */
diff --git a/win32/libclamav.vcproj b/win32/libclamav.vcproj
index f87afd1..3acdb3c 100644
--- a/win32/libclamav.vcproj
+++ b/win32/libclamav.vcproj
@@ -186,42 +186,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\libclamav\7z\7zBuf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libclamav\7z\7zCrc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libclamav\7z\Archive\7z\7zDecode.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libclamav\7z\Archive\7z\7zExtract.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libclamav\7z\7zFile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libclamav\7z\Archive\7z\7zHeader.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libclamav\7z\Archive\7z\7zIn.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libclamav\7z\Archive\7z\7zItem.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libclamav\7z\7zStream.c"
-				>
-			</File>
-			<File
 				RelativePath="..\libclamav\aspack.c"
 				>
 			</File>
@@ -230,10 +194,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\libclamav\7z\Bcj2.c"
-				>
-			</File>
-			<File
 				RelativePath="..\libclamav\bignum.c"
 				>
 			</File>
@@ -246,18 +206,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\libclamav\7z\Bra.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libclamav\7z\Bra86.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libclamav\7z\BraIA64.c"
-				>
-			</File>
-			<File
 				RelativePath="..\libclamav\bytecode.c"
 				>
 			</File>
@@ -274,10 +222,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\libclamav\nsis\bzlib.c"
-				>
-			</File>
-			<File
 				RelativePath="..\libclamav\cab.c"
 				>
 			</File>
@@ -346,10 +290,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\libclamav\nsis\infblock.c"
-				>
-			</File>
-			<File
 				RelativePath="..\libclamav\inflate64.c"
 				>
 			</File>
@@ -362,10 +302,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\libclamav\jsparse\js-norm.c"
-				>
-			</File>
-			<File
 				RelativePath="..\libclamav\line.c"
 				>
 			</File>
@@ -378,10 +314,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\libclamav\7z\LzmaDec.c"
-				>
-			</File>
-			<File
 				RelativePath="..\libclamav\macho.c"
 				>
 			</File>
@@ -430,10 +362,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\libclamav\nsis\nulsft.c"
-				>
-			</File>
-			<File
 				RelativePath="..\libclamav\ole2_extract.c"
 				>
 			</File>
@@ -486,14 +414,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\libclamav\regex\regcomp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libclamav\regex\regerror.c"
-				>
-			</File>
-			<File
 				RelativePath="..\libclamav\regex_list.c"
 				>
 			</File>
@@ -502,14 +422,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\libclamav\regex\regexec.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libclamav\regex\regfree.c"
-				>
-			</File>
-			<File
 				RelativePath="..\libclamav\rtf.c"
 				>
 			</File>
@@ -538,10 +450,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\libclamav\regex\strlcpy.c"
-				>
-			</File>
-			<File
 				RelativePath="..\libclamav\table.c"
 				>
 			</File>
@@ -609,6 +517,258 @@
 				RelativePath="..\libclamav\yc.c"
 				>
 			</File>
+			<Filter
+				Name="nsis"
+				>
+				<File
+					RelativePath="..\libclamav\nsis\bzlib.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\nsis_bzlib"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\nsis_bzlib"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\libclamav\nsis\infblock.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\nsis_infblock"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\nsis_infblock"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\libclamav\nsis\nulsft.c"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="jsparse"
+				>
+				<File
+					RelativePath="..\libclamav\jsparse\js-norm.c"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="7z"
+				>
+				<File
+					RelativePath="..\libclamav\7z\7zBuf.c"
+					>
+				</File>
+				<File
+					RelativePath="..\libclamav\7z\7zCrc.c"
+					>
+				</File>
+				<File
+					RelativePath="..\libclamav\7z\Archive\7z\7zDecode.c"
+					>
+				</File>
+				<File
+					RelativePath="..\libclamav\7z\Archive\7z\7zExtract.c"
+					>
+				</File>
+				<File
+					RelativePath="..\libclamav\7z\7zFile.c"
+					>
+				</File>
+				<File
+					RelativePath="..\libclamav\7z\Archive\7z\7zHeader.c"
+					>
+				</File>
+				<File
+					RelativePath="..\libclamav\7z\Archive\7z\7zIn.c"
+					>
+				</File>
+				<File
+					RelativePath="..\libclamav\7z\Archive\7z\7zItem.c"
+					>
+				</File>
+				<File
+					RelativePath="..\libclamav\7z\7zStream.c"
+					>
+				</File>
+				<File
+					RelativePath="..\libclamav\7z\Bcj2.c"
+					>
+				</File>
+				<File
+					RelativePath="..\libclamav\7z\Bra.c"
+					>
+				</File>
+				<File
+					RelativePath="..\libclamav\7z\Bra86.c"
+					>
+				</File>
+				<File
+					RelativePath="..\libclamav\7z\LzmaDec.c"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="regex"
+				>
+				<File
+					RelativePath="..\libclamav\regex\regcomp.c"
+					>
+				</File>
+				<File
+					RelativePath="..\libclamav\regex\regerror.c"
+					>
+				</File>
+				<File
+					RelativePath="..\libclamav\regex\regexec.c"
+					>
+				</File>
+				<File
+					RelativePath="..\libclamav\regex\regfree.c"
+					>
+				</File>
+				<File
+					RelativePath="..\libclamav\regex\strlcpy.c"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="bzip2"
+				>
+				<File
+					RelativePath=".\3rdparty\bzip2\blocksort.c"
+					>
+				</File>
+				<File
+					RelativePath=".\3rdparty\bzip2\bzlib.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\3rdparty\bzip2\compress.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\compress_bzip2"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\compress_bzip2"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\3rdparty\bzip2\crctable.c"
+					>
+				</File>
+				<File
+					RelativePath=".\3rdparty\bzip2\decompress.c"
+					>
+				</File>
+				<File
+					RelativePath=".\3rdparty\bzip2\huffman.c"
+					>
+				</File>
+				<File
+					RelativePath=".\3rdparty\bzip2\randtable.c"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="zib"
+				>
+				<File
+					RelativePath=".\3rdparty\zlib\adler32.c"
+					>
+				</File>
+				<File
+					RelativePath=".\3rdparty\zlib\compress.c"
+					>
+				</File>
+				<File
+					RelativePath=".\3rdparty\zlib\crc32.c"
+					>
+				</File>
+				<File
+					RelativePath=".\3rdparty\zlib\deflate.c"
+					>
+				</File>
+				<File
+					RelativePath=".\3rdparty\zlib\gzio.c"
+					>
+				</File>
+				<File
+					RelativePath=".\3rdparty\zlib\inffast.c"
+					>
+				</File>
+				<File
+					RelativePath=".\3rdparty\zlib\inflate.c"
+					>
+				</File>
+				<File
+					RelativePath=".\3rdparty\zlib\inftrees.c"
+					>
+				</File>
+				<File
+					RelativePath=".\3rdparty\zlib\trees.c"
+					>
+				</File>
+				<File
+					RelativePath=".\3rdparty\zlib\uncompr.c"
+					>
+				</File>
+				<File
+					RelativePath=".\3rdparty\zlib\zutil.c"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="shared"
+				>
+				<File
+					RelativePath="..\shared\getopt.c"
+					>
+				</File>
+				<File
+					RelativePath="..\shared\optparser.c"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Header Files"

-- 
Debian repository for ClamAV



More information about the Pkg-clamav-commits mailing list