This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository osmosis.
commit c07e27f163b749ce3973d14370577cd89f0569c2
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Sun Mar 16 19:23:11 2014 +0100
Add patch to use packaged libraries during build.
---
debian/changelog | 1 +
debian/dependencies.txt | 34 ++++++++---------
debian/patches/03-local-dependencies.patch | 60 ++++++++++++++++++++++++++++++
debian/patches/series | 1 +
4 files changed, 78 insertions(+), 18 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 912a831..40ef442 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ osmosis (0.43.1-1) UNRELEASED; urgency=low
* Bump Debhelper compatibility to 9.
* Use dh with maven-repo-helper.
* Add build dependency on libwoodstox-java.
+ * Add patch to use packaged libraries during build.
-- Bas Couwenberg <sebas...@xs4all.nl> Sun, 16 Mar 2014 15:17:02 +0100
diff --git a/debian/dependencies.txt b/debian/dependencies.txt
index bb716f1..b8824ea 100644
--- a/debian/dependencies.txt
+++ b/debian/dependencies.txt
@@ -1,18 +1,16 @@
-dependency.version.checkstyle=5.0 # Debian: 4.4
(5.3 in experimental)
-dependency.version.classworlds=2.2.2 # Debian: 1.1
-dependency.version.commons-codec=1.4 # Debian: 1.4
-dependency.version.commons-compress=1.0 # Debian: 1.0
-dependency.version.commons-dbcp=1.4 # Debian: 1.4
-dependency.version.osmbin=1.0-6d760534
-dependency.version.osmosis-hstore=0.2
-dependency.version.ivy=2.1.0 # Debian: 2.1.0
-dependency.version.jpf=1.5 #
Debian: 1.5.1 (no POM)
-dependency.version.junit=4.8.1 # Debian: 4.8.2
-dependency.version.mysql=5.1.10 #
Debian: 5.1.10 (no POM)
-dependency.version.postgis=1.3.3 # Debian: 1.5.1
(no POM)
-dependency.version.postgresql=8.4-701.jdbc4 # Debian: 8.4-701 (no
POM)
-dependency.version.protobuf=2.3.0 # Debian: 2.3.0
(no POM)
-dependency.version.spring=3.0.3.RELEASE # Debian:
3.0.5.RELEASE
-dependency.version.woodstox-core=4.0.3 # Debian: 3.9.2 (no POM)
-dependency.version.woodstox-stax2=3.0.2 # Debian: 1.2.0
-dependency.version.xerces=2.9.1 #
Debian: 2.9.1
+dependencyVersionClassworlds=2.4 # Debian: 1.5.0
(libplexus-classworlds-java)
+dependencyVersionCommonsCodec=1.7 # Debian: 1.9
(libcommons-codec-java)
+dependencyVersionCommonsCompress=1.4.1 # Debian: 1.8
(libcommons-compress-java)
+dependencyVersionCommonsDbcp=1.4 # Debian: 1.3
(libcommons-dbcp-java)
+dependencyVersionJpf=1.5 # Debian: 1.5
(libjpf-java)
+dependencyVersionJunit=4.10 # Debian: 4.11
(junit4)
+dependencyVersionMySql=5.1.21 # Debian: 5.1.29
(libmysql-java)
+dependencyVersionNetty=3.2.7.Final # Debian: 3.2.6.Final
(libnetty-java)
+dependencyVersionOsmPbf=1.1.1-754a33af # Debian: 1.3.3
(libosmpbf-java)
+dependencyVersionPostGis=1.3.3 # Debian: 2.1.2
(libpostgis-java)
+dependencyVersionPostgreSql=9.1-901-1.jdbc4 # Debian: 9.2.jdbc4
(libpostgresql-jdbc-java)
+dependencyVersionProtobuf=2.4.1 # Debian: 2.5.0
(libprotobuf-java)
+dependencyVersionSpring=3.1.2.RELEASE # Debian: 3.0.6.RELEASE
(libspring-*-java)
+dependencyVersionWoodstoxCore=4.1.4 # Debian: 4.1.3
(libwoodstox-java)
+dependencyVersionWoodstoxStax2=3.1.1 # Debian: 3.1.1
(libstax2-api-java)
+dependencyVersionXerces=2.9.1 # Debian: 2.11.0
(libxerces2-java)
diff --git a/debian/patches/03-local-dependencies.patch
b/debian/patches/03-local-dependencies.patch
new file mode 100644
index 0000000..382d3df
--- /dev/null
+++ b/debian/patches/03-local-dependencies.patch
@@ -0,0 +1,60 @@
+Description: Use packaged libraries during build.
+Author: Bas Couwenberg <sebas...@xs4all.nl>
+--- a/build.gradle
++++ b/build.gradle
+@@ -25,7 +25,9 @@ subprojects {
+ // Enable access to artefact dependency repositories.
+ repositories {
+ // Standard Maven repository.
+- mavenCentral()
++ maven {
++ url "/usr/share/maven-repo"
++ }
+ }
+ }
+
+--- a/gradle.properties
++++ b/gradle.properties
+@@ -4,26 +4,26 @@
+ org.gradle.daemon=true
+
+ # 3rd Party Library Versions
+-dependencyVersionClassworlds=2.4
+-dependencyVersionCommonsCodec=1.7
+-dependencyVersionCommonsCompress=1.4.1
+-dependencyVersionCommonsDbcp=1.4
+-dependencyVersionJpf=1.5
+-dependencyVersionJunit=4.10
+-dependencyVersionMySql=5.1.21
+-dependencyVersionNetty=3.2.7.Final
+-dependencyVersionOsmPbf=1.1.1-754a33af
+-dependencyVersionPostGis=1.3.3
+-dependencyVersionPostgreSql=9.1-901-1.jdbc4
+-dependencyVersionProtobuf=2.4.1
+-dependencyVersionSpring=3.1.2.RELEASE
+-dependencyVersionWoodstoxCore=4.1.4
+-dependencyVersionWoodstoxStax2=3.1.1
++dependencyVersionClassworlds=debian
++dependencyVersionCommonsCodec=debian
++dependencyVersionCommonsCompress=debian
++dependencyVersionCommonsDbcp=debian
++dependencyVersionJpf=debian
++dependencyVersionJunit=4.x
++dependencyVersionMySql=debian
++dependencyVersionNetty=debian
++dependencyVersionOsmPbf=debian
++dependencyVersionPostGis=debian
++dependencyVersionPostgreSql=debian
++dependencyVersionProtobuf=debian
++dependencyVersionSpring=3.x
++dependencyVersionWoodstoxCore=debian
++dependencyVersionWoodstoxStax2=debian
+ # Remaining on 2.9.1 instead of 2.10.0 for now because the newer version
+ # depends on org.w3c.dom.ElementTraversal which is not being transitively
+ # included. This could be possibly be fixed by including a newer version
+ # of xml-apis but this hasn't been verified.
+-dependencyVersionXerces=2.9.1
++dependencyVersionXerces=debian
+
+ # Builds are signed if the osmosisSigningEnabled property is set to true.
+ # To enable signing, it is recommended to leave this file untouched and to
diff --git a/debian/patches/series b/debian/patches/series
index cfdb821..f6fafbb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
01-fix_launcher.patch
02-fix_plexus.patch
+03-local-dependencies.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/osmosis.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
