This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository osmosis.
commit 1352969cd4559fa2aa7c9e0563de2060b1815439 Author: Emmanuel Bourg <[email protected]> Date: Tue Jul 28 16:05:24 2015 +0200 Depend on libnetty-3.9-java instead of libnetty-java --- debian/changelog | 7 +++++++ debian/control | 4 ++-- debian/patches/03-local-dependencies.patch | 14 ++++++++++++-- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 724729a..cc00bbe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +osmosis (0.44.1-2) unstable; urgency=medium + + * Team upload. + * Depend on libnetty-3.9-java instead of libnetty-java + + -- Emmanuel Bourg <[email protected]> Tue, 28 Jul 2015 16:00:57 +0200 + osmosis (0.44.1-1) unstable; urgency=medium * New upstream release. diff --git a/debian/control b/debian/control index 3becb96..f7bc168 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: gradle, libjdepend-java, libjpf-java, libmysql-java, - libnetty-java, + libnetty-3.9-java, libpostgis-java, libpostgresql-jdbc-java, libspring-beans-java, @@ -46,7 +46,7 @@ Depends: default-jre-headless | java7-runtime-headless, libcommons-dbcp-java, libjpf-java, libmysql-java, - libnetty-java, + libnetty-3.9-java, libpostgis-java, libpostgresql-jdbc-java, libspring-beans-java, diff --git a/debian/patches/03-local-dependencies.patch b/debian/patches/03-local-dependencies.patch index 54acf45..9529600 100644 --- a/debian/patches/03-local-dependencies.patch +++ b/debian/patches/03-local-dependencies.patch @@ -2,7 +2,7 @@ Description: Use packaged libraries during build. Author: Bas Couwenberg <[email protected]> --- a/build.gradle +++ b/build.gradle -@@ -28,7 +28,13 @@ subprojects { +@@ -28,7 +28,13 @@ // Enable access to artefact dependency repositories. repositories { // Standard Maven repository. @@ -17,7 +17,7 @@ Author: Bas Couwenberg <[email protected]> } } -@@ -57,6 +63,9 @@ configure(javaProjects) { +@@ -57,6 +63,9 @@ } dependencies { @@ -70,3 +70,13 @@ Author: Bas Couwenberg <[email protected]> # 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') + } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmosis.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
