[Git][java-team/jline3][master] 6 commits: Wrap and sort

Emmanuel Bourg gitlab at salsa.debian.org
Thu Jun 11 16:53:07 BST 2020



Emmanuel Bourg pushed to branch master at Debian Java Maintainers / jline3


Commits:
2081723c by Emmanuel Bourg at 2020-06-11T14:26:03+02:00
Wrap and sort

- - - - -
0b8f9a91 by Emmanuel Bourg at 2020-06-11T17:02:32+02:00
Removed the dependency on junit4

- - - - -
e3ef7bd2 by Emmanuel Bourg at 2020-06-11T17:03:24+02:00
Renamed the files installed in /usr/share/java to avoid conflicting with libjline-java

- - - - -
467191cc by Emmanuel Bourg at 2020-06-11T17:45:23+02:00
Fixed debian/copyright

- - - - -
501f5aad by Emmanuel Bourg at 2020-06-11T17:45:28+02:00
Removed the autopkgtest (not working)

- - - - -
d47a7120 by Emmanuel Bourg at 2020-06-11T17:45:28+02:00
Upload to unstable

- - - - -


6 changed files:

- debian/changelog
- debian/control
- debian/copyright
- debian/libjline3-java.poms
- debian/maven.ignoreRules
- − debian/tests/control


Changes:

=====================================
debian/changelog
=====================================
@@ -1,12 +1,5 @@
 jline3 (3.3.1-1) unstable; urgency=medium
 
