Merge branch 'master' into experimental

Conflicts:
	debian/changelog

.gitignore

@@ -0,0 +1,4 @@
+*~
+.*
+!.gitignore
+!.gitattributes

debian/changelog

@@ -1,3 +1,12 @@
+cmake (2.8.3-2) UNRELEASED; urgency=low
+
+  [ Kai Wasserbäch ]
+  * debian/source/local-options: Added "unapply-patches".
+  * debian/watch: Added git-import-orig invocation.
+  * debian/gbp.conf: Added, to ensure we use pristine-tar.
+
+ -- Modestas Vainius <modax@debian.org>  Fri, 26 Nov 2010 19:36:44 +0200
+
 cmake (2.8.3-1) experimental; urgency=low
 
   * New upstream release.

debian/gbp.conf

@@ -0,0 +1,2 @@
+[DEFAULT]
+pristine-tar = True

debian/source/local-options

@@ -0,0 +1 @@
+unapply-patches

debian/watch

@@ -3,4 +3,5 @@ version=3
 # Track CMake 2.6.x releases including RCs
 opts="uversionmangle=s/-[Rr][Cc]-?(\d+)/~rc$1/i" \
     http://www.cmake.org/files/v([\d.]+)/ \
-    cmake-([\d.]+(?i:-RC-?\d+)?).tar.gz
+    cmake-([\d.]+(?i:-RC-?\d+)?).tar.gz \
+    debian git-import-orig