[Git][java-team/jengelman-shadow][master] 6 commits: Build-depend on default-jdk-headless (Closes: #948085)

[Tony Mancill]

Tony Mancill pushed to branch master at Debian Java Maintainers / jengelman-shadow


Commits:
1d553494 by tony mancill at 2020-01-03T20:16:34-08:00
Build-depend on default-jdk-headless (Closes: #948085)

- - - - -
430296c6 by tony mancill at 2020-01-03T20:19:37-08:00
Specify debhelper compat via debhelper-compat dependency

- - - - -
f3faee62 by tony mancill at 2020-01-03T20:19:37-08:00
Bump Standards-Version to 4.4.1

- - - - -
e0c3ad30 by tony mancill at 2020-01-04T13:07:42-08:00
No longer set org.gradle.java.home in gradle.properties

- - - - -
91eb7ce8 by tony mancill at 2020-01-04T13:15:47-08:00
Set "Rules-Requires-Root: no" in debian/control

- - - - -
b9e07e32 by tony mancill at 2020-01-04T13:15:47-08:00
prepare changelog for upload to unstable

- - - - -


4 changed files:

- debian/changelog
- − debian/compat
- debian/control
- debian/patches/build.diff


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+jengelman-shadow (4.0.3-2) unstable; urgency=medium
+
+  * Team upload
+  * Build-depend on default-jdk-headless (Closes: #948085)
+  * Specify debhelper compat via debhelper-compat dependency
+  * Bump Standards-Version to 4.4.1
+  * No longer set org.gradle.java.home in gradle.properties
+  * Set "Rules-Requires-Root: no" in debian/control
+
+ -- tony mancill <tmancill at debian.org>  Sat, 04 Jan 2020 13:07:14 -0800
+
 jengelman-shadow (4.0.3-1) sid; urgency=medium
 
   * Initial release (Closes: #933327)


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-12


=====================================
debian/control
=====================================
@@ -4,7 +4,7 @@ Uploaders: Saif Abdul Cassim <saif.15 at cse.mrt.ac.lk>
 Section: java
 Priority: optional
 Build-Depends: ant,
-               debhelper (>= 12~),
+               debhelper-compat (= 12),
                gradle-debian-helper,
                libasm-java,
                libcommons-io-java,
@@ -13,11 +13,12 @@ Build-Depends: ant,
                liblog4j2-java,
                libplexus-utils2-java,
                maven-repo-helper,
-               openjdk-8-jdk-headless
-Standards-Version: 4.4.0
+               default-jdk-headless
+Standards-Version: 4.4.1
 Homepage: https://github.com/johnrengelman/shadow
 Vcs-Browser: https://salsa.debian.org/java-team/jengelman-shadow
 Vcs-Git: https://salsa.debian.org/java-team/jengelman-shadow.git
+Rules-Requires-Root: no
 
 Package: libjengelman-shadow-java
 Architecture: all


=====================================
debian/patches/build.diff
=====================================
@@ -1,8 +1,6 @@
-Index: jengelman-shadow/build.gradle
-===================================================================
---- jengelman-shadow.orig/build.gradle
-+++ jengelman-shadow/build.gradle
-@@ -18,10 +18,8 @@ buildscript {
+--- a/build.gradle
++++ b/build.gradle
+@@ -18,10 +18,8 @@
  }
  
  plugins {
@@ -13,7 +11,7 @@ Index: jengelman-shadow/build.gradle
      id 'java-gradle-plugin'
  }
  
-@@ -34,27 +32,7 @@ gradlePlugin {
+@@ -34,27 +32,7 @@
  
  apply plugin: 'com.github.johnrengelman.shadow'
  
@@ -41,7 +39,7 @@ Index: jengelman-shadow/build.gradle
  apply from: file('gradle/dependencies.gradle')
  
  repositories {
-@@ -74,17 +52,11 @@ jar {
+@@ -74,17 +52,11 @@
      from rootProject.file('NOTICE')
  }
  
@@ -59,18 +57,13 @@ Index: jengelman-shadow/build.gradle
  
  sourceCompatibility = '1.7'
  targetCompatibility = '1.7'
-Index: jengelman-shadow/gradle.properties
-===================================================================
---- jengelman-shadow.orig/gradle.properties
-+++ jengelman-shadow/gradle.properties
-@@ -1,2 +1,2 @@
+--- a/gradle.properties
++++ b/gradle.properties
+@@ -1,2 +1 @@
  org.gradle.parallel=true
 -org.gradle.daemon=true
-+org.gradle.java.home=/usr/lib/jvm/java-8-openjdk-amd64
-Index: jengelman-shadow/settings.gradle
-===================================================================
---- jengelman-shadow.orig/settings.gradle
-+++ jengelman-shadow/settings.gradle
+--- a/settings.gradle
++++ b/settings.gradle
 @@ -1,3 +1,2 @@
  
  rootProject.name = 'shadow'



View it on GitLab: https://salsa.debian.org/java-team/jengelman-shadow/compare/0a0826f8f203a7b74189fc112135808c083f1e42...b9e07e32fa92eada1324172a1fc3c61c8530afd0

-- 
View it on GitLab: https://salsa.debian.org/java-team/jengelman-shadow/compare/0a0826f8f203a7b74189fc112135808c083f1e42...b9e07e32fa92eada1324172a1fc3c61c8530afd0
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20200104/8a60391d/attachment.html>