[Git][java-team/jabref][master] 5 commits: Build depend on librelaxng-datatype-java

gregor herrmann gitlab at salsa.debian.org
Sat Dec 8 14:50:15 GMT 2018 

gregor herrmann pushed to branch master at Debian Java Maintainers / jabref


Commits:
267655be by gregor herrmann at 2018-12-08T13:36:38Z
Build depend on librelaxng-datatype-java

and add its jar to the classpath in debian/xjc.sh.

Closes: #915806

- - - - -
b8963069 by gregor herrmann at 2018-12-08T13:40:22Z
Remove trailing whitespace from debian/*.

- - - - -
b4ec23b1 by gregor herrmann at 2018-12-08T13:41:31Z
Add a lintian override (empty directory in source tree).

- - - - -
f0a8923e by gregor herrmann at 2018-12-08T13:46:34Z
Add minimal headers to two patches.

- - - - -
b53fc451 by gregor herrmann at 2018-12-08T14:50:07Z
releasing package jabref version 3.8.2+ds-10

- - - - -


7 changed files:

- debian/README.Debian
- debian/changelog
- debian/control
- debian/patches/070_jdk9_swing.patch
- debian/patches/080_jdk11_jaxb.patch
- + debian/source/lintian-overrides
- debian/xjc.sh


Changes:

=====================================
debian/README.Debian
=====================================
@@ -11,7 +11,7 @@ If you want to override this selection mechanism start JabRef with
 The debian version of JabRef is close to the official version. The
 only differences are the following:
 
- - The dialog for merging entries (https://help.jabref.org/en/MergeEntries) 
+ - The dialog for merging entries (https://help.jabref.org/en/MergeEntries)
    does not support syntax highlighting
  - The Debian version uses the microba date picker
  - The live update functionality for PostgreSQL has been removed


=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+jabref (3.8.2+ds-10) unstable; urgency=medium
+
+  * Build depend on librelaxng-datatype-java and add its jar to the
+    classpath in debian/xjc.sh. (Closes: #915806)
+  * Remove trailing whitespace from debian/*.
+  * Add a lintian override (empty directory in source tree).
+  * Add minimal headers to two patches.
+
+ -- gregor herrmann <gregoa at debian.org>  Sat, 08 Dec 2018 15:45:44 +0100
+
 jabref (3.8.2+ds-9) unstable; urgency=medium
 
   * Invoke xjc from jaxb-xjc and drop build-dep on openjdk-8
@@ -437,7 +447,7 @@ jabref (2.7~beta1+ds-3) unstable; urgency=low
 
   * Edit jabref wrapper script to resolve libjgoodies-common-java jar.
     Add libjgoodies-common-java to Depends.  (Closes: #614506)
-  * Change "looks" in wrapper script to "jgoodies-looks" 
+  * Change "looks" in wrapper script to "jgoodies-looks"
 
  -- tony mancill <tmancill at debian.org>  Mon, 21 Feb 2011 20:04:55 -0800
 
@@ -466,10 +476,10 @@ jabref (2.6+ds-4) unstable; urgency=low
   * Set Standards-Version to 3.9.1 (no changes).
 
   [ tony mancill ]
-  * delete 05_antlr.patch 
+  * delete 05_antlr.patch
   * add 05_antlrv32.patch: include new BstParser/Lexer classes generated
     by antlr 3.2.  (Closes: #591124)
-  * Update README.source with information regarding regeneration of 
+  * Update README.source with information regarding regeneration of
     BstParser and BstLexer classes.
 
  -- tony mancill <tmancill at debian.org>  Tue, 03 Aug 2010 19:41:44 -0700
@@ -541,7 +551,7 @@ jabref (2.6~beta2+dfsg-1) unstable; urgency=low
     get re-generated on each build.
   * Install reportbug presubj file via dh_bugfiles.
   * debian/copyright: update formatting and list of third-party copyright
-    holders. 
+    holders.
 
   [ tony mancill ]
   * Add PreviewPanel patch to remove dependency on DocumentPrinter class.
@@ -829,7 +839,7 @@ jabref (2.1-4) unstable; urgency=low
 jabref (2.1-3) unstable; urgency=low
 
   * Change menu section to "Apps/Databases" and remove lintian override.
-    "Apps/Data Management" was premature, thanks to Frank Küster and 
+    "Apps/Data Management" was premature, thanks to Frank Küster and
     Bill Allombert for pointing this out (cf. #386320).
 
  -- gregor herrmann <gregor+debian at comodo.priv.at>  Mon, 11 Sep 2006 21:12:37 +0200
@@ -873,7 +883,7 @@ jabref (2.0.1+2.1b2-4) unstable; urgency=low
   * Add icon to menu entry, thanks to LI Daobing for the idea
     (closes: #380604).
   * Remove references to the libraries Commons Logging and Commons HTTP Client
-    from debian/copyright, as they are not included in the upstream tarball 
+    from debian/copyright, as they are not included in the upstream tarball
     any more.
 
  -- gregor herrmann <gregor+debian at comodo.priv.at>  Mon, 31 Jul 2006 16:37:47 +0200
@@ -938,7 +948,7 @@ jabref (2.0.1-3) unstable; urgency=low
 jabref (2.0.1-2) unstable; urgency=low
 
   * Update to Standards-Version: 3.7.0 (no changes required).
-  * Moved debhelper from Build-Depends-Indep to Build-Depends 
+  * Moved debhelper from Build-Depends-Indep to Build-Depends
     in debian/control.
 
  -- gregor herrmann <gregor+debian at comodo.priv.at>  Mon,  1 May 2006 14:44:02 +0200
@@ -986,4 +996,3 @@ jabref (1.8-1) unstable; urgency=low
   * Initial release Closes: #205392
 
  -- gregor herrmann <gregor+debian at comodo.priv.at>  Thu,  1 Sep 2005 23:18:00 +0200
-


=====================================
debian/control
=====================================
@@ -32,6 +32,7 @@ Build-Depends-Indep: ant,
                      libmariadb-java,
                      libpdfbox-java,
                      libpostgresql-jdbc-java (>= 9.4.1212),
+                     librelaxng-datatype-java,
                      libreoffice-java-common,
                      libscram-java,
                      libspin-java,


=====================================
debian/patches/070_jdk9_swing.patch
=====================================
@@ -1,3 +1,7 @@
+Description: Add JDK9 swing patch
+Origin: vendor
+Author: tony mancill <tmancill at debian.org>
+
 --- a/src/main/java/net/sf/jabref/gui/FindUnlinkedFilesDialog.java
 +++ b/src/main/java/net/sf/jabref/gui/FindUnlinkedFilesDialog.java
 @@ -398,8 +398,10 @@ public class FindUnlinkedFilesDialog ext


=====================================
debian/patches/080_jdk11_jaxb.patch
=====================================
@@ -1,3 +1,7 @@
+Description: patch build.gradle to compile using jaxb-api
+Origin: vendor
+Author: tony mancill <tmancill at debian.org>
+
 --- a/build.gradle
 +++ b/build.gradle
 @@ -128,6 +128,7 @@


=====================================
debian/source/lintian-overrides
=====================================
@@ -0,0 +1,2 @@
+# this is a side effect of creating the +ds version
+jabref source: source-contains-empty-directory src/main/java/osx/macadapter/


=====================================
debian/xjc.sh
=====================================
@@ -2,7 +2,7 @@
 #
 # generate Java bindings for XML schemas used in JabRef
 
-XJC="java -cp /usr/share/java/jaxb-xjc.jar:/usr/share/java/jaxb-runtime.jar:/usr/share/java/xml-resolver.jar com.sun.tools.xjc.XJCFacade"
+XJC="java -cp /usr/share/java/jaxb-xjc.jar:/usr/share/java/jaxb-runtime.jar:/usr/share/java/xml-resolver.jar:/usr/share/java/relaxngDatatype.jar com.sun.tools.xjc.XJCFacade"
 DEST=src/main/gen
 
 $XJC -d $DEST \



View it on GitLab: https://salsa.debian.org/java-team/jabref/compare/f778b6e3de5b2a849c6b8873a36903d703f2eb93...b53fc451ed7930b9d5622a5d826b64b2de5a92df

-- 
View it on GitLab: https://salsa.debian.org/java-team/jabref/compare/f778b6e3de5b2a849c6b8873a36903d703f2eb93...b53fc451ed7930b9d5622a5d826b64b2de5a92df
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/20181208/c2c884ae/attachment.html>

More information about the pkg-java-commits mailing list