Christoph Berg pushed to branch master at Debian Java Maintainers / libpostgresql-jdbc-java
Commits: 2bb87167 by Christoph Berg at 2018-06-06T15:05:19+02:00 Declare scram dependency to be "optional" pgjdbc/pom.xml: "provided" made the shade plugin also remove the bundled scram dependency. Revert that change, and declare the dependency to be "optional" instead. That way, we bundle scram, and do not require reverse-dependencies to install libscram-java. Again thanks Emmanuel Bourg! - - - - - 5 changed files: - debian/changelog - debian/control - + debian/maven.rules - debian/patches/02-scram-scope.patch → debian/patches/02-scram-optional.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +libpgjava (42.2.2-4) unstable; urgency=medium + + * pgjdbc/pom.xml: "provided" made the shade plugin also remove the bundled + scram dependency. Revert that change, and declare the dependency to be + "optional" instead. That way, we bundle scram, and do not require + reverse-dependencies to install libscram-java. Again thanks Emmanuel Bourg! + + -- Christoph Berg <[email protected]> Wed, 06 Jun 2018 14:42:47 +0200 + libpgjava (42.2.2-3) unstable; urgency=medium * pgjdbc/pom.xml: Manually patch scram dependency scope to be "provided" ===================================== debian/control ===================================== --- a/debian/control +++ b/debian/control @@ -30,7 +30,8 @@ Package: libpostgresql-jdbc-java Architecture: all Multi-Arch: foreign Depends: ${maven:Depends}, ${misc:Depends} -Recommends: ${maven:OptionalDepends} +# No "Recommends: ${maven:OptionalDepends}" here because that would point at +# libscram-java which we bundle Conflicts: libpgjava (<= 7.4.7-3), libpg-java (<= 9.1-901-1) Provides: libpgjava, libpg-java Replaces: libpgjava, libpg-java (<= 9.1-901-1) ===================================== debian/maven.rules ===================================== --- /dev/null +++ b/debian/maven.rules @@ -0,0 +1 @@ +com.ongres.scram client * s/.*/debian/ * s/.*/provided/ ===================================== debian/patches/02-scram-scope.patch → debian/patches/02-scram-optional.patch ===================================== --- a/debian/patches/02-scram-scope.patch +++ b/debian/patches/02-scram-optional.patch @@ -11,7 +11,7 @@ Bug: #900615 <artifactId>client</artifactId> - <version>1.0.0-beta.2</version> + <version>debian</version> -+ <scope>provided</scope> ++ <optional>true</optional> </dependency> </dependencies> ===================================== debian/patches/series ===================================== --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,2 @@ 01-missing-pom-configuration.patch -02-scram-scope.patch +02-scram-optional.patch View it on GitLab: https://salsa.debian.org/java-team/libpostgresql-jdbc-java/commit/2bb87167b4545860d55d67e662a2d72406e901a6 -- View it on GitLab: https://salsa.debian.org/java-team/libpostgresql-jdbc-java/commit/2bb87167b4545860d55d67e662a2d72406e901a6 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
