Merge branch 'squeeze'

debian/changelog

@@ -131,6 +131,14 @@ cmake (2.8.3-1) experimental; urgency=low
 
  -- Modestas Vainius <modax@debian.org>  Sat, 13 Nov 2010 02:16:34 +0200
 
+cmake (2.8.2+dfsg.1-0+squeeze1) stable-proposed-updates; urgency=low
+
+  * Regenerate original tarball removing files provided under proprietary
+    licence. (Closes: #614390) They were not actually used. Mention removed
+    files in the debian/copyright.
+
+ -- Modestas Vainius <modax@debian.org>  Fri, 04 Mar 2011 22:16:29 +0200
+
 cmake (2.8.2-2) unstable; urgency=low
 
   [ Kai Wasserbäch ]

debian/copyright

@@ -66,6 +66,21 @@ above) and it is copyright by:
   Copyright: © 2008-2010 Modestas Vainius <modax@debian.org>
   Copyright: © 2010 Kai Wasserbäch <debian@carbon-project.org>
 
+
+The following files were removed from the original tarball due to licensing
+issues (proprietary licence, undistributable) (#614390):
+
+  Utilities/cmlibarchive/build/windows/mvcpp.nt
+  Utilities/cmlibarchive/build/windows/vc71/libarchive.sln
+  Utilities/cmlibarchive/build/windows/vc71/libarchive.vcproj
+  Utilities/cmlibarchive/build/windows/vc80/libarchive.sln
+  Utilities/cmlibarchive/build/windows/vc80/libarchive.vcproj
+  Utilities/cmlibarchive/build/windows/vc80/libarchive_test/libarchive_test.vcproj
+  Utilities/cmlibarchive/build/windows/vc90/libarchive.sln
+  Utilities/cmlibarchive/build/windows/vc90/libarchive.vcproj
+  Utilities/cmlibarchive/build/windows/vc90/libarchive_test/libarchive_test.vcproj
+  Utilities/cmlibarchive/build/window/wccpp.nt
+
 Detailed copyright and licensing summary can be found below:
 
   Copyright: © 2002, 2005, 2007 Insight Consortium. All Rights Reserved.