Merge branch 'master' into experimental
Conflicts: debian/changelog
This commit is contained in:
commit
5c05612a4d
4
.gitignore
vendored
Normal file
4
.gitignore
vendored
Normal file
@ -0,0 +1,4 @@
|
||||
*~
|
||||
.*
|
||||
!.gitignore
|
||||
!.gitattributes
|
9
debian/changelog
vendored
9
debian/changelog
vendored
@ -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.
|
||||
|
2
debian/gbp.conf
vendored
Normal file
2
debian/gbp.conf
vendored
Normal file
@ -0,0 +1,2 @@
|
||||
[DEFAULT]
|
||||
pristine-tar = True
|
1
debian/source/local-options
vendored
Normal file
1
debian/source/local-options
vendored
Normal file
@ -0,0 +1 @@
|
||||
unapply-patches
|
3
debian/watch
vendored
3
debian/watch
vendored
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user