[Git][java-team/takari-polyglot-maven][master] 4 commits: Wrap and sort

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / takari-polyglot-maven


Commits:
5f3bfb62 by Emmanuel Bourg at 2020-11-27T12:32:23+01:00
Wrap and sort

- - - - -
d17ac983 by Emmanuel Bourg at 2020-11-27T12:35:33+01:00
Simplified the patch

- - - - -
73b04356 by Emmanuel Bourg at 2020-11-27T12:38:55+01:00
Set the source encoding to fix the build failure with pbuilder

- - - - -
7bb996ac by Emmanuel Bourg at 2020-11-27T12:39:27+01:00
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/control
- + debian/maven.properties
- debian/patches/fix_packaging.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+takari-polyglot-maven (0.4.5-3) unstable; urgency=medium
+
+  * Team upload.
+  * Set the source encoding to fix the build failure with pbuilder
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 27 Nov 2020 12:39:20 +0100
+
 takari-polyglot-maven (0.4.5-2) unstable; urgency=medium
 
   * Source only upload.


=====================================
debian/control
=====================================
@@ -2,12 +2,23 @@ Source: takari-polyglot-maven
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Sudip Mukherjee <sudipm.mukherjee at gmail.com>,
-           tony mancill <tmancill at debian.org>
-Build-Depends: debhelper-compat (= 13), default-jdk, maven-debian-helper
-Build-Depends-Indep: default-jdk-doc, groovy, groovy-doc, junit4, libcommons-logging-java,
- libcommons-logging-java-doc, libmaven-javadoc-plugin-java, libplexus-component-metadata-java
-Conflicts: libpolyglot-maven-java
+Uploaders:
+ Sudip Mukherjee <sudipm.mukherjee at gmail.com>,
+ tony mancill <tmancill at debian.org>
+Build-Depends:
+ debhelper-compat (= 13),
+ default-jdk,
+ default-jdk-doc,
+ groovy,
+ groovy-doc,
+ junit4,
+ libcommons-logging-java,
+ libcommons-logging-java-doc,
+ libmaven-javadoc-plugin-java,
+ libplexus-component-metadata-java,
+ maven-debian-helper
+Conflicts:
+ libpolyglot-maven-java
 Standards-Version: 4.5.0
 Rules-Requires-Root: no
 Vcs-Git: https://salsa.debian.org/java-team/takari-polyglot-maven.git


=====================================
debian/maven.properties
=====================================
@@ -0,0 +1,6 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
+
+maven.compiler.release=8
+project.build.sourceEncoding=UTF-8


=====================================
debian/patches/fix_packaging.patch
=====================================
@@ -16,16 +16,6 @@ Forwarded: not-needed
    <name>Polyglot :: Common</name>
  
    <build>
-@@ -25,5 +25,9 @@
-       </resource>
-     </resources>
-   </build>
-+  <properties>
-+    <maven.compiler.source>1.8</maven.compiler.source>
-+    <maven.compiler.target>1.8</maven.compiler.target>
-+  </properties>
- 
- </project>
 --- takari-polyglot-maven-0.4.5.orig/polyglot-groovy/pom.xml
 +++ takari-polyglot-maven-0.4.5/polyglot-groovy/pom.xml
 @@ -14,7 +14,7 @@



View it on GitLab: https://salsa.debian.org/java-team/takari-polyglot-maven/-/compare/e9bd4fd645dd090eb897bc12b73151c4fae11d24...7bb996ac6947fc4e4f43703bd839fdc8fce6b079

-- 
View it on GitLab: https://salsa.debian.org/java-team/takari-polyglot-maven/-/compare/e9bd4fd645dd090eb897bc12b73151c4fae11d24...7bb996ac6947fc4e4f43703bd839fdc8fce6b079
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/20201127/5068b06f/attachment.html>