This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository osmosis.
commit 49ad4aff82b2abe7b9332c87160516c6fd4bb216
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Mon Dec 14 23:29:39 2015 +0100
Build with gradle-debian-helper
---
debian/changelog | 1 +
debian/control | 2 +-
debian/maven.rules | 6 +++
debian/patches/03-local-dependencies.patch | 83 ------------------------------
debian/patches/series | 1 -
debian/rules | 21 ++------
6 files changed, 12 insertions(+), 102 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 80e5d76..16bf664 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ osmosis (0.44.1-3) UNRELEASED; urgency=medium
[ Emmanuel Bourg ]
* Removed the build dependency on checkstyle
+ * Build with gradle-debian-helper
-- Bas Couwenberg <sebas...@debian.org> Sun, 11 Oct 2015 15:48:12 +0200
diff --git a/debian/control b/debian/control
index 1918039..5c7b227 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Priority: optional
Build-Depends: debhelper (>= 9),
default-jdk,
ant-optional,
- gradle,
+ gradle-debian-helper,
ivy,
junit4 (>= 4.10),
libbatik-java,
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..234e690
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,6 @@
+
+junit junit * s/.*/4.x/ * *
+org.springframework spring-jdbc * s/.*/3.x/ * *
+s/org.jboss.netty/io.netty/ netty * s/.*/debian/ * *
+s/org.postgis/net.postgis/ postgis-jdbc * s/.*/debian/ * *
+s/org.postgresql/postgresql/ postgresql * s/.*/debian/ * *
diff --git a/debian/patches/03-local-dependencies.patch
b/debian/patches/03-local-dependencies.patch
deleted file mode 100644
index 3b78cd4..0000000
--- a/debian/patches/03-local-dependencies.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-Description: Use packaged libraries during build.
-Author: Bas Couwenberg <sebas...@xs4all.nl>
-Forwarded: not-needed
-
---- a/build.gradle
-+++ b/build.gradle
-@@ -28,7 +28,13 @@
- // Enable access to artefact dependency repositories.
- repositories {
- // Standard Maven repository.
-- mavenCentral()
-+ maven {
-+ url "/usr/share/maven-repo"
-+ }
-+ // Flat directory for JARs unavailable in Maven repository
-+ flatDir {
-+ dirs "/usr/share/java"
-+ }
- }
- }
-
-@@ -57,6 +63,8 @@
- }
-
- dependencies {
-+ jdepend 'org.apache.ant:ant-jdepend:debian'
-+
- testCompile group: 'junit', name: 'junit', version:
dependencyVersionJunit
- }
-
---- a/gradle.properties
-+++ b/gradle.properties
-@@ -4,25 +4,25 @@
- org.gradle.daemon=true
-
- # 3rd Party Library Versions
--dependencyVersionClassworlds=2.5.2
--dependencyVersionCommonsCodec=1.10
--dependencyVersionCommonsCompress=1.9
--dependencyVersionCommonsDbcp=1.4
--dependencyVersionJpf=1.5
--dependencyVersionJunit=4.12
--dependencyVersionMySql=5.1.35
--dependencyVersionNetty=3.2.10.Final
--dependencyVersionPostGis=1.3.3
--dependencyVersionPostgreSql=9.4-1201-jdbc4
--dependencyVersionProtobuf=2.6.1
--dependencyVersionSpring=4.1.6.RELEASE
--dependencyVersionWoodstoxCore=4.4.1
--dependencyVersionWoodstoxStax2=3.1.4
-+dependencyVersionClassworlds=debian
-+dependencyVersionCommonsCodec=debian
-+dependencyVersionCommonsCompress=debian
-+dependencyVersionCommonsDbcp=debian
-+dependencyVersionJpf=debian
-+dependencyVersionJunit=4.x
-+dependencyVersionMySql=debian
-+dependencyVersionNetty=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
---- a/osmosis-replication-http/build.gradle
-+++ b/osmosis-replication-http/build.gradle
-@@ -2,6 +2,6 @@
- compile project(':osmosis-core')
- compile project(':osmosis-replication')
- compile project(':osmosis-xml')
-- compile group: 'org.jboss.netty', name: 'netty', version:
dependencyVersionNetty
-+ compile group: 'io.netty', name: 'netty', version: dependencyVersionNetty
- testCompile project(':osmosis-testutil')
- }
diff --git a/debian/patches/series b/debian/patches/series
index bab4a64..c3b51ec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
01-fix_launcher.patch
02-fix_plexus.patch
-03-local-dependencies.patch
04-osmosis-version.patch
06-java-7.patch
diff --git a/debian/rules b/debian/rules
index 572bb36..3b42a07 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,29 +9,16 @@ debian/osmosis.1: debian/osmosis.xml
$(XP) -o $@ $(DB2MAN) $<
%:
- dh $@ --with maven_repo_helper --parallel
+ dh $@ --buildsystem=gradle --with maven_repo_helper --parallel
override_dh_auto_build:
- gradle --offline --no-daemon --stacktrace \
- --gradle-user-home debian/gradle-user-home \
- --project-prop osmosisBuildType=RELEASE \
- assemble
+ dh_auto_build -- --project-prop osmosisBuildType=RELEASE assemble
override_dh_auto_test:
- gradle --offline --no-daemon --stacktrace \
- --gradle-user-home debian/gradle-user-home \
- --project-prop osmosisBuildType=RELEASE \
- check -x test \
- -x checkstyleMain \
- -x checkstyleTest
+ dh_auto_test -- --project-prop osmosisBuildType=RELEASE check -x test
-x checkstyleMain -x checkstyleTest
override_dh_clean:
- gradle --offline --no-daemon --stacktrace \
- --gradle-user-home debian/gradle-user-home \
- --project-prop osmosisBuildType=RELEASE \
- clean -x build
-
- rm -rf .gradle package/lib debian/gradle-user-home
+ rm -rf package/lib package/build/distribution/*
dh_clean
osmosis-core/src/main/java/org/openstreetmap/osmosis/core/OsmosisConstants.java
\
osmosis-core/src/main/resources/org/openstreetmap/osmosis/core/plugin/plugin.xml
--
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
