Merge 1.3.6 671:672 into 1.4.2 and trunk

cmake/CMakeLists_cpack.txt

@@ -100,13 +100,35 @@ IF(WIN32)
 	SET(CPACK_PACKAGE_EXECUTABLES qsynergy;Synergy+)
 ENDIF(WIN32)
 
-# For source package, leave out temp and Mercurial stuff.
+# files to exclude from src package (regex patterns)
+# to escape, use 4 backslashes (\\\\) -- yuck!
 SET(CPACK_SOURCE_IGNORE_FILES
-	"/bin/"			# Temp binary output dir.
-	"/.hg/"			# Mercurial repo cache.
-	"/.hgignore"	# Mercurial ignore list (not neede by end-user).
-	".*~"			# Emacs temporary files.
-	"/config.h$"		# The config.h file should be generated.
+	# temp output dir in root
+	"/bin/"
+
+	# generated config.h file
+	"/config\\\\.h$"
+
+	# buildbot stuff
+	"\\\\.buildbot\\\\-sourcedata$"
+
+	# qt temp build dir
+	"/gui/tmp/.*"
+
+	# qt make file
+	"/gui/Makefile$"
+
+	# qt generated ui headers
+	"/gui/ui_.*\\\\.h$"
+
+	# compiled python files
+	".*\\\\.pyc$"
+
+	# subversion caches (all dirs)
+	".*/\\\\.svn/.*"
+
+	# emacs temporary files
+	".*~$"
 )
 
 # Must be last (since it relies of CPACK_ vars).