[Debian-iot-packaging] [libmatthew-java] 02/02: Import Debian patch 0.7.3-2

Thorsten Alteholz alteholz at moszumanska.debian.org
Fri Oct 14 20:46:47 UTC 2016


This is an automated email from the git hooks/post-receive script.

alteholz pushed a commit to branch master
in repository libmatthew-java.

commit 351e887a5f147fcf38e2ff36af17a38f09d838a0
Author: Santiago Vila <sanvila at debian.org>
Date:   Thu Aug 4 11:22:46 2016 +0100

    Import Debian patch 0.7.3-2
---
 debian/changelog                                   | 106 +++++++++++++++++++++
 debian/compat                                      |   1 +
 debian/control                                     |  58 +++++++++++
 debian/copyright                                   |  35 +++++++
 debian/libcgi-java.install                         |   2 +
 debian/libmatthew-debug-java.install               |   2 +
 debian/libmatthew-io-java.install                  |   1 +
 debian/libmatthew-java-doc.javadoc                 |   1 +
 debian/libunixsocket-java.install                  |   2 +
 .../001-use-relative-paths-in-manifest-file.patch  |  28 ++++++
 debian/patches/series                              |   1 +
 debian/rules                                       |  26 +++++
 debian/source/format                               |   1 +
 debian/watch                                       |   3 +
 14 files changed, 267 insertions(+)

diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..f4b8648
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,106 @@
+libmatthew-java (0.7.3-2) unstable; urgency=medium
+
+  * QA upload.
+  * Package is orphaned (Bug #762540), set Maintainer to "Debian QA Group".
+  * Switch to "3.0 (quilt)" source format.
+  * Apply patch from Michael Haggerty to use relative paths
+    in manifest file. Closes: #619890.
+  * Raise debhelper compat level to 9.
+  * Simplify debian/rules and put default-jdk-doc in Build-Depends.
+  * Remove cx/ath/matthew/debug/Debug.java in clean target, since it's
+    recreated during the build.
+
+ -- Santiago Vila <sanvila at debian.org>  Thu, 04 Aug 2016 11:22:46 +0100
+
+libmatthew-java (0.7.3-1) unstable; urgency=low
+
+  * New upstream release, fixes a memory leak (Closes: #590331)
+
+ -- Matthew Johnson <mjj29 at debian.org>  Thu, 05 Aug 2010 18:36:12 +0100
+
+libmatthew-java (0.7.2-3) unstable; urgency=low
+
+  * Use default-jdk-doc instead of classpath-doc (Closes: #567283)
+  * Fix some lintian warnings 
+  * Don't build doc when only building arch: any packages (Closes: #561414) 
+
+ -- Matthew Johnson <mjj29 at debian.org>  Sat, 17 Apr 2010 17:24:37 +0100
+
+libmatthew-java (0.7.2-2) unstable; urgency=low
+
+  * Convert to dh 7
+  * don't use default-jdk-builddep but default-jdk
+
+ -- Matthew Johnson <mjj29 at debian.org>  Sat, 12 Dec 2009 10:59:00 +0000
+
+libmatthew-java (0.7.2-1) unstable; urgency=low
+
+  * New Upstream Release
+  * Bump Standards-Version
+  * Bump debhelper compat
+  * Change to section java
+
+ -- Matthew Johnson <mjj29 at debian.org>  Sun, 05 Apr 2009 11:11:45 +0100
+
+libmatthew-java (0.7.1-1) unstable; urgency=low
+
+  * New Upstream Release (Closes: #476019)
+  * Change to use default-jdk-builddep (Closes: #477878)
+
+ -- Matthew Johnson <mjj29 at debian.org>  Sat, 26 Apr 2008 13:27:43 +0100
+
+libmatthew-java (0.6-1) unstable; urgency=low
+
+  * New Upstream Release
+  * Use javahelper 
+  * Bump Standards-Version
+
+ -- Matthew Johnson <mjj29 at debian.org>  Thu, 10 Jan 2008 13:55:43 +0000
+
+libmatthew-java (0.5-2) unstable; urgency=low
+
+  * Add watch file from watchwiz 
+
+ -- Matthew Johnson <mjj29 at debian.org>  Tue, 25 Dec 2007 11:19:29 +0000
+
+libmatthew-java (0.5-1) unstable; urgency=low
+
+  * Accompanying upstream change to avoid javadoc talking to the web
+    (Closes: #447351)
+  * Change maintainer address 
+
+ -- Matthew Johnson <mjj29 at debian.org>  Wed, 05 Dec 2007 10:22:47 +0000
+
+libmatthew-java (0.4-2) unstable; urgency=low
+
+  * fix javadoc variables to make not to need networking 
+
+ -- Matthew Johnson <debian at matthew.ath.cx>  Wed, 19 Sep 2007 16:41:31 +0100
+
+libmatthew-java (0.4-1) unstable; urgency=low
+
+  * New Upstream Version
+  * Add JAVADOC to rules; forces creating javadoc with gjdoc.
+  * Add docs package 
+  * Register documentation with doc-base
+  * Initial upload to Debian: Closes: #413405
+  * Update to new Java policy
+  * put docs in section doc and libs in section libs 
+
+ -- Matthew Johnson <debian at matthew.ath.cx>  Wed, 30 May 2007 00:24:43 +0100
+
+libmatthew-java (0.3-1) unstable; urgency=low
+
+  * New Upstream Version
+  * Tidy up rules a bit
+  * Remove overrides and full-stops
+
+ -- Matthew Johnson <debian at matthew.ath.cx>  Wed,  3 Jan 2007 21:56:49 +0000
+
+libmatthew-java (0.1-1) unstable; urgency=low
+
+  * Initial Release.
+  * Build with fastjar and java-gcj-compat-dev
+
+ -- Matthew Johnson <debian at matthew.ath.cx>  Tue, 19 Dec 2006 14:35:37 +0000
+
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..8e51716
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,58 @@
+Source: libmatthew-java
+Section: java
+Priority: optional
+Maintainer: Debian QA Group <packages at qa.debian.org>
+Build-Depends: debhelper (>= 9),
+               docbook-to-man,
+               default-jdk,
+               default-jdk-doc,
+               fastjar, 
+               javahelper (>= 0.25)
+Standards-Version: 3.8.4
+
+Package: libunixsocket-java
+Architecture: any
+Depends: ${java:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Suggests: libmatthew-java-doc
+Description: Unix socket API and bindings for Java
+ These bindings allow you to connect to Unix Sockets from within Java
+ programs.
+
+Package: libmatthew-io-java
+Architecture: all
+Depends: ${misc:Depends}, ${java:Depends}
+Suggests: libmatthew-java-doc
+Description: Extra IO library for Java
+ This library provides classes to pipe a stream through an external program,
+ print DOM trees and split an output stream so that it also goes to a file.
+
+Package: libmatthew-debug-java
+Architecture: all
+Depends: ${misc:Depends}, ${java:Depends}
+Suggests: libmatthew-java-doc
+Description: Debugging library for Java
+ This package provides a debugging library for Java, including a generic 
+ utility class for providing nicely formatted dumps of byte arrays
+ (similar to the hexdump utility).
+
+Package: libcgi-java
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${java:Depends}
+Suggests: libmatthew-java-doc
+Description: CGI library for Java
+ This library allows CGI scripts to be written in Java.  The library provides
+ access to all the standard CGI variables including POST/GET. It also makes it
+ easy to create input forms in HTML documents.
+
+Package: libmatthew-java-doc
+Architecture: all
+Depends: default-jdk-doc, ${misc:Depends}
+Section: doc
+Recommends: libcgi-java, 
+            libmatthew-debug-java,
+            libmatthew-io-java,
+            libunixsocket-java
+Description: API documentation for the libmatthew-java libraries
+ The Javadoc API documentation for libcgi-java, libmatthew-debug-java,
+ libmatthew-io-java and libunixsocket-java.
+
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..2c2e05e
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,35 @@
+This package was debianized by Matthew Johnson <debian at matthew.ath.cx> on 
+Mon Dec 18 16:34:39 GMT 2006
+
+It was downloaded from http://www.matthew.ath.cx/projects/java
+
+Copyright:
+
+Upstream Author: Matthew Johnson <debian at matthew.ath.cx>
+
+This software is Copyright (c) 2003-2006 by Matthew Johnson.
+
+Some of the files comprising the CGI library are copyright (c) 2003/2004
+Matthew Johnson, Adam Biltcliffe, Michael Cripps, Martin O'Leary, Edward
+Allcutt and James Osborn
+
+This library is free software; you can redistribute it and/or modify it under
+the terms of the GNU Lesser General Public License version 2.1 as published by
+the Free Software Foundation 
+
+This library is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this library; if not, write to the Free Software Foundation, Inc., 51
+Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+On Debian systems, the complete text of the GNU Lesser General Public License
+can be found in the file `/usr/share/common-licenses/LGPL-2.1'.
+
+The packaging is copyright (c) 2006-2007 Matthew Johnson and is distributed under
+the terms of the GNU General Public License version 2. On Debian systems, the
+complete text of the GNU General Public License can be found in the file
+`/usr/share/common-licenses/GPL-2'. 
diff --git a/debian/libcgi-java.install b/debian/libcgi-java.install
new file mode 100644
index 0000000..aea21e9
--- /dev/null
+++ b/debian/libcgi-java.install
@@ -0,0 +1,2 @@
+usr/lib/jni/libcgi-java.so
+usr/share/java/cgi*.jar
diff --git a/debian/libmatthew-debug-java.install b/debian/libmatthew-debug-java.install
new file mode 100644
index 0000000..5a7a0b2
--- /dev/null
+++ b/debian/libmatthew-debug-java.install
@@ -0,0 +1,2 @@
+usr/share/java/debug*.jar
+usr/share/java/hexdump*.jar
diff --git a/debian/libmatthew-io-java.install b/debian/libmatthew-io-java.install
new file mode 100644
index 0000000..4d00a7d
--- /dev/null
+++ b/debian/libmatthew-io-java.install
@@ -0,0 +1 @@
+usr/share/java/io*.jar
diff --git a/debian/libmatthew-java-doc.javadoc b/debian/libmatthew-java-doc.javadoc
new file mode 100644
index 0000000..8e695ec
--- /dev/null
+++ b/debian/libmatthew-java-doc.javadoc
@@ -0,0 +1 @@
+doc
diff --git a/debian/libunixsocket-java.install b/debian/libunixsocket-java.install
new file mode 100644
index 0000000..84b6702
--- /dev/null
+++ b/debian/libunixsocket-java.install
@@ -0,0 +1,2 @@
+usr/lib/jni/libunix-java.so
+usr/share/java/unix*.jar
diff --git a/debian/patches/001-use-relative-paths-in-manifest-file.patch b/debian/patches/001-use-relative-paths-in-manifest-file.patch
new file mode 100644
index 0000000..624bb1f
--- /dev/null
+++ b/debian/patches/001-use-relative-paths-in-manifest-file.patch
@@ -0,0 +1,28 @@
+From: Michael Haggerty <mhagger at alum.mit.edu>
+Subject: Use relative paths for entries in the package class path
+
+--- a/Makefile
++++ b/Makefile
+@@ -63,7 +63,7 @@
+ 	(cd classes; $(JAR) cf ../$@ cx/ath/matthew/io/*class)
+ unix-$(UNIXVER).jar: .classes
+ ifeq ($(DEBUG),enable)
+-	echo "Class-Path: $(JARDIR)/debug-$(DEBUG).jar" > Manifest
++	echo "Class-Path: debug-$(DEBUG).jar" > Manifest
+ else
+ 	echo "Class-Path: " > Manifest
+ endif
+@@ -91,11 +91,11 @@
+ 
+ debug-enable-$(DEBUGVER).jar: cx/ath/matthew/debug/Debug.jpp
+ 	make .enabledebug
+-	echo "Class-Path: $(JARDIR)/hexdump.jar" > Manifest
++	echo "Class-Path: hexdump.jar" > Manifest
+ 	(cd classes;jar cfm ../$@ ../Manifest cx/ath/matthew/debug/*.class)
+ debug-disable-$(DEBUGVER).jar: cx/ath/matthew/debug/Debug.jpp
+ 	make .disabledebug
+-	echo "Class-Path: $(JARDIR)/hexdump.jar" > Manifest
++	echo "Class-Path: hexdump.jar" > Manifest
+ 	(cd classes;jar cfm ../$@ ../Manifest cx/ath/matthew/debug/*.class)
+ .enabledebug: cx/ath/matthew/debug/Debug.jpp 
+ 	mkdir -p classes
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4cfe41f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+001-use-relative-paths-in-manifest-file.patch
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..f08b53d
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,26 @@
+#!/usr/bin/make -f
+
+%:
+	dh $@ --with javahelper
+
+override_dh_auto_build:
+	$(MAKE) JAVA_HOME=/usr/lib/jvm/default-java \
+			  JAVAC=/usr/lib/jvm/default-java/bin/javac \
+			  JAVAH=/usr/lib/jvm/default-java/bin/javah \
+			  JAVADOC=/usr/lib/jvm/default-java/bin/javadoc \
+			  JAVADOCFLAGS="-quiet -author -link /usr/share/doc/default-jdk-doc/api/" \
+			  JAR=/usr/bin/fastjar \
+			  PREFIX=/usr \
+			  all doc
+
+override_dh_auto_test:
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -f cx/ath/matthew/debug/Debug.java
+
+override_dh_auto_install: 
+	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp PREFIX=/usr install install-doc
+
+override_jh_installjavadoc:
+	jh_installjavadoc --author="Matthew Johnson"
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..d351f76
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=3
+opts=uversionmangle=s/\.(tar.*|tgz|zip|gz|bz2)$//i,dversionmangle=s/[-.+~]?(cvs|svn|git|snapshot|pre|hg)(.*)$//i,pasv \
+http://www.matthew.ath.cx/projects/java (?:.*/)?libmatthew-java-?_?([\d+\.]+|\d+)\.(tar.*|tgz|zip|gz|bz2|) debian uupdate

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-iot/libmatthew-java.git



More information about the Debian-iot-packaging mailing list