Merge compiz:mitya57/bzr-to-git into compiz:master

[Dmitry Shachnev]

Various fixes for bzr → git migration:

- Remove unused CMake variable: IS_BZR_REPO.
- Remove unused files: .bzr-builddeb/default.conf, .bzrignore.
- Use ‘git archive’ for generating tarballs.
- Use ‘git shortlog -se’ for generating AUTHORS file (see also mitya57/mailmap branch).

[Marco Trevisan (Treviño) (3v1n0)]

Thanks!

review: Approve

[Alberts Muktupāvels (muktupavels)]

review: Approve

diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf
deleted file mode 100644
index 6c96a98..0000000
--- a/.bzr-builddeb/default.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[BUILDDEB]
-split = True
diff --git a/.bzrignore b/.bzrignore
deleted file mode 100644
index 7b46b22..0000000
--- a/.bzrignore
+++ /dev/null
@@ -1 +0,0 @@
-.bzr-repo
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..0e65005
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,3 @@
+/debian export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
diff --git a/cmake/CompizCommon.cmake b/cmake/CompizCommon.cmake
index 0b9f858..e48da17 100644
--- a/cmake/CompizCommon.cmake
+++ b/cmake/CompizCommon.cmake
@@ -95,12 +95,6 @@ set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${COMMON_LINKER_FLA
 set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${COMMON_LINKER_FLAGS}")
 set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${COMMON_LINKER_FLAGS}")
 
-if (IS_DIRECTORY ${CMAKE_SOURCE_DIR}/.bzr)
-    set(IS_BZR_REPO 1)
-elseif (IS_DIRECTORY ${CMAKE_SOURCE_DIR}/.bzr)
-    set(IS_BZR_REPO 0)
-endif (IS_DIRECTORY ${CMAKE_SOURCE_DIR}/.bzr)
-
 set (USE_GLES ${BUILD_GLES})
 
 if (USE_GLES)
@@ -299,10 +293,7 @@ endfunction ()
 macro (compiz_add_git_dist)
 
 	add_custom_target (dist
-			   COMMAND bzr export ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}-${VERSION} 
-			   && rm -rf ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}-${VERSION}/debian
-			   && tar -C ${CMAKE_BINARY_DIR} -cj ${CMAKE_PROJECT_NAME}-${VERSION} -f ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}-${VERSION}.tar.bz2
-			   && rm -rf  ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}-${VERSION}
+			   COMMAND git archive -o ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}-${VERSION}.tar.xz --prefix=${CMAKE_PROJECT_NAME}-${VERSION}/ HEAD
 			   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 
 endmacro ()
@@ -399,12 +390,8 @@ macro (compiz_add_release)
 		message ("-- Using auto news update: " ${AUTO_NEWS_UPDATE})
 	endif (AUTO_NEWS_UPDATE)
 
-	if (NOT EXISTS ${CMAKE_SOURCE_DIR}/.AUTHORS.sed)
-		file (WRITE ${CMAKE_SOURCE_DIR}/.AUTHORS.sed "")
-	endif (NOT EXISTS ${CMAKE_SOURCE_DIR}/.AUTHORS.sed)
-
 	add_custom_target (authors
-			   COMMAND bzr log --long --levels=0 | grep -e "^\\s*author:" -e "^\\s*committer:" | cut -d ":" -f 2 | sed -r -f ${CMAKE_SOURCE_DIR}/.AUTHORS.sed  | sort -u > AUTHORS
+			   COMMAND git shortlog -se | cut -c8- | grep -vE \"<=?>\" | grep -v \"(none)\" | sort > AUTHORS
 			   COMMENT "Generating AUTHORS")
 
 	if (AUTO_NEWS_UPDATE)