[jts] branch experimental updated (5ced67c -> f71b4a3)
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a change to branch experimental in repository jts. from 5ced67c Remove myself from Uploaders. new f71b4a3 Fixed the Maven build The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/libjts-java-doc.install | 2 +- debian/libjts-java.poms| 2 +- debian/maven.ignoreRules | 2 ++ debian/maven.rules | 13 + 4 files changed, 5 insertions(+), 14 deletions(-) create mode 100644 debian/maven.ignoreRules -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jts.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
[jts] 01/01: Fixed the Maven build
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch experimental in repository jts. commit f71b4a3dc0327cf109bb45e6e06a5a2535bb Author: Emmanuel Bourg <ebo...@apache.org> Date: Sat Dec 16 17:46:25 2017 +0100 Fixed the Maven build --- debian/libjts-java-doc.install | 2 +- debian/libjts-java.poms| 2 +- debian/maven.ignoreRules | 2 ++ debian/maven.rules | 13 + 4 files changed, 5 insertions(+), 14 deletions(-) diff --git a/debian/libjts-java-doc.install b/debian/libjts-java-doc.install index c571675..18200d7 100644 --- a/debian/libjts-java-doc.install +++ b/debian/libjts-java-doc.install @@ -1 +1 @@ -target/apidocs/* usr/share/doc/libjts-java/api +target/site/apidocs/* usr/share/doc/libjts-java/api diff --git a/debian/libjts-java.poms b/debian/libjts-java.poms index cdcb201..967056e 100644 --- a/debian/libjts-java.poms +++ b/debian/libjts-java.poms @@ -28,7 +28,7 @@ pom.xml --has-package-version modules/pom.xml --has-package-version modules/app/pom.xml --has-package-version -modules/core/pom.xml --has-package-version --artifact modules/core/target/jts-core-*.jar --java-lib +modules/core/pom.xml --has-package-version modules/example/pom.xml --has-package-version modules/io/pom.xml --has-package-version modules/io/common/pom.xml --has-package-version diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 000..8f3e897 --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1,2 @@ +org.apache.maven.plugins maven-assembly-plugin * * * * +org.locationtech.jts jts-core * * * test diff --git a/debian/maven.rules b/debian/maven.rules index a712650..7f215bb 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1,15 +1,4 @@ -org.locationtech.jts jts jar s/.*/debian/ * * - -org.locationtech.jts jts-core jar s/.*/debian/ * * -org.locationtech.jts jts-core s/test-jar/jar/ s/.*/debian/ * * -org.locationtech.jts jts-io-common jar s/.*/debian/ * * -org.locationtech.jts jts-lab jar s/.*/debian/ * * -org.locationtech.jts jts-tests jar s/.*/debian/ * * - -com.googlecode.json-simple json-simple jar s/.*/debian/ * * -org.apache.commons commons-lang3 jar s/.*/debian/ * * -org.jdom jdom2 jar s/.*/debian/ * * junit junit jar s/.*/3.x/ * * - +org.locationtech.jts jts-modules pom s/.*/debian/ * * org.apache.felix maven-bundle-plugin jar s/.*/2.5.4/ * * -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jts.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
Bug#873886: osmosis: Depend on libplexus-classworlds2-java instead of libplexus-classworlds-java
Package: osmosis Version: 0.45-4 Severity: normal Hi, The osmosis package uses the old libplexus-classworlds-java package which is going to be removed in a near future. Could you please migrate to libplexus-classworlds2-java? I'm attaching a patch, it builds fine but I haven't checked if it's still ok at runtime. Thank you, Emmanuel Bourg diff --git a/debian/control b/debian/control index 9126bcf..e2514cf 100644 --- a/debian/control +++ b/debian/control @@ -26,7 +26,7 @@ Build-Depends: debhelper (>= 9), libspring-transaction-java, libstax2-api-java, libosmpbf-java, - libplexus-classworlds-java, + libplexus-classworlds2-java, libprotobuf-java, libwoodstox-java, libxerces2-java, @@ -56,7 +56,7 @@ Depends: default-jre-headless | java7-runtime-headless, libspring-jdbc-java, libspring-transaction-java, libosmpbf-java, - libplexus-classworlds-java, + libplexus-classworlds2-java, libprotobuf-java, libxerces2-java, libxz-java, diff --git a/debian/maven.rules b/debian/maven.rules index c6a6042..6fdb0bd 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1,5 +1,6 @@ junit junit * s/.*/4.x/ * * +org.codehaus.plexus plexus-classworlds * s/.*/2.x/ * * org.springframework spring-jdbc * s/.*/debian/ * * s/org.jboss.netty/io.netty/ netty * s/.*/debian/ * * s/org.postgis/net.postgis/ postgis-jdbc * s/.*/debian/ * * diff --git a/debian/patches/01-fix_launcher.patch b/debian/patches/01-fix_launcher.patch index 596ede8..48258cf 100644 --- a/debian/patches/01-fix_launcher.patch +++ b/debian/patches/01-fix_launcher.patch @@ -32,7 +32,7 @@ Forwarded: not-needed # Build up the classpath of required jar files via classworlds launcher. -MYAPP_CLASSPATH=$MYAPP_HOME/lib/default/plexus-classworlds-*.jar -+MYAPP_CLASSPATH=$LIBRARIES_HOME/plexus-classworlds.jar ++MYAPP_CLASSPATH=$LIBRARIES_HOME/plexus-classworlds2.jar MAINCLASS=org.codehaus.classworlds.Launcher -EXEC="$JAVACMD $JAVACMD_OPTIONS -cp $MYAPP_CLASSPATH -Dapp.home=$MYAPP_HOME -Dclassworlds.conf=$MYAPP_HOME/config/plexus.conf $MAINCLASS $OSMOSIS_OPTIONS" ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#824189: josm: Build depend on groovy instead of groovy2
Source: josm Version: 0.0.svn10168+dfsg-1 Severity: normal Hi, josm has a build dependency on groovy2 which is going to be removed since the original groovy package has eventually been upgraded to the latest 2.x version. Could you please update the build dependencies to use the groovy package instead of groovy2? You'll also have to change the groovy jar specified debian/patches/00-build.patch (groovy-all-2.x.jar becomes groovy-all.jar) Thank you, Emmanuel Bourg ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[osmosis] 03/03: Upload to unstable
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository osmosis. commit aead682dfc32c427db6171120f8bfcf140fe1405 Author: Emmanuel Bourg <ebo...@apache.org> Date: Mon Dec 14 23:32:03 2015 +0100 Upload to unstable --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 16bf664..0adc4be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -osmosis (0.44.1-3) UNRELEASED; urgency=medium +osmosis (0.44.1-3) unstable; urgency=medium [ Bas Couwenberg ] * Update Vcs-Browser and various openstreemap.org URLs to use HTTPS. @@ -7,7 +7,7 @@ osmosis (0.44.1-3) UNRELEASED; urgency=medium * Removed the build dependency on checkstyle * Build with gradle-debian-helper - -- Bas Couwenberg <sebas...@debian.org> Sun, 11 Oct 2015 15:48:12 +0200 + -- Emmanuel Bourg <ebo...@apache.org> Mon, 14 Dec 2015 23:31:54 +0100 osmosis (0.44.1-2) unstable; urgency=medium -- 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
[osmosis] 02/03: Build with gradle-debian-helper
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 000..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..000
--- 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', versi
[osmosis] branch master updated (f05d9ef -> aead682)
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a change to branch master in repository osmosis. from f05d9ef Drop unused lintian overrides. new abf6da4 Removed the build dependency on checkstyle new 49ad4af Build with gradle-debian-helper new aead682 Upload to unstable The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 9 +++- debian/control | 3 +- debian/maven.rules | 6 +++ debian/patches/03-local-dependencies.patch | 84 -- debian/patches/series | 1 - debian/rules | 19 ++- 6 files changed, 18 insertions(+), 104 deletions(-) create mode 100644 debian/maven.rules delete mode 100644 debian/patches/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
[osmosis] 01/03: Removed the build dependency on checkstyle
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository osmosis.
commit abf6da4fac4a3122f14db4d9898b76f6e79154aa
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Mon Dec 14 22:42:49 2015 +0100
Removed the build dependency on checkstyle
---
debian/changelog | 4
debian/control | 1 -
debian/patches/03-local-dependencies.patch | 3 +--
debian/rules | 4 +++-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 61404b0..80e5d76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
osmosis (0.44.1-3) UNRELEASED; urgency=medium
+ [ Bas Couwenberg ]
* Update Vcs-Browser and various openstreemap.org URLs to use HTTPS.
+ [ Emmanuel Bourg ]
+ * Removed the build dependency on checkstyle
+
-- Bas Couwenberg <sebas...@debian.org> Sun, 11 Oct 2015 15:48:12 +0200
osmosis (0.44.1-2) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 77107fb..1918039 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Priority: optional
Build-Depends: debhelper (>= 9),
default-jdk,
ant-optional,
- checkstyle (>= 5.6),
gradle,
ivy,
junit4 (>= 4.10),
diff --git a/debian/patches/03-local-dependencies.patch
b/debian/patches/03-local-dependencies.patch
index 14150c7..3b78cd4 100644
--- a/debian/patches/03-local-dependencies.patch
+++ b/debian/patches/03-local-dependencies.patch
@@ -19,11 +19,10 @@ Forwarded: not-needed
}
}
-@@ -57,6 +63,9 @@
+@@ -57,6 +63,8 @@
}
dependencies {
-+ checkstyle 'com.puppycrawl.tools:checkstyle:debian'
+ jdepend 'org.apache.ant:ant-jdepend:debian'
+
testCompile group: 'junit', name: 'junit', version:
dependencyVersionJunit
diff --git a/debian/rules b/debian/rules
index 13d71b7..572bb36 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,9 @@ override_dh_auto_test:
gradle --offline --no-daemon --stacktrace \
--gradle-user-home debian/gradle-user-home \
--project-prop osmosisBuildType=RELEASE \
- check -x test
+ check -x test \
+ -x checkstyleMain \
+ -x checkstyleTest
override_dh_clean:
gradle --offline --no-daemon --stacktrace \
--
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
Re: [osmosis] branch master updated (f05d9ef -> aead682)
Le 14/12/2015 23:56, Sebastiaan Couwenberg a écrit : > Thanks for the changes, but please try to discuss them with the primary > maintainer before uploading in the future. I don't object to these > changes, but would like to have been notified about your intent to > contribute them before the upload. Hi Sebastiaan, Sorry for the trouble. Since I broke osmosis by updating checkstyle last week I felt obliged to fix it quickly (I noticed the FTBFS on the reproducible builds dashboard [1]). I'll try to better coordinate with the team the next time this happens. Emmanuel Bourg [1] https://reproducible.debian.net/rbuild/testing/amd64/osmosis_0.44.1-2.rbuild.log ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[osmosis] annotated tag debian/0.44.1-3 created (now b098fd7)
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a change to annotated tag debian/0.44.1-3 in repository osmosis. at b098fd7 (tag) tagging aead682dfc32c427db6171120f8bfcf140fe1405 (commit) replaces debian/0.44.1-2 tagged by Emmanuel Bourg on Tue Dec 15 00:21:17 2015 +0100 - Log - osmosis Debian release 0.44.1-3 -BEGIN PGP SIGNATURE- Version: GnuPG v2 iQIcBAABCAAGBQJWb07tAAoJEPUTxBnkudCssOQP/3kmji7rkLkg/q1TmCgI9UPV pejAvmsSUbhmrmYzuK80nJYLQhdSHF6MEmD0570BWXZE+s8NypIwuRUl31DH7hco ghNGsxuPlpNSU3iaEvgX4yUBsDP3Kpb9dLNYZYs/lOZXjurUyAew13mMLXr5q9sg E9yOCzcF3rS+ca4LK8gS6t7qAWcdkm8rDt08PlEq76J4AXlUQK6KVZPAzjfAP/nw YaJtSy7zuNrk2qllieZR3kxiRP6AQefiQDTdLy+RFTEsbT2Hk3Q9Ml5yxlt0UanC sODPIzBdK1jNxu9iPWd19AWxScuK8cZ5Y0R+/V+5xqAM1O2rW+foM6zEQLCQDARS ot/2iVlO7a9hYKhB2pd+k1UHlznoZRX1SKPMPqhz/cca8RmsLdL7LGYf7aNsGdW8 B73JC+9l8lK1+zxkiBKVmvJexW3fXJXXU2tr0GdFkFnu5RySx7xa1BC7IDSgP2t/ urhpCTByx8l9aKHncGayar7mpBMl1ZEbX77pw2J+4q+aTBC8mZpzqw49+c/vYDua UDLui5h4fSxlkyPV6dmLTXB3JG83s6QvJunEvVuCAVAu/ifh3o8+jYEPg+zIJ2lt 3Ec1ssM9mH2vPJiWlV8pMOUCZe2H1O1lv3XMpqCqR4hRBakImM17ruPI79AbzRDg MDBrEgISSGVw2w51YmNl =m1Zw -END PGP SIGNATURE- Bas Couwenberg (4): Mark patches as Forwarded: not-needed. Update Vcs-Browser and various openstreemap.org URLs to use HTTPS. Reorder (build) dependencies. Drop unused lintian overrides. Emmanuel Bourg (3): Removed the build dependency on checkstyle Build with gradle-debian-helper Upload to unstable --- No new revisions were added by this update. -- 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
Bug#807499: postgis: Build with Maven 3
Source: postgis Version: 2.1.8 Severity: normal Hi, The maven2 package is going to be removed and postgis is the last package depending on it. Could you please switch to the maven package instead? Thank you, Emmanuel Bourg ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#807499: postgis: Build with Maven 3
Le 9/12/2015 18:30, Sebastiaan Couwenberg a écrit : > If you want to remove the maven2 package we can move postgis & > postgis-java from experimental and do a mini transition twice, only > spatialite is affected so it's not much of a problem. I'm getting tired > of waiting for PostGIS 2.2.1, so this issue could be sufficient reason > to not wait any longer. Thank you for the info Sebastiaan. There is no urgency to remove maven2 and we can wait for postgis-java. There is plenty of time before the next freeze. Emmanuel ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[osmosis] branch master updated (c720eea - 1352969)
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a change to branch master in repository osmosis. from c720eea Set distribution to unstable. new 1352969 Depend on libnetty-3.9-java instead of libnetty-java The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 7 +++ debian/control | 4 ++-- debian/patches/03-local-dependencies.patch | 14 -- 3 files changed, 21 insertions(+), 4 deletions(-) -- 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
[osmosis] 01/01: Depend on libnetty-3.9-java instead of libnetty-java
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 ebo...@apache.org
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 ebo...@apache.org 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 sebas...@xs4all.nl
--- 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 sebas...@xs4all.nl
}
}
-@@ -57,6 +63,9 @@ configure(javaProjects) {
+@@ -57,6 +63,9 @@
}
dependencies {
@@ -70,3 +70,13 @@ Author: Bas Couwenberg sebas...@xs4all.nl
# 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
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Re: [osmosis] 01/01: Depend on libnetty-3.9-java instead of libnetty-java
Le 28/07/2015 16:49, Sebastiaan Couwenberg a écrit : Can you also push the tag for this revision to Alioth? Hi Sebastiaan, yes I'll push the tag once the upload is accepted. Emmanuel Bourg ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[osmosis] annotated tag debian/0.44.1-2 created (now 1d8dc39)
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a change to annotated tag debian/0.44.1-2 in repository osmosis. at 1d8dc39 (tag) tagging 1352969cd4559fa2aa7c9e0563de2060b1815439 (commit) replaces debian/0.40.1+ds1-7 tagged by Emmanuel Bourg on Tue Jul 28 18:48:04 2015 +0200 - Log - osmosis Debian release 0.44.1-2 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJVt7JEAAoJEPUTxBnkudCst8wP/2skWjKHyRuqsBRmPbkvDu9n ENq3dV6qbUC5Ub9ssk3oMQUQFOpKdP+g3NSHGM6pB/+972W8mxxk9Qd7mV81eY3E aYx8DEady4XqhC8JAP+KBwssOs8AEKxY1uMQQ4wWFH4fjWPCNvyzTFaZ3EqZ5zZs 7QcUW2K8gHeFxFEfr553XuR23IefI3my243eMnmCIWhkxycQouNTGyqW/qSVpgdv smwaQEFEn9oWdLGyk8iQmKlSA9cgsm3bAbZsK/I/6ICSawdFipO+TF62X3Lrl4oF JdHwMFBXRKRnVtkgY8QSRyXZukWBF4O817ofz9L2PsNUSaouXR5iEouPoV/GOi8Z oelvMKShN6SncBTqh7StfeaXq8jLKVwTsi6d1uXnCTs8kYonD/WHSYUPUEok3u4i FbU7IedbySMyM3l9NiJ7tvJsqcMYxjGiK+HKMak19OWuswFWHL1q5coXqinoPu79 cBAeW4qRwfvpR+QtF5mntLmMbHPpw8tJm5ZEgwYNqIPeu2LptuW3mYbGfQW/Ot9U xhmHF+XvEWzEv1FqUkFUa84tTEcrun4aBOAmjqu+JhNPHSesABGN9QNl5cOrOdJG E3S4zPuuLRFSUdZAKM5tMqvVwcjoALdUgTk/nZ6L5M42DBe+CQwG4gmUK5hVXHsn 0UdU9mBc6LtOImBvx6ut =7qCU -END PGP SIGNATURE- Andreas Tille (1): moved to pkg-grass Git reposirory Bas Couwenberg (84): Change Maintainer to Debian GIS Project. Add myself to Uploaders. Fix typo in changelog. Restructure control file with cme, changes: Vcs-* URLs. Imported Upstream version 0.43.1 Merge tag 'upstream/0.43.1' New upstream release. Add gbp.conf to use pristine-tar by default. Drop get-orig-source target, repacking no longer required. Remove dependencies on ant, gradle now used for build. Enable parallel builds. Refresh patches. Remove obsolete patches. Bump Debhelper compatibility to 9. Don't set custom CLASSPATH. Use dh with maven-repo-helper. Add build dependency on libwoodstox-java. Add dependency on libnetty-java. Add build dependency on libjdepend-java. Update minimum version required. Add patch to use packaged libraries during build. Use gradle in offline mode. Remove generated files and directories on clean. Skip checkstyleMain, checkstyleTest, jdependMain, jdependTest test tasks. Add build dependency on git, used by gradle build system. Install osmosis JARs from package directory. Set osmosisBuildType to RELEASE. Bump Standards-Version to 3.9.5, changes: Vcs-* fields. Add patch to get version from changelog instead of git. Remove unused variables. Add patch from upstream master branch: 0001-Modify-the-pgsnapshot-load-script-to-more-sensible-d.patch Add patch from upstream master branch: 0001-Use-ALTER-TABLE-.-CLUSTER-ON-statements-to-set-what-.patch Add patch from upstream master branch: 0001-Disable-synchronous_commit-for-pgsnapshot-loading.patch Add patch from upstream master branch: 0001-Manually-set-some-statistics-for-way_nodes-and-relat.patch Add patch from upstream master branch: 0001-Update-list-of-expected-schema-migrations.patch Add patch from upstream master branch: 0001-Fix-remaining-64-bit-id-tracking-problems.patch Add patch from upstream master branch: 0001-Increase-maximum-way-node-count-from-16-bit-to-32-bi.patch Add patch from upstream master branch: 0001-replication-Fix-null-pointer-exception-in-merge-repl.patch Add patches from upstream master branch. New upstream release also closes #700311. Fix checkstyle and jdepend local dependencies. Use separate build and test targets. Non-verbose rm. Set distribution to unstable. Update source to GitHub, add Upstream-Contact. Use SPDX license shortnames. Add patch to update generated source for protobuf 2.6.0. Add patch to increase source compatibility from 1.6 to 1.7. Reorder files sections in copyright. Add lintian override for incompatible-java-bytecode-format. Drop unused lintian override for missing-classpath. Add patches from upstream master branch. Set distribution to unstable. Close bug in changelog. Update watch file to use github tags instead of the deprecated githubredir service. Add basic pom.xml for osmosis-core, install pom and jar with maven-repo-helper. Bump Standards-Version to 3.9.6, no changes. Revert Add basic pom.xml for osmosis-core, install pom and jar with maven-repo-helper. Add upstream metadata. Add patch to fix negative exit status in replicate_osm_file.sh. Disable Bug-Submit in metadata, requires login. Mark 07-bashism.patch as Applied-Upstream. Update Vcs-Browser URL to use cgit instead of gitweb. Set distribution to experimental. Update 02-fix_plexus.patch to also load Xerces to fix data
Re: Bug#745097: mkgmap: FTBFS with Java 8: name clash: remove(K,V) in MultiHashMap and remove(Object,Object) in HashMap have the same erasure
Control: tags -1 patch
Here is a patch fixing this issue. It renames the remove(K, V) methods
in MultiHashMap and MultiIdentityHashMap which are conflicting with the
new Map.remove(Object, Object) method introduced in Java 8.
Description: Rename the MultiHashMap and MultiIdentityHashMap remove(K, V)
methods
to avoid a conflict with the new Map.remove(Object, Object) method introduced
in Java 8
Author: Emmanuel Bourg ebo...@apache.org
Forwarded: no
Bug-Debian: https://bugs.debian.org/745097
--- a/src/uk/me/parabola/mkgmap/osmstyle/RoadMerger.java
+++ b/src/uk/me/parabola/mkgmap/osmstyle/RoadMerger.java
@@ -458,9 +458,9 @@
Coord mergePoint = points2.get(0);
Coord endPoint= points2.get(points2.size()-1);
- startPoints.remove(mergePoint, road2);
- endPoints.remove(endPoint, road2);
- endPoints.remove(mergePoint, road1);
+ startPoints.removeKeyValue(mergePoint, road2);
+ endPoints.removeKeyValue(endPoint, road2);
+ endPoints.removeKeyValue(mergePoint, road1);
points1.addAll(points2.subList(1, points2.size()));
endPoints.add(endPoint, road1);
--- a/src/uk/me/parabola/util/MultiIdentityHashMap.java
+++ b/src/uk/me/parabola/util/MultiIdentityHashMap.java
@@ -54,7 +54,7 @@
return ( results ? value : null );
}
- public V remove(K key, V value )
+ public V removeKeyValue(K key, V value )
{
ListV values = super.get(key);
--- a/src/uk/me/parabola/mkgmap/filters/LineMergeFilter.java
+++ b/src/uk/me/parabola/mkgmap/filters/LineMergeFilter.java
@@ -29,9 +29,9 @@
// Merges the points in the second one
ListCoord points1 = line1.getPoints();
ListCoord points2 = line2.getPoints();
- startPoints.remove(points1.get(0), line1);
- endPoints.remove(points1.get(points1.size()-1), line1);
- startPoints.remove(points2.get(0), line2);
+ startPoints.removeKeyValue(points1.get(0), line1);
+ endPoints.removeKeyValue(points1.get(points1.size()-1), line1);
+ startPoints.removeKeyValue(points2.get(0), line2);
startPoints.add(points1.get(0), line2);
line2.insertPointsAtStart(points1);
linesMerged.remove(line1);
@@ -40,7 +40,7 @@
private void addPointsAtStart(MapLine line, ListCoord
additionalPoints) {
log.info(merged lines before + line.getName());
ListCoord points = line.getPoints();
- startPoints.remove(points.get(0), line);
+ startPoints.removeKeyValue(points.get(0), line);
line.insertPointsAtStart(additionalPoints);
startPoints.add(points.get(0), line);
}
@@ -48,7 +48,7 @@
private void addPointsAtEnd(MapLine line, ListCoord additionalPoints)
{
log.info(merged lines after + line.getName());
ListCoord points = line.getPoints();
- endPoints.remove(points.get(points.size()-1), line);
+ endPoints.removeKeyValue(points.get(points.size()-1), line);
line.insertPointsAtEnd(additionalPoints);
endPoints.add(points.get(points.size()-1), line);
}
--- a/src/uk/me/parabola/util/MultiHashMap.java
+++ b/src/uk/me/parabola/util/MultiHashMap.java
@@ -54,7 +54,7 @@
return ( results ? value : null );
}
- public V remove(K key, V value )
+ public V removeKeyValue(K key, V value )
{
ListV values = super.get(key);
signature.asc
Description: OpenPGP digital signature
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#745097: mkgmap: FTBFS with Java 8: name clash: remove(K, V) in MultiHashMap and remove(Object, Object) in HashMap have the same erasure
Source: mkgmap Version: 0.0.0+svn2981-1 Severity: important User: debian-j...@lists.debian.org Usertags: openjdk-8-transition Hi, During a rebuild of all Java packages in sid with OpenJDK 8, your package failed to build with the following error: compile: [javac] Compiling 477 source files to /«BUILDDIR»/mkgmap-0.0.0+svn2981/build/classes [javac] warning: [options] bootstrap class path not set in conjunction with -source 1.7 [javac] /«BUILDDIR»/mkgmap-0.0.0+svn2981/src/uk/me/parabola/util/MultiHashMap.java:57: error: name clash: remove(K,V) in MultiHashMap and remove(Object,Object) in HashMap have the same erasure, yet neither overrides the other [javac] public V remove(K key, V value ) [javac]^ [javac] where K,V are type-variables: [javac] K extends Object declared in class MultiHashMap [javac] V extends Object declared in class MultiHashMap [javac] /«BUILDDIR»/mkgmap-0.0.0+svn2981/src/uk/me/parabola/util/MultiIdentityHashMap.java:57: error: name clash: remove(K,V) in MultiIdentityHashMap and remove(Object,Object) in Map have the same erasure, yet neither overrides the other [javac] public V remove(K key, V value ) [javac]^ [javac] where K,V are type-variables: [javac] K extends Object declared in class MultiIdentityHashMap [javac] V extends Object declared in class MultiIdentityHashMap [javac] Note: Some input files use unchecked or unsafe operations. [javac] Note: Recompile with -Xlint:unchecked for details. [javac] 2 errors [javac] 1 warning The full build log is available from: http://87.98.165.193/debian/openjdk8-rebuild/logs-failed-jdk8/mkgmap_0.0.0+svn2981-1_unstable_jdk8.log You can download OpenJDK 8 packages for testing here: http://87.98.165.193/debian/openjdk-8u5-b13/ ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#580170: [Help] Trying to upgrade mkgmap but failed with Java problem
Hi Andreas, The build doesn't compile the code, so you can't run the uk.me.parabola.mkgmap.main.Main class. You probably want to run the Ant dist target to build the project instead of using the makefile, see the comment in ./Makefile: # This is NOT used to build mkgmap. To build use ant. Emmanuel Bourg PS: Don't forget to CC debian-j...@lists.debian.org for your Java questions, there are plenty of people skilled in Java willing to help there :) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#580170: [Help] Trying to upgrade mkgmap but failed with Java problem
Le 05/06/2013 13:33, Andreas Tille a écrit : It seems maven is somehow involved even if at least to my limited knowledge this would use ratherpm.xml rather than build.xml. It seems I need to edit build.xml to tell ant to use local JAR files rather than trying to download anything. But what exactly? Ivy is used to manage the dependencies. The Ant build starts by downloading Ivy and the rely on Ivy to fetch the dependencies from the central Maven repository. You have to patch build.xml to skip this step and build the classpath from the jars in /usr/share/java. Emmanuel Bourg signature.asc Description: OpenPGP digital signature ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
