[Git][java-team/hyperic-sigar][master] 16 commits: Import Debian changes 1.6.4+dfsg-2.1
Markus Koschany
gitlab at salsa.debian.org
Sat Jan 12 13:51:28 GMT 2019
Markus Koschany pushed to branch master at Debian Java Maintainers / hyperic-sigar
Commits:
ea2ca7c7 by YunQiang Su at 2019-01-12T13:00:16Z
Import Debian changes 1.6.4+dfsg-2.1
hyperic-sigar (1.6.4+dfsg-2.1) unstable; urgency=medium
* Non-maintainer upload.
* Don't use -m64 for mips64(el) and arm64 (Closes: 766951)
hyperic-sigar (1.6.4+dfsg-2) unstable; urgency=medium
* Put package under team maintenance; added Vcs-* entries
* Added patch by Plamen Aleksandrov to fix FTBFS on mips (Closes:
#756365)
- - - - -
8880d836 by Markus Koschany at 2019-01-12T13:00:37Z
Switch to compat level 12.
- - - - -
880bc2f6 by Markus Koschany at 2019-01-12T13:01:32Z
Fix FTBFS with glibc 2.28.
Thanks: Adrian Bunk for the report and Logan Rosen for the patch.
Closes: #916079
- - - - -
64e4b2e8 by Markus Koschany at 2019-01-12T13:02:24Z
Declare compliance with Debian Policy 4.3.0.
- - - - -
27eb50e4 by Markus Koschany at 2019-01-12T13:02:55Z
Use canonical VCS URI.
- - - - -
75a29180 by Markus Koschany at 2019-01-12T13:03:06Z
wrap-and-sort -sa.
- - - - -
ced4c442 by Markus Koschany at 2019-01-12T13:04:10Z
Fix homepage and source URI and point to github.com repository.
- - - - -
f0246194 by Markus Koschany at 2019-01-12T13:04:36Z
Use https for Format field.
- - - - -
7d18598e by Markus Koschany at 2019-01-12T13:05:58Z
Update changelog
- - - - -
be407f97 by Markus Koschany at 2019-01-12T13:09:49Z
Use compat 11 because dh_dwz causes an error.
- - - - -
567641d0 by Markus Koschany at 2019-01-12T13:15:49Z
Use priority optional, extra is deprecated.
- - - - -
10d13a80 by Markus Koschany at 2019-01-12T13:16:17Z
Fix copyright syntax
- - - - -
5d48c181 by Markus Koschany at 2019-01-12T13:17:14Z
Install the NOTICE file.
- - - - -
baddf737 by Markus Koschany at 2019-01-12T13:41:32Z
d/control: Don't duplicate section field.
- - - - -
830debd6 by Markus Koschany at 2019-01-12T13:45:25Z
Remove debug-symbols.patch again.
- - - - -
10e2e991 by Markus Koschany at 2019-01-12T13:46:48Z
Don't build the automatic dbgsym package because it would be empty due
to missing debug symbols.
- - - - -
10 changed files:
- debian/changelog
- debian/compat
- debian/control
- debian/copyright
- debian/libhyperic-sigar-java.install
- + debian/patches/0004-make-the-package-compile-on-MIPS.patch
- + debian/patches/ftbfs-glibc-2.28.diff
- + debian/patches/no-m64-mips-arm.diff
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,34 @@
+hyperic-sigar (1.6.4+dfsg-3) unstable; urgency=medium
+
+ * Team upload.
+ * Switch to compat level 11.
+ * Fix FTBFS with glibc 2.28.
+ Thanks to Adrian Bunk for the report and Logan Rosen for the patch.
+ (Closes: #916079)
+ * Declare compliance with Debian Policy 4.3.0.
+ * Use canonical VCS URI.
+ * wrap-and-sort -sa.
+ * Fix homepage and source URI and point to github.com repository.
+ * Use https for Format field.
+ * d/control: Use priority optional.
+
+ -- Markus Koschany <apo at debian.org> Sat, 12 Jan 2019 14:05:31 +0100
+
+hyperic-sigar (1.6.4+dfsg-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Don't use -m64 for mips64(el) and arm64 (Closes: 766951)
+
+ -- YunQiang Su <syq at debian.org> Mon, 03 Nov 2014 13:26:28 +0800
+
+hyperic-sigar (1.6.4+dfsg-2) unstable; urgency=medium
+
+ * Put package under team maintenance; added Vcs-* entries
+ * Added patch by Plamen Aleksandrov to fix FTBFS on mips (Closes:
+ #756365)
+
+ -- Hilko Bengen <bengen at debian.org> Tue, 29 Jul 2014 16:42:21 +0200
+
hyperic-sigar (1.6.4+dfsg-1) unstable; urgency=low
* Initial release (Closes: #575873)
=====================================
debian/compat
=====================================
@@ -1 +1 @@
-9
+11
=====================================
debian/control
=====================================
@@ -1,17 +1,25 @@
Source: hyperic-sigar
Section: java
-Priority: extra
-Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Hilko Bengen <bengen at debian.org>
-Build-Depends: debhelper (>= 9),
- ant, ant-contrib-cpptasks, default-jdk, liblog4j1.2-java,
-Standards-Version: 3.9.5
-Homepage: http://support.hyperic.com/display/SIGAR/Home
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders:
+ Hilko Bengen <bengen at debian.org>
+Build-Depends:
+ ant,
+ ant-contrib-cpptasks,
+ debhelper (>= 11),
+ default-jdk,
+ liblog4j1.2-java
+Standards-Version: 4.3.0
+Homepage: https://github.com/hyperic/sigar
+Vcs-Git: https://salsa.debian.org/java-team/hyperic-sigar.git
+Vcs-Browser: https://salsa.debian.org/java-team/hyperic-sigar
Package: libhyperic-sigar-java
-Section: java
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: System Information Gatherer And Reporter - Java bindings
The Sigar API provides a portable interface for gathering system
information such as:
=====================================
debian/copyright
=====================================
@@ -1,16 +1,16 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: hyperic-sigar
-Source: http://www.hyperic.com/products/sigar
+Source: https://github.com/hyperic/sigar
Files: *
Copyright: 2009 Hyperic, Inc.
-License: Apache 2.0
+License: Apache-2.0
Files: debian/*
Copyright: 2013, 2014 Hilko Bengen <bengen at debian.org
-License: Apache 2.0
+License: Apache-2.0
-License: Apache 2.0
+License: Apache-2.0
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
=====================================
debian/libhyperic-sigar-java.install
=====================================
@@ -1,2 +1,3 @@
bindings/java/sigar-bin/lib/libsigar.so usr/lib/jni/
bindings/java/sigar-bin/lib/sigar.jar usr/share/java/
+NOTICE usr/share/doc/libhyperic-sigar-java/
=====================================
debian/patches/0004-make-the-package-compile-on-MIPS.patch
=====================================
@@ -0,0 +1,39 @@
+From: Hilko Bengen <bengen at debian.org>
+Date: Tue, 29 Jul 2014 16:41:18 +0200
+Subject: make the package compile on MIPS
+
+---
+ src/sigar_getline.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/sigar_getline.c b/src/sigar_getline.c
+index 0a8946b..fd36fef 100644
+--- a/src/sigar_getline.c
++++ b/src/sigar_getline.c
+@@ -362,7 +362,7 @@ static void search_forw(int s); /* look forw for current string */
+ #endif
+
+ #if defined(TIOCGETP) && !defined(__sgi) && !defined(R__MKLINUX) && \
+- !defined(R__ALPHALINUX) /* use BSD interface if possible */
++ !defined(R__ALPHALINUX) && !defined(__mips__) /* use BSD interface if possible */
+ #include <sgtty.h>
+ static struct sgttyb new_tty, old_tty;
+ static struct tchars tch;
+@@ -371,7 +371,7 @@ static struct ltchars ltch;
+ #ifdef SIGTSTP /* need POSIX interface to handle SUSP */
+ #include <termios.h>
+ #if defined(__sun) || defined(__sgi) || defined(R__MKLINUX) || \
+- defined(R__ALPHALINUX)
++ defined(R__ALPHALINUX) || defined(__mips__)
+ #undef TIOCGETP /* Solaris and SGI define TIOCGETP in <termios.h> */
+ #undef TIOCSETP
+ #endif
+@@ -412,7 +412,7 @@ gl_char_init() /* turn off input echo */
+ {
+ if (gl_notty) return;
+ #ifdef unix
+-#ifdef TIOCGETP /* BSD */
++#if defined(TIOCGETP) && !defined(__mips__) /* BSD */
+ ioctl(0, TIOCGETC, &tch);
+ ioctl(0, TIOCGLTC, <ch);
+ gl_intrc = tch.t_intrc;
=====================================
debian/patches/ftbfs-glibc-2.28.diff
=====================================
@@ -0,0 +1,22 @@
+Description: Fix FTBFS against glibc 2.28
+Author: Logan Rosen <logan at ubuntu.com>
+Forwarded: https://github.com/hyperic/sigar/pull/127
+Last-Update: 2019-01-11
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/os/linux/linux_sigar.c
++++ b/src/os/linux/linux_sigar.c
+@@ -22,8 +22,13 @@
+ #include <sys/param.h>
+ #include <sys/stat.h>
+ #include <sys/times.h>
++#include <sys/types.h>
+ #include <sys/utsname.h>
+
++#ifdef __GNU_LIBRARY__
++#include <sys/sysmacros.h>
++#endif
++
+ #include "sigar.h"
+ #include "sigar_private.h"
+ #include "sigar_util.h"
=====================================
debian/patches/no-m64-mips-arm.diff
=====================================
@@ -0,0 +1,14 @@
+Index: hyperic-sigar-1.6.4+dfsg/bindings/java/hyperic_jni/src/org/hyperic/jni/ArchNameTask.java
+===================================================================
+--- hyperic-sigar-1.6.4+dfsg.orig/bindings/java/hyperic_jni/src/org/hyperic/jni/ArchNameTask.java 2014-11-03 13:25:30.620030459 +0800
++++ hyperic-sigar-1.6.4+dfsg/bindings/java/hyperic_jni/src/org/hyperic/jni/ArchNameTask.java 2014-11-03 13:25:30.608030459 +0800
+@@ -75,7 +75,8 @@
+ if (ArchName.is64()) {
+ getProject().setProperty("jni.arch64", "true");
+ if (ArchLoader.IS_LINUX) {
+- if (!osArch.equals("ia64")) {
++ if (!osArch.equals("ia64") && !osArch.equals("mips64el")
++ && !osArch.equals("mips64") && !osArch.equals("aarch64")) {
+ getProject().setProperty("jni.gccm", "-m64");
+ }
+ }
=====================================
debian/patches/series
=====================================
@@ -1,3 +1,6 @@
0001-bindings-java-Remove-HP-UX-AIX-compiler-support.patch
0002-bindings-java-fix-java-build-script.patch
0003-bindings-java-Use-sane-name-for-JNI-library.patch
+0004-make-the-package-compile-on-MIPS.patch
+no-m64-mips-arm.diff
+ftbfs-glibc-2.28.diff
=====================================
debian/rules
=====================================
@@ -4,3 +4,6 @@ JAVA_HOME := /usr/lib/jvm/default-jdk
%:
dh $@ --sourcedirectory=bindings/java
+
+override_dh_strip:
+ dh_strip --no-automatic-dbgsym
View it on GitLab: https://salsa.debian.org/java-team/hyperic-sigar/compare/33888e0cc4f983909e953087846484274ca309df...10e2e9919c2574177208ecdd0036b3719c693d28
--
View it on GitLab: https://salsa.debian.org/java-team/hyperic-sigar/compare/33888e0cc4f983909e953087846484274ca309df...10e2e9919c2574177208ecdd0036b3719c693d28
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/20190112/ff3b91ab/attachment.html>
More information about the pkg-java-commits
mailing list