diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index bee9eac..f5ca592 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -41,21 +41,6 @@
 #     Mandatory : YES
 #     Default   : 'optional'
 #     The debian package priority
-# CPACK_DEBIAN_PACKAGE_HOMEPAGE
-#     Mandatory : NO
-#     Default   : -
-#     The URL of the web site for this package
-# CPACK_DEBIAN_PACKAGE_SHLIBDEPS
-#     Mandatory : NO
-#     Default   : ON
-#     May be set to OFF to not using dpkg-shlibdeps to generate
-#     package dependecy list.
-# CPACK_DEBIAN_PACKAGE_DEBUG
-#     Mandatory : NO
-#     Default   : -
-#     May be set when invoking cpack in order to trace debug informations 
-#     during CPackDeb run. 
-
 
 #=============================================================================
 # Copyright 2007-2009 Kitware, Inc.
@@ -84,115 +69,6 @@ IF(NOT UNIX)
   MESSAGE(FATAL_ERROR "CPackDeb.cmake may only be used under UNIX.")
 ENDIF(NOT UNIX)
 
-# CPACK_DEBIAN_PACKAGE_SHLIBDEPS
-# If specify OFF, only user depends are used
-IF(NOT DEFINED CPACK_DEBIAN_PACKAGE_SHLIBDEPS)
-  SET(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
-ENDIF(NOT DEFINED CPACK_DEBIAN_PACKAGE_SHLIBDEPS)
-
-IF(CPACK_DEBIAN_PACKAGE_SHLIBDEPS)
-	# dpkg-shlibdeps is a Debian utility for generating dependency list
-	FIND_PROGRAM(SHLIBDEPS_EXECUTABLE dpkg-shlibdeps)
-
-	# Check version of the dpkg-shlibdeps tool using CPackRPM method
-	IF(SHLIBDEPS_EXECUTABLE)
-	  EXECUTE_PROCESS(COMMAND ${SHLIBDEPS_EXECUTABLE} --version
-							OUTPUT_VARIABLE _TMP_VERSION
-							ERROR_QUIET
-							OUTPUT_STRIP_TRAILING_WHITESPACE)
-	  STRING(REGEX MATCH "dpkg-shlibdeps version ([0-9]+\\.[0-9]+\\.[0-9]+)"   
-				SHLIBDEPS_EXECUTABLE_VERSION
-				${_TMP_VERSION})     
-	  SET(SHLIBDEPS_EXECUTABLE_VERSION "${CMAKE_MATCH_1}")    
-	  IF(CPACK_DEBIAN_PACKAGE_DEBUG)
-		 MESSAGE( "CPackDeb Debug: dpkg-shlibdeps version is <${SHLIBDEPS_EXECUTABLE_VERSION}>")
-	  ENDIF(CPACK_DEBIAN_PACKAGE_DEBUG)  
-	  
-	  # Generating binary list - Get type of all install files
-	  EXECUTE_PROCESS(COMMAND find -type f
-			  COMMAND xargs file		  
-			  WORKING_DIRECTORY "${CPACK_TEMPORARY_DIRECTORY}"
-							OUTPUT_VARIABLE CPACK_DEB_INSTALL_FILES)
-
-	  # Convert to CMake list
-	  STRING(REGEX REPLACE "\n" ";" CPACK_DEB_INSTALL_FILES ${CPACK_DEB_INSTALL_FILES})
-
-	  # Only dynamically linked ELF files are included
-	  # Extract only file name infront of ":"
-	  FOREACH ( _FILE ${CPACK_DEB_INSTALL_FILES})
-		  IF ( ${_FILE} MATCHES "ELF.*dynamically linked")
-				STRING(REGEX MATCH "(^.*):" _FILE_NAME ${_FILE})
-		 LIST(APPEND CPACK_DEB_BINARY_FILES ${CMAKE_MATCH_1})
-		  ENDIF()
-	  ENDFOREACH()
-
-	  MESSAGE( "CPack: - Generating dependency list")
-
-	  # Create blank control file for running dpkg-shlibdeps
-	  # There might be some other way to invoke dpkg-shlibdeps without creating this file
-	  # but standard debian package should not have anything that can collide with this file or directory
-	  FILE(MAKE_DIRECTORY ${CPACK_TEMPORARY_DIRECTORY}/debian)
-	  FILE(WRITE ${CPACK_TEMPORARY_DIRECTORY}/debian/control "")	
-
-	  # Execute dpkg-shlibdeps
-	  # --ignore-missing-info : allow dpkg-shlibdeps to run even if some libs do not belong to a package
-	  # -O : print to STDOUT
-	  EXECUTE_PROCESS(COMMAND ${SHLIBDEPS_EXECUTABLE} --ignore-missing-info -O ${CPACK_DEB_BINARY_FILES}
-			  WORKING_DIRECTORY "${CPACK_TEMPORARY_DIRECTORY}"
-							OUTPUT_VARIABLE SHLIBDEPS_OUTPUT
-			  RESULT_VARIABLE SHLIBDEPS_RESULT
-			  ERROR_VARIABLE SHLIBDEPS_ERROR
-			  OUTPUT_STRIP_TRAILING_WHITESPACE )
-	  IF(CPACK_DEBIAN_PACKAGE_DEBUG)
-		 # dpkg-shlibdeps will throw some warnings if some input files are not binary 
-		 MESSAGE( "CPackDeb Debug: dpkg-shlibdeps warnings \n${SHLIBDEPS_ERROR}")
-	  ENDIF(CPACK_DEBIAN_PACKAGE_DEBUG)
-	  IF (NOT SHLIBDEPS_RESULT EQUAL 0)
-		  MESSAGE (FATAL_ERROR "dpkg-shlibdeps: ${SHLIBDEPS_ERROR}")
-	  ENDIF (NOT SHLIBDEPS_RESULT EQUAL 0)  
-	  
-	  #Get rid of prefix generated by dpkg-shlibdeps
-	  string (REGEX REPLACE "^.*Depends=" "" CPACK_DEBIAN_PACKAGE_AUTO_DEPENDS ${SHLIBDEPS_OUTPUT})
-
-	  IF(CPACK_DEBIAN_PACKAGE_DEBUG)
-		 MESSAGE( "CPackDeb Debug: Found dependency: ${CPACK_DEBIAN_PACKAGE_AUTO_DEPENDS}")
-	  ENDIF(CPACK_DEBIAN_PACKAGE_DEBUG)   
-
-	  # Remove blank control file
-	  # Might not be safe if package actual contain file or directory named debian
-	  FILE(REMOVE_RECURSE "${CPACK_TEMPORARY_DIRECTORY}/debian")
-
-	  # Append user depend if set
-	  IF (CPACK_DEBIAN_PACKAGE_DEPENDS)
-		 SET (CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_AUTO_DEPENDS}, ${CPACK_DEBIAN_PACKAGE_DEPENDS}")
-	  ELSE (CPACK_DEBIAN_PACKAGE_DEPENDS)
-		 SET (CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_AUTO_DEPENDS}")
-	  ENDIF (CPACK_DEBIAN_PACKAGE_DEPENDS)
-
-	ELSE (SHLIBDEPS_EXECUTABLE)
-		IF(CPACK_DEBIAN_PACKAGE_DEBUG)
-		 MESSAGE( "CPackDeb Debug: Using only user-provided depends because dpkg-shlibdeps is not found")
-		ENDIF(CPACK_DEBIAN_PACKAGE_DEBUG) 		
-	ENDIF(SHLIBDEPS_EXECUTABLE)
-
-ELSE (CPACK_DEBIAN_PACKAGE_SHLIBDEPS)
-	IF(CPACK_DEBIAN_PACKAGE_DEBUG)
-		 MESSAGE( "CPackDeb Debug: Using only user-provided depends")
-	ENDIF(CPACK_DEBIAN_PACKAGE_DEBUG) 		
-ENDIF(CPACK_DEBIAN_PACKAGE_SHLIBDEPS)
-
-# Generate top-level folders
-# so that empty folders are also included
-EXECUTE_PROCESS(COMMAND find -mindepth 1 -maxdepth 1 -type d
-	  WORKING_DIRECTORY "${CPACK_TEMPORARY_DIRECTORY}"
-	  OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_TOP_DIRS
-	  OUTPUT_STRIP_TRAILING_WHITESPACE )
-
-STRING(REGEX REPLACE "\n" " " CPACK_DEBIAN_PACKAGE_TOP_DIRS ${CPACK_DEBIAN_PACKAGE_TOP_DIRS})
-IF(CPACK_DEBIAN_PACKAGE_DEBUG)
-    MESSAGE( "CPackDeb Debug: Top-level directories: ${CPACK_DEBIAN_PACKAGE_TOP_DIRS}")
-ENDIF(CPACK_DEBIAN_PACKAGE_DEBUG)
-
 # Let's define the control file found in debian package:
 
 # Binary package:
diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx
index a7680d8..9c77cc1 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -91,11 +91,6 @@ int cmCPackDebGenerator::CompressFiles(const char* outFileName,
                             this->GetOption("CPACK_DEBIAN_PACKAGE_RECOMMENDS");
   const char* debian_pkg_sug = 
                               this->GetOption("CPACK_DEBIAN_PACKAGE_SUGGESTS");
-  const char* debian_pkg_url = 
-                              this->GetOption("CPACK_DEBIAN_PACKAGE_HOMEPAGE");
-
-  //top-level directories
-  const char* top_dirs = this->GetOption("CPACK_DEBIAN_PACKAGE_TOP_DIRS");
 
     { // the scope is needed for cmGeneratedFileStream
     cmGeneratedFileStream out(ctlfilename.c_str());
@@ -104,7 +99,7 @@ int cmCPackDebGenerator::CompressFiles(const char* outFileName,
     out << "Section: " << debian_pkg_section << "\n";
     out << "Priority: " << debian_pkg_priority << "\n";
     out << "Architecture: " << debian_pkg_arch << "\n";
-	if(debian_pkg_dep)
+    if(debian_pkg_dep)
       {
       out << "Depends: " << debian_pkg_dep << "\n";
       }
@@ -116,10 +111,6 @@ int cmCPackDebGenerator::CompressFiles(const char* outFileName,
       {
       out << "Suggests: " << debian_pkg_sug << "\n";
       }
-	if(debian_pkg_url)
-      {
-      out << "Homepage: " << debian_pkg_url << "\n";
-      }
     unsigned long totalSize = 0;
     {
       std::string dirName = this->GetOption("CPACK_TEMPORARY_DIRECTORY");
@@ -140,27 +131,25 @@ int cmCPackDebGenerator::CompressFiles(const char* outFileName,
   cmd = "\"";
   cmd += cmakeExecutable;
   cmd += "\" -E tar cfz data.tar.gz ";
-  cmd += top_dirs;
-
 
   // now add all directories which have to be compressed
   // collect all top level install dirs for that
   // e.g. /opt/bin/foo, /usr/bin/bar and /usr/bin/baz would give /usr and /opt
-  //int topLevelLength = strlen(toplevel);
-  //std::set<std::string> installDirs;
-  //for (std::vector<std::string>::const_iterator fileIt = files.begin(); 
-  //     fileIt != files.end(); ++ fileIt )
-  //  {
-  //  std::string::size_type slashPos = fileIt->find('/', topLevelLength+1);
-  //  std::string relativeDir = fileIt->substr(topLevelLength, 
-  //                                           slashPos - topLevelLength);
-  //  if (installDirs.find(relativeDir) == installDirs.end())
-  //    {
-  //    installDirs.insert(relativeDir);
-  //    cmd += " .";
-  //    cmd += relativeDir;
-  //    }
-  //  }
+  int topLevelLength = strlen(toplevel);
+  std::set<std::string> installDirs;
+  for (std::vector<std::string>::const_iterator fileIt = files.begin(); 
+       fileIt != files.end(); ++ fileIt )
+    {
+    std::string::size_type slashPos = fileIt->find('/', topLevelLength+1);
+    std::string relativeDir = fileIt->substr(topLevelLength, 
+                                             slashPos - topLevelLength);
+    if (installDirs.find(relativeDir) == installDirs.end())
+      {
+      installDirs.insert(relativeDir);
+      cmd += " .";
+      cmd += relativeDir;
+      }
+    }
 
   std::string output;
   int retVal = -1;
@@ -235,13 +224,6 @@ int cmCPackDebGenerator::CompressFiles(const char* outFileName,
       if( cmsys::SystemTools::CopyFileIfDifferent(
             i->c_str(), localcopy.c_str()) )
         {
-		// Set proper permission for control scripts
-        if (!filenamename.compare("prerm")||!filenamename.compare("postrm")||
-			!filenamename.compare("preinst")||!filenamename.compare("postinst"))
-          {
-             cmsys::SystemTools::SetPermissions(localcopy.c_str(), 0755);
-          }
- 
         // debian is picky and need relative to ./ path in the tar.gz
         cmd += " ./";
         cmd += filenamename;

--- old/Source/CPack/cmCPackDebGenerator.cxx	2009-11-13 19:32:58.000000000 +0100
+++ new/Source/CPack/cmCPackDebGenerator.cxx	2010-02-15 13:25:36.587444759 +0100
@@ -121,7 +121,7 @@
         totalSize += cmSystemTools::FileLength(fileIt->c_str());
         }
     }
-    out << "Installed-Size: " << totalSize << "\n";
+    out << "Installed-Size: " << totalSize / 1024 << "\n";
     out << "Maintainer: " << maintainer << "\n";
     out << "Description: " << desc << "\n";
     out << std::endl;