more svn=>git stuff

debian/control

@@ -24,7 +24,7 @@ Build-Depends:
  python-dev,
  python-qt4-dev (>=4.1.0),
  python-sip-dev (>= 4.5.0) | python-sip4-dev (>= 4.5.0) | sip4 (>= 4.5),
- subversion,
+ git,
  txt2tags,
  doxygen
 Build-Conflicts: libqgis-dev, qgis-dev

debian/control.hardy

@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
  python-sip4 (>= 4.5.0), python-central (>=0.5), python, sip4 (>= 4.5),
  libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
  libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
- python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, fcgi-dev, subversion
+ python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, fcgi-dev, git
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.0
 XS-Python-Version: current

debian/control.intrepid

@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
  libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
  libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
  python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libfcgi-dev,
- subversion, doxygen, graphviz, txt2tags
+ git, doxygen, graphviz, txt2tags
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.0
 XS-Python-Version: current

debian/control.jaunty

@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
  libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
  libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
  python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libfcgi-dev,
- subversion, doxygen, graphviz, txt2tags
+ git, doxygen, graphviz, txt2tags
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.0
 XS-Python-Version: current

debian/control.karmic

@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
  libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
  libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
  python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libfcgi-dev,
- subversion, doxygen, graphviz, txt2tags
+ git, doxygen, graphviz, txt2tags
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.0
 XS-Python-Version: current

debian/control.lenny

@@ -27,7 +27,7 @@ Build-Depends:
  python-qt4-dev (>=4.1.0),
  python-sip4-dev (>= 4.5.0),
  sip4 (>= 4.5),
- subversion,
+ git,
  doxygen,
  graphviz,
  txt2tags

debian/control.lucid

@@ -28,7 +28,7 @@ Build-Depends:
  python-qt4-dev (>=4.1.0),
  python-sip (>= 4.5.0),
  python-sip-dev (>= 4.5.0),
- subversion,
+ git,
  doxygen,
  graphviz,
  txt2tags 

debian/control.maverick

@@ -29,7 +29,7 @@ Build-Depends:
  python-qt4-dev (>=4.1.0),
  python-sip (>= 4.5.0),
  python-sip-dev (>= 4.5.0),
- subversion,
+ git,
  doxygen,
  graphviz,
  txt2tags 

debian/control.natty

@@ -29,7 +29,7 @@ Build-Depends:
  python-qt4-dev (>=4.1.0),
  python-sip (>= 4.5.0),
  python-sip-dev (>= 4.5.0),
- subversion,
+ git,
  doxygen,
  graphviz,
  txt2tags

debian/control.sid

@@ -29,7 +29,7 @@ Build-Depends:
  python-qt4-dev (>=4.1.0),
  python-sip (>= 4.5.0),
  python-sip-dev (>= 4.5.0),
- subversion,
+ git,
  doxygen,
  graphviz,
  txt2tags

debian/control.squeeze

@@ -28,7 +28,7 @@ Build-Depends:
  python-qt4-dev (>=4.1.0),
  python-sip (>= 4.5.0),
  python-sip-dev (>= 4.5.0),
- subversion,
+ git,
  doxygen,
  graphviz,
  txt2tags 

ms-windows/osgeo4w/package-nightly.cmd

@@ -1,6 +1,5 @@
 @echo off
 set GRASS_VERSION=6.4.1
-set SVNVERSION=c:/cygwin/bin/svnversion
 
 set BUILDDIR=%CD%\build
 REM set BUILDDIR=%TEMP%\qgis_unstable
@@ -111,7 +110,6 @@ cmake -G "Visual Studio 9 2008" ^
 	-D CMAKE_CXX_FLAGS_RELWITHDEBINFO="/MD /ZI /Od /D NDEBUG" ^
 	-D FCGI_INCLUDE_DIR=%O4W_ROOT%/include ^
 	-D FCGI_LIBRARY=%O4W_ROOT%/lib/libfcgi.lib ^
-	-D SVNVERSION="%SVNVERSION%" ^
 	%SRCDIR%>>%LOG% 2>&1
 if errorlevel 1 goto error
 

ms-windows/osgeo4w/package.cmd

@@ -1,6 +1,5 @@
 @echo off
 set GRASS_VERSION=6.4.1
-set SVNVERSION=c:/cygwin/bin/svnversion
 
 set BUILDDIR=%CD%\build
 REM set BUILDDIR=%TEMP%\qgis_unstable
@@ -110,7 +109,6 @@ cmake -G "Visual Studio 9 2008" ^
 	-D CMAKE_CXX_FLAGS_RELWITHDEBINFO="/MD /ZI /Od /D NDEBUG" ^
 	-D FCGI_INCLUDE_DIR=%O4W_ROOT%/include ^
 	-D FCGI_LIBRARY=%O4W_ROOT%/lib/libfcgi.lib ^
-	-D SVNVERSION="%SVNVERSION%" ^
 	%SRCDIR%>>%LOG% 2>&1
 if errorlevel 1 goto error
 

scripts/astyle.sh

@@ -1,9 +1,15 @@
 #!/bin/bash
 
-ASTYLE=$(dirname $0)/astyle
+for ASTYLE in $(dirname $0)/astyle $(dirname $0)/RelWithDebInfo/astyle
+do
+	if type -p $ASTYLE >/dev/null; then
+		break
+	fi
+	ASTYLE=
+done
 
-if ! type -p $ASTYLE >/dev/null; then
-	echo "astyle not found" >&2
+if [ -z "$ASTYLE" ]; then
+	echo "astyle not found - please enable WITH_ASTYLE in cmake and build it" >&2
 	exit 1	
 fi
 

scripts/prepare-commit.sh

@@ -20,7 +20,7 @@ set -e
 if [ -d .svn ]; then
 	MODIFIED=$(svn status | sed -ne "s/^[MA] *//p")
 elif [ -d .git ]; then
-	MODIFIED=$(git status | sed -rne "s/^#	(modified|new file): *//p")
+	MODIFIED=$(git status | sed -rne "s/^#	(modified|new file): *//p" | sort -u)
 else
 	echo No working copy
 	exit 1
@@ -76,6 +76,9 @@ if [ -s "$ASTYLEDIFF" ]; then
 	else
 		echo "Files changed (see $ASTYLEDIFF)"
 	fi
+	exit 1
 else
 	rm $ASTYLEDIFF
 fi
+
+exit 0