[Git][java-team/libmiglayout-java][master] 5 commits: Set Standards version to 4.5.1 (Rules-Requires-Root: no)

[Pierre Gruet]

Pierre Gruet pushed to branch master at Debian Java Maintainers / libmiglayout-java


Commits:
765e42ae by Pierre Gruet at 2020-12-17T21:38:10+01:00
Set Standards version to 4.5.1 (Rules-Requires-Root: no)

- - - - -
f2e84c13 by Pierre Gruet at 2020-12-17T21:39:33+01:00
Update Vcs- fields in d/control

- - - - -
61b1cd0c by Pierre Gruet at 2020-12-17T21:40:28+01:00
Removing useless scripts for package update

- - - - -
33aa2116 by Pierre Gruet at 2020-12-17T21:41:38+01:00
Depending on debhelper-compat 13

- - - - -
a23343fd by Pierre Gruet at 2020-12-31T17:56:52+01:00
Putting a default Maven dependency on org.eclipse.swt

- - - - -


6 changed files:

- − debian/compat
- debian/control
- − debian/orig-tar.sh
- + debian/patches/default_dependency_on_org_eclipse_swt.patch
- debian/patches/series
- debian/rules


Changes:

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


=====================================
debian/control
=====================================
@@ -8,16 +8,17 @@ Uploaders:
  Andrew Ross <ubuntu at rossfamily.co.uk>
 Build-Depends:
  ant,
- debhelper (>= 11),
+ debhelper-compat (= 13),
  default-jdk,
  libmaven-bundle-plugin-java,
  libopenjfx-java,
  libswt-gtk-4-java,
  maven-debian-helper
-Standards-Version: 4.2.1
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/libmiglayout-java.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libmiglayout-java.git
+Standards-Version: 4.5.1
+Vcs-Git: https://salsa.debian.org/java-team/libmiglayout-java.git
+Vcs-Browser: https://salsa.debian.org/java-team/libmiglayout-java
 Homepage: http://www.miglayout.com
+Rules-Requires-Root: no
 
 Package: libmiglayout-java
 Architecture: all


=====================================
debian/orig-tar.sh deleted
=====================================
@@ -1,17 +0,0 @@
-#!/bin/sh -e
-
-# called by uscan with '--upstream-version' <version> <file>
-VERSION=$2
-TAR=../libmiglayout-java_$VERSION.orig.tar.xz
-
-# clean up the upstream tarball
-unzip $3
-XZ_OPT=--best tar -c -J -f $TAR miglayout-*
-rm -rf miglayout-* $3
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
-    . .svn/deb-layout
-    mv $TAR $origDir
-    echo "moved $TAR to $origDir"
-fi


=====================================
debian/patches/default_dependency_on_org_eclipse_swt.patch
=====================================
@@ -0,0 +1,23 @@
+Description: Updating Maven dependencies concerning libswt-gtk-4-java
+ The module swt did not find the dependency libswt-gtk-4-java for the
+ architectures arm64 and ppc64el. We add a default dependency, outside of the
+ profiles, so that they meet their dependency.
+Author: Pierre Gruet <pgtdebian at free.fr>
+Debian-Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=976546
+Forwarded: not-needed
+Last-Update: 2020-12-22
+
+--- a/swt/pom.xml
++++ b/swt/pom.xml
+@@ -18,6 +18,11 @@
+             <artifactId>miglayout-core</artifactId>
+             <version>${project.version}</version>
+         </dependency>
++        <dependency>
++            <groupId>org.eclipse.swt</groupId>
++            <artifactId>org.eclipse.swt</artifactId>
++            <version>debian</version>
++        </dependency>
+ 	</dependencies>
+ 
+     <repositories>


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 javafx.patch
+default_dependency_on_org_eclipse_swt.patch


=====================================
debian/rules
=====================================
@@ -15,6 +15,3 @@ override_dh_auto_install:
 	jar -cf target/miglayout.jar -C target/classes/ .
 	dh_install -plibmiglayout-java target/miglayout.jar usr/share/java
 	dh_link -plibmiglayout-java /usr/share/java/miglayout.jar /usr/share/java/miglayout-$(DEB_UPSTREAM_VERSION).jar
-
-get-orig-source:
-	uscan --download-current-version --rename --repack --compression xz



View it on GitLab: https://salsa.debian.org/java-team/libmiglayout-java/-/compare/e621ea3c87fc026b2be6e2eb585873cd4463e7d9...a23343fd00c089972d1c640757d9a8c9a0127d6c

-- 
View it on GitLab: https://salsa.debian.org/java-team/libmiglayout-java/-/compare/e621ea3c87fc026b2be6e2eb585873cd4463e7d9...a23343fd00c089972d1c640757d9a8c9a0127d6c
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/20201231/cb93127b/attachment.html>