Skip to content

Commit

Permalink
debian fix: git used to be in git-core
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed May 11, 2011
1 parent cba683f commit b661049
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -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),
git,
git-core | git,
txt2tags,
doxygen
Build-Conflicts: libqgis-dev, qgis-dev
Expand Down
2 changes: 1 addition & 1 deletion debian/control.hardy
Original file line number Diff line number Diff line change
Expand Up @@ -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, git
python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, fcgi-dev, git-core
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.8.0
XS-Python-Version: current
Expand Down
2 changes: 1 addition & 1 deletion debian/control.intrepid
Original file line number Diff line number Diff line change
Expand Up @@ -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,
git, doxygen, graphviz, txt2tags
git-core, doxygen, graphviz, txt2tags
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.8.0
XS-Python-Version: current
Expand Down
2 changes: 1 addition & 1 deletion debian/control.jaunty
Original file line number Diff line number Diff line change
Expand Up @@ -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,
git, doxygen, graphviz, txt2tags
git-core, doxygen, graphviz, txt2tags
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.8.0
XS-Python-Version: current
Expand Down
2 changes: 1 addition & 1 deletion debian/control.karmic
Original file line number Diff line number Diff line change
Expand Up @@ -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,
git, doxygen, graphviz, txt2tags
git-core, doxygen, graphviz, txt2tags
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.8.0
XS-Python-Version: current
Expand Down
2 changes: 1 addition & 1 deletion debian/control.lenny
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Build-Depends:
python-qt4-dev (>=4.1.0),
python-sip4-dev (>= 4.5.0),
sip4 (>= 4.5),
git,
git-core,
doxygen,
graphviz,
txt2tags
Expand Down
2 changes: 1 addition & 1 deletion debian/control.lucid
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Build-Depends:
python-qt4-dev (>=4.1.0),
python-sip (>= 4.5.0),
python-sip-dev (>= 4.5.0),
git,
git-core,
doxygen,
graphviz,
txt2tags
Expand Down

0 comments on commit b661049

Please sign in to comment.