[Git][java-team/libusb-java][master] 6 commits: Bump Standards-Version to 4.6.2

Sun Apr 28 18:41:19 BST 2024


Tony Mancill pushed to branch master at Debian Java Maintainers / libusb-java


Commits:
ecdfbb6f by tony mancill at 2024-02-01T22:30:37-08:00
Bump Standards-Version to 4.6.2

- - - - -
98cf4455 by tony mancill at 2024-02-01T22:30:51-08:00
Set Rules-Requires-Root: no in debian/control

- - - - -
d82b5abc by tony mancill at 2024-04-28T10:38:17-07:00
Add patch for FTCBFS: uses the build architecture compiler (Closes: #1069921)

- - - - -
ae5f041d by tony mancill at 2024-04-28T10:38:17-07:00
Bump Standards-Version to 4.7.0

- - - - -
3e7400ce by tony mancill at 2024-04-28T10:38:17-07:00
Refresh patches

- - - - -
60116037 by tony mancill at 2024-04-28T10:39:37-07:00
Prepare changelog for upload

- - - - -


6 changed files:

- debian/changelog
- debian/control
- + debian/patches/cross.patch
- debian/patches/series
- debian/patches/sharedLibraries.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,16 +1,24 @@
-libusb-java (0.8+ztex20090101-10) UNRELEASED; urgency=medium
+libusb-java (0.8+ztex20090101-10) unstable; urgency=medium
+
+  * Team upload
 
   [ Vladimir Petko ]
   * d/rules, d/p/java-compat.patch: use java_compat_level variable provided
     by java-common to adjust -source/-target level to the minimum required
     by the default Java (Closes: #1057523).
 
+  [ Helmut Grohne ]
+  * Fix FTCBFS: Use cross tools for build. (Closes: #1069921)
+
   [ Debian Janitor ]
   * Trim trailing whitespace.
   * Use versioned copyright format URI.
-  * Update standards version to 4.6.1, no changes needed.
 
- -- Vladimir Petko <vladimir.petko at canonical.com>  Tue, 30 Jan 2024 15:21:25 +1300
+  [ tony mancill ]
+  * Bump Standards-Version to 4.7.0
+  * Set Rules-Requires-Root: no in debian/control
+
+ -- tony mancill <tmancill at debian.org>  Sun, 28 Apr 2024 10:27:45 -0700
 
 libusb-java (0.8+ztex20090101-9) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -7,10 +7,11 @@ Build-Depends:
  debhelper-compat (= 13),
  default-jdk,
  libusb-dev
-Standards-Version: 4.6.1
+Standards-Version: 4.7.0
 Vcs-Git: https://salsa.debian.org/java-team/libusb-java.git
 Vcs-Browser: https://salsa.debian.org/java-team/libusb-java
 Homepage: http://libusbjava.sf.net
+Rules-Requires-Root: no
 
 Package: libusb-java-lib
 Architecture: any


=====================================
debian/patches/cross.patch
=====================================
@@ -0,0 +1,50 @@
+--- a/Makefile
++++ b/Makefile
+@@ -21,7 +21,7 @@
+ ###############################
+ # this should not be modified #
+ ###############################
+-GCC=gcc
++CC?=gcc
+ STRIP=strip
+ CHMOD=chmod -x
+ JAVAC=javac -source $(JAVA_COMPAT_LEVEL) -target $(JAVA_COMPAT_LEVEL) -encoding ISO-8859-1
+@@ -51,7 +51,7 @@
+ libs: $(LIBTARGET_SH)
+ 
+ %.o: %.c LibusbJava.h
+-	$(GCC) -fPIC -g -c -std=c99 -Wall -Wno-pointer-to-int-cast $(LIBINCS) $< -o$@
++	$(CC) -fPIC -g -c -std=c99 -Wall -Wno-pointer-to-int-cast $(LIBINCS) $< -o$@
+ 
+ $(LIBTARGET_ST): $(LIBSRCS)
+ 
+@@ -64,25 +64,25 @@
+ 
+ 
+ $(LIBTARGET_ST)$(VERSIONSUFFIX): $(LIBSRCS)
+-	$(GCC) -shared -Wl,-soname,$(LIBTARGET_ST),-static $(LIBINCS) $(LIBSRCS) -static -o $(LIBTARGET_ST)$(VERSIONSUFFIX) $(LIBLIBS)
++	$(CC) -shared -Wl,-soname,$(LIBTARGET_ST),-static $(LIBINCS) $(LIBSRCS) -static -o $(LIBTARGET_ST)$(VERSIONSUFFIX) $(LIBLIBS)
+ 	[ -r $(LIBTARGET_ST) ] || ln -s $(LIBTARGET_ST)$(VERSIONSUFFIX) $(LIBTARGET_ST)
+ 	$(STRIP) $(LIBTARGET_ST)
+ 	$(CHMOD) $(LIBTARGET_ST)
+ 
+ $(LIBTARGET_SH)$(VERSIONSUFFIX): $(LIBSRCS)
+-	$(GCC) -fPIC -shared -Wl,-soname,$(LIBTARGET_SH) $(LIBINCS) $(LIBSRCS) -o $(LIBTARGET_SH)$(VERSIONSUFFIX) $(LIBLIBS)
++	$(CC) -fPIC -shared -Wl,-soname,$(LIBTARGET_SH) $(LIBINCS) $(LIBSRCS) -o $(LIBTARGET_SH)$(VERSIONSUFFIX) $(LIBLIBS)
+ 	[ -r $(LIBTARGET_SH) ] || ln -s $(LIBTARGET_SH)$(VERSIONSUFFIX) $(LIBTARGET_SH)
+ 	$(STRIP) $(LIBTARGET_SH)
+ 	$(CHMOD) $(LIBTARGET_SH)
+ 
+ $(LIBTARGET)$(VERSIONSUFFIX): $(LIBSRCS)
+-	$(GCC) -fPIC -shared -Wl,-soname,$(LIBTARGET) $(LIBINCS) $(LIBSRCS) -o $(LIBTARGET)$(VERSIONSUFFIX) $(LIBLIBS)
++	$(CC) -fPIC -shared -Wl,-soname,$(LIBTARGET) $(LIBINCS) $(LIBSRCS) -o $(LIBTARGET)$(VERSIONSUFFIX) $(LIBLIBS)
+ 	[ -r $(LIBTARGET) ] || ln -s $(LIBTARGET)$(VERSIONSUFFIX) $(LIBTARGET)
+ 	$(STRIP) $(LIBTARGET)
+ 	$(CHMOD) $(LIBTARGET)
+ 
+ $(LIBTARGET_64)$(VERSIONSUFFIX): $(LIBSRCS64)
+-	$(GCC) -fPIC -m64 -shared -std=c99 -Wall -Wno-pointer-to-int-cast -Wl,-soname,$(LIBTARGET_64) $(LIBINCS) $(LIBSRCS64) $(LIBLIBS) -o $(LIBTARGET_64)$(VERSIONSUFFIX)
++	$(CC) -fPIC -m64 -shared -std=c99 -Wall -Wno-pointer-to-int-cast -Wl,-soname,$(LIBTARGET_64) $(LIBINCS) $(LIBSRCS64) $(LIBLIBS) -o $(LIBTARGET_64)$(VERSIONSUFFIX)
+ 	[ -r $(LIBTARGET_64) ] || ln -s $(LIBTARGET_64)$(VERSIONSUFFIX) $(LIBTARGET_64)
+ 	$(STRIP) $(LIBTARGET_64)
+ 	$(CHMOD) $(LIBTARGET_64)


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 jniInclude.patch
 sharedLibraries.patch
 java-compat.patch
+cross.patch


=====================================
debian/patches/sharedLibraries.patch
=====================================
@@ -1,8 +1,6 @@
-Index: libusb-java-0.8+ztex20090101/Makefile
-===================================================================
---- libusb-java-0.8+ztex20090101.orig/Makefile
-+++ libusb-java-0.8+ztex20090101/Makefile
-@@ -25,7 +25,7 @@
+--- a/Makefile
++++ b/Makefile
+@@ -27,7 +27,7 @@
  JAVAC=javac
  RM=rm -f
  INSTALL=install
@@ -11,7 +9,7 @@ Index: libusb-java-0.8+ztex20090101/Makefile
  INSTALLEXE=$(INSTALL) -m 0755
  INSTALLFILE=$(INSTALL) -m 0644
  OBJEXTRADEPS=LibusbJava.h
-@@ -45,24 +45,43 @@
+@@ -47,24 +47,43 @@
  
  classes: classes.made
  
@@ -62,7 +60,7 @@ Index: libusb-java-0.8+ztex20090101/Makefile
  	$(STRIP) $(LIBTARGET_64)
  	$(CHMOD) $(LIBTARGET_64)
  
-@@ -81,7 +100,5 @@
+@@ -83,7 +102,5 @@
  	$(INSTALLFILE) ch/ntb/usb/*.class ../libusbJava/ch/ntb/usb
  	$(INSTALLFILE) ch/ntb/usb/logger/*.class ../libusbJava/ch/ntb/usb/logger
  


=====================================
debian/rules
=====================================
@@ -16,7 +16,7 @@ test:
 
 DOCPATH=doc/html
 override_dh_auto_build-arch:
-	$(MAKE) STRIP="# not stripping: " libs
+	dh_auto_build -- STRIP="# not stripping: " libs
 	touch build-arch-stamp
 
 override_dh_auto_build-indep:



View it on GitLab: https://salsa.debian.org/java-team/libusb-java/-/compare/4f7a6fc96d965f856f75f9b96fb51ba5cb7187e4...60116037e2d5d7332995defc30f4381400e61969

-- 
View it on GitLab: https://salsa.debian.org/java-team/libusb-java/-/compare/4f7a6fc96d965f856f75f9b96fb51ba5cb7187e4...60116037e2d5d7332995defc30f4381400e61969
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/20240428/b2020df0/attachment.htm>
