Skip to content

Commit 16042f9

Browse files
jef-njef-n
committed
more svn=>git stuff
1 parent 69e24e4 commit 16042f9

15 files changed

+24
-19
lines changed

‎debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Build-Depends:
2424
python-dev,
2525
python-qt4-dev (>=4.1.0),
2626
python-sip-dev (>= 4.5.0) | python-sip4-dev (>= 4.5.0) | sip4 (>= 4.5),
27-
subversion,
27+
git,
2828
txt2tags,
2929
doxygen
3030
Build-Conflicts: libqgis-dev, qgis-dev

‎debian/control.hardy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
88
python-sip4 (>= 4.5.0), python-central (>=0.5), python, sip4 (>= 4.5),
99
libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
1010
libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
11-
python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, fcgi-dev, subversion
11+
python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, fcgi-dev, git
1212
Build-Conflicts: libqgis-dev, qgis-dev
1313
Standards-Version: 3.8.0
1414
XS-Python-Version: current

‎debian/control.intrepid

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
99
libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
1010
libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
1111
python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libfcgi-dev,
12-
subversion, doxygen, graphviz, txt2tags
12+
git, doxygen, graphviz, txt2tags
1313
Build-Conflicts: libqgis-dev, qgis-dev
1414
Standards-Version: 3.8.0
1515
XS-Python-Version: current

‎debian/control.jaunty

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
99
libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
1010
libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
1111
python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libfcgi-dev,
12-
subversion, doxygen, graphviz, txt2tags
12+
git, doxygen, graphviz, txt2tags
1313
Build-Conflicts: libqgis-dev, qgis-dev
1414
Standards-Version: 3.8.0
1515
XS-Python-Version: current

‎debian/control.karmic

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
99
libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
1010
libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
1111
python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libfcgi-dev,
12-
subversion, doxygen, graphviz, txt2tags
12+
git, doxygen, graphviz, txt2tags
1313
Build-Conflicts: libqgis-dev, qgis-dev
1414
Standards-Version: 3.8.0
1515
XS-Python-Version: current

‎debian/control.lenny

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Build-Depends:
2727
python-qt4-dev (>=4.1.0),
2828
python-sip4-dev (>= 4.5.0),
2929
sip4 (>= 4.5),
30-
subversion,
30+
git,
3131
doxygen,
3232
graphviz,
3333
txt2tags

‎debian/control.lucid

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Build-Depends:
2828
python-qt4-dev (>=4.1.0),
2929
python-sip (>= 4.5.0),
3030
python-sip-dev (>= 4.5.0),
31-
subversion,
31+
git,
3232
doxygen,
3333
graphviz,
3434
txt2tags

‎debian/control.maverick

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Build-Depends:
2929
python-qt4-dev (>=4.1.0),
3030
python-sip (>= 4.5.0),
3131
python-sip-dev (>= 4.5.0),
32-
subversion,
32+
git,
3333
doxygen,
3434
graphviz,
3535
txt2tags

‎debian/control.natty

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Build-Depends:
2929
python-qt4-dev (>=4.1.0),
3030
python-sip (>= 4.5.0),
3131
python-sip-dev (>= 4.5.0),
32-
subversion,
32+
git,
3333
doxygen,
3434
graphviz,
3535
txt2tags

‎debian/control.sid

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Build-Depends:
2929
python-qt4-dev (>=4.1.0),
3030
python-sip (>= 4.5.0),
3131
python-sip-dev (>= 4.5.0),
32-
subversion,
32+
git,
3333
doxygen,
3434
graphviz,
3535
txt2tags

‎debian/control.squeeze

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Build-Depends:
2828
python-qt4-dev (>=4.1.0),
2929
python-sip (>= 4.5.0),
3030
python-sip-dev (>= 4.5.0),
31-
subversion,
31+
git,
3232
doxygen,
3333
graphviz,
3434
txt2tags

‎ms-windows/osgeo4w/package-nightly.cmd

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
@echo off
22
set GRASS_VERSION=6.4.1
3-
set SVNVERSION=c:/cygwin/bin/svnversion
43

54
set BUILDDIR=%CD%\build
65
REM set BUILDDIR=%TEMP%\qgis_unstable
@@ -111,7 +110,6 @@ cmake -G "Visual Studio 9 2008" ^
111110
-D CMAKE_CXX_FLAGS_RELWITHDEBINFO="/MD /ZI /Od /D NDEBUG" ^
112111
-D FCGI_INCLUDE_DIR=%O4W_ROOT%/include ^
113112
-D FCGI_LIBRARY=%O4W_ROOT%/lib/libfcgi.lib ^
114-
-D SVNVERSION="%SVNVERSION%" ^
115113
%SRCDIR%>>%LOG% 2>&1
116114
if errorlevel 1 goto error
117115

‎ms-windows/osgeo4w/package.cmd

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
@echo off
22
set GRASS_VERSION=6.4.1
3-
set SVNVERSION=c:/cygwin/bin/svnversion
43

54
set BUILDDIR=%CD%\build
65
REM set BUILDDIR=%TEMP%\qgis_unstable
@@ -110,7 +109,6 @@ cmake -G "Visual Studio 9 2008" ^
110109
-D CMAKE_CXX_FLAGS_RELWITHDEBINFO="/MD /ZI /Od /D NDEBUG" ^
111110
-D FCGI_INCLUDE_DIR=%O4W_ROOT%/include ^
112111
-D FCGI_LIBRARY=%O4W_ROOT%/lib/libfcgi.lib ^
113-
-D SVNVERSION="%SVNVERSION%" ^
114112
%SRCDIR%>>%LOG% 2>&1
115113
if errorlevel 1 goto error
116114

‎scripts/astyle.sh

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
#!/bin/bash
22

3-
ASTYLE=$(dirname $0)/astyle
3+
for ASTYLE in $(dirname $0)/astyle $(dirname $0)/RelWithDebInfo/astyle
4+
do
5+
if type -p $ASTYLE >/dev/null; then
6+
break
7+
fi
8+
ASTYLE=
9+
done
410

5-
if ! type -p $ASTYLE >/dev/null; then
6-
echo "astyle not found" >&2
11+
if [ -z "$ASTYLE" ]; then
12+
echo "astyle not found - please enable WITH_ASTYLE in cmake and build it" >&2
713
exit 1
814
fi
915

‎scripts/prepare-commit.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ set -e
2020
if [ -d .svn ]; then
2121
MODIFIED=$(svn status | sed -ne "s/^[MA] *//p")
2222
elif [ -d .git ]; then
23-
MODIFIED=$(git status | sed -rne "s/^# (modified|new file): *//p")
23+
MODIFIED=$(git status | sed -rne "s/^# (modified|new file): *//p" | sort -u)
2424
else
2525
echo No working copy
2626
exit 1
@@ -76,6 +76,9 @@ if [ -s "$ASTYLEDIFF" ]; then
7676
else
7777
echo "Files changed (see $ASTYLEDIFF)"
7878
fi
79+
exit 1
7980
else
8081
rm $ASTYLEDIFF
8182
fi
83+
84+
exit 0

0 commit comments

Comments
 (0)