-  [ Saif Abdul Cassim ]
-  * Initial upstream branch. (Closes: #933328)
-  * New upstream version 3.3.1
+  * Initial release (Closes: #933328)
 
-  [ Samyak Jain ]
-  * Bumps standard version to 4.5.0 and removes d/compat
-  * Adds metadata in d/upstream
-  * Corrects copyright file
-
- -- Samyak Jain <samyak.jn11 at gmail.com>  Sat, 09 May 2020 21:04:27 +0530
+ -- Saif Abdul Cassim <saif.15 at cse.mrt.ac.lk>  Thu, 11 Jun 2020 17:20:55 +0200


=====================================
debian/control
=====================================
@@ -1,18 +1,19 @@
 Source: jline3
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Saif Abdul Cassim <saif.15 at cse.mrt.ac.lk>,
-	Samyak Jain <samyak.jn11 at gmail.com>
 Section: java
 Priority: optional
-Build-Depends: debhelper-compat (=12),
-               junit4,
-               libbuild-helper-maven-plugin-java,
-               libjna-java,
-               libjuniversalchardet-java,
-               libmaven-bundle-plugin-java,
-               libmaven-dependency-plugin-java,
-               libmaven-source-plugin-java,
-               maven-debian-helper
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders:
+ Saif Abdul Cassim <saif.15 at cse.mrt.ac.lk>,
+ Samyak Jain <samyak.jn11 at gmail.com>
+Build-Depends:
+ debhelper-compat (= 12),
+ libbuild-helper-maven-plugin-java,
+ libjna-java,
+ libjuniversalchardet-java,
+ libmaven-bundle-plugin-java,
+ libmaven-dependency-plugin-java,
+ libmaven-source-plugin-java,
+ maven-debian-helper
 Standards-Version: 4.5.0
 Vcs-Browser: https://salsa.debian.org/java-team/jline3
 Vcs-Git: https://salsa.debian.org/java-team/jline3.git
@@ -21,10 +22,10 @@ Rules-Requires-Root: no
 
 Package: libjline3-java
 Architecture: all
-Depends: junit4,
-         libjna-java,
-         libjuniversalchardet-java,
-         ${misc:Depends}
+Depends:
+ libjna-java,
+ libjuniversalchardet-java,
+ ${misc:Depends}
 Description: Console input handling library
  JLine is a Java library for handling console input. It is similar in
  functionality to BSD editline and GNU readline but with additional


=====================================
debian/copyright
=====================================
@@ -1,24 +1,33 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: jline3
+Upstream-Name: JLine
 Source: https://github.com/jline/jline3
+Files-Excluded: *.exe
+                mvnw*
+                .mvn
+                .travis*
 
 Files: *
-Copyright: 2002-2017, Guillaume Nodet
+Copyright: 2000-2005, Dieter Wimberger
+           2002-2017, Guillaume Nodet
 	   2002-2016, Matti Rintanikkola
 	   2002-2016, Jason Dillon
 License: BSD-3-clause
 
 Files: builtins/*
-  reader/src/main/java/org/jline/reader/EOFError.java
-  reader/src/main/java/org/jline/reader/SyntaxError.java
-  terminal-jna/src/main/java/org/jline/terminal/impl/jna/win/AnsiOutputStream.java
+       reader/src/main/java/org/jline/reader/EOFError.java
+       reader/src/main/java/org/jline/reader/SyntaxError.java
+       terminal-jna/src/main/java/org/jline/terminal/impl/jna/win/AnsiOutputStream.java
 Copyright: 2002-2016, Guillaume Nodet
 License: Apache-2.0
+ On Debian systems, the complete text of the Apache version 2.0 license
+ can be found in "/usr/share/common-licenses/Apache-2.0".
 
 Files: debian/*
-Copyright: 2020, Saif Abdul Cassim <saif.15 at cse.mrt.ac.lk>
+Copyright: 2019, Saif Abdul Cassim <saif.15 at cse.mrt.ac.lk>
+           2020, Samyak Jain <samyak.jn11 at gmail.com>
 License: BSD-3-clause
-Comment: The Debian packaging is licensed under the same terms as the original package.
+Comment:
+ The Debian packaging is licensed under the same terms as the upstream project.
 
 License: BSD-3-clause
  Redistribution and use in source and binary forms, with or
@@ -50,34 +59,3 @@ License: BSD-3-clause
  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
  IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  OF THE POSSIBILITY OF SUCH DAMAGE.
-
-License: Apache-2.0
- Redistribution and use in source and binary forms, with or
- without modification, are permitted provided that the following
- conditions are met:
- .
- Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- .
- Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer
- in the documentation and/or other materials provided with
- the distribution.
- .
- Neither the name of JLine nor the names of its contributors
- may be used to endorse or promote products derived from this
- software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- OF THE POSSIBILITY OF SUCH DAMAGE.


=====================================
debian/libjline3-java.poms
=====================================
@@ -26,12 +26,12 @@
 #     Empty by default. [mh_install]
 #
 pom.xml                --no-parent --has-package-version
-builtins/pom.xml       --java-lib  --has-package-version
+builtins/pom.xml       --java-lib  --has-package-version --usj-name=jline3-builtins
 demo/pom.xml           --ignore
-jline/pom.xml          --java-lib  --has-package-version
-reader/pom.xml         --java-lib  --has-package-version
+jline/pom.xml          --java-lib  --has-package-version --usj-name=jline3
+reader/pom.xml         --java-lib  --has-package-version --usj-name=jline3-reader
 remote-ssh/pom.xml     --ignore
 remote-telnet/pom.xml  --ignore
-terminal/pom.xml       --java-lib  --has-package-version
-terminal-jansi/pom.xml --java-lib  --has-package-version
-terminal-jna/pom.xml   --java-lib  --has-package-version
+terminal/pom.xml       --java-lib  --has-package-version --usj-name=jline3-terminal
+terminal-jansi/pom.xml --java-lib  --has-package-version --usj-name=jline3-terminal-jansi
+terminal-jna/pom.xml   --java-lib  --has-package-version --usj-name=jline3-terminal-jna


=====================================
debian/maven.ignoreRules
=====================================
@@ -1,4 +1,5 @@
 
+junit junit * * * *
 org.apache.maven.plugins maven-enforcer-plugin * * * *
 org.apache.maven.plugins maven-javadoc-plugin * * * *
 org.apache.maven.plugins maven-source-plugin * * * *


=====================================
debian/tests/control deleted
=====================================
@@ -1,4 +0,0 @@
-Test-Command: ./build demo
-Depends: @, @builddeps@
-Restrictions: allow-stderr
-



View it on GitLab: https://salsa.debian.org/java-team/jline3/-/compare/41796932e619d094dbb2653e74a87e2a23d539b2...d47a7120ee07802ff1f102530b4eb518ce42ef5e

-- 
View it on GitLab: https://salsa.debian.org/java-team/jline3/-/compare/41796932e619d094dbb2653e74a87e2a23d539b2...d47a7120ee07802ff1f102530b4eb518ce42ef5e
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/20200611/87277849/attachment.html>


More information about the pkg-java-commits mailing list