Skip to content

Commit

Permalink
Fixed dependencies version management
Browse files Browse the repository at this point in the history
  • Loading branch information
nastasi-oq committed May 7, 2015
1 parent d5dfd3e commit fe00b80
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
7 changes: 7 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
python-oq-engine (1.4.0-1~precise01) precise; urgency=low

[Matteo Nastasi, Daniele Viganò]
* Fixed dependencies veersion management

-- Matteo Nastasi (GEM Foundation) <[email protected]> Thu, 07 May 2015 14:14:09 +0200

python-oq-engine (1.4.0-0~precise01) precise; urgency=low

[Matteo Nastasi, Daniele Viganò]
Expand Down
2 changes: 1 addition & 1 deletion debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Homepage: http://www.globalquakemodel.org/openquake/
Package: python-oq-engine
Architecture: all
Conflicts: python-noq, python-oq
Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.6), debconf, ${dist:Depends}, python-celery (>=2.4.6-1ubuntu0.2~gem03), python-geohash, python-lxml, python-numpy, python-paramiko, python-scipy, python-shapely, python-psycopg2, python-setuptools, python-psutil, python-mock, python-oq-hazardlib (>=0.14.0), python-oq-risklib (>=0.7.0), python-concurrent.futures (>=2.1.2), rabbitmq-server (>=2.8.0-2~gem02)
Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.6), debconf, ${dist:Depends}, python-celery (>=2.4.6-1ubuntu0.2~gem03), python-geohash, python-lxml, python-numpy, python-paramiko, python-scipy, python-shapely, python-psycopg2, python-setuptools, python-psutil, python-mock, python-oq-hazardlib (>=0.14.0-0~), python-oq-risklib (>=0.7.0-1~), python-concurrent.futures (>=2.1.2), rabbitmq-server (>=2.8.0-2~gem02)
Recommends: ${dist:Recommends}, postgresql-client
Description: computes seismic hazard and physical risk
based on the hazard and risk libraries (python-oq-hazardlib,
Expand Down
2 changes: 1 addition & 1 deletion packager.sh
Original file line number Diff line number Diff line change
Expand Up @@ -987,7 +987,7 @@ if [ $BUILD_DEVEL -eq 1 ]; then
mv debian/changelog debian/changelog.orig
cp debian/control debian/control.orig
for dep in $GEM_GIT_DEPS; do
sed -i "s/\(python-${dep}\) \(([<>=]\+\) \([^)]\+\)\()\)/\1 \2 \3~${BUILD_UBUVER}01~dev0\4/g" debian/control
sed -i "s/\(python-${dep}\) \(([<>=]\+\) \([^)]\+\)\()\)/\1 \2 \3${BUILD_UBUVER}01~dev0\4/g" debian/control
done
if [ "$pkg_maj" = "$ini_maj" -a "$pkg_min" = "$ini_min" -a \
Expand Down

0 comments on commit fe00b80

Please sign in to comment.