[jnr-x86asm] 02/03: Imported Debian patch 1.0.2-4

Markus Koschany apo-guest at moszumanska.debian.org
Wed Nov 18 18:38:35 UTC 2015


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

apo-guest pushed a commit to branch master
in repository jnr-x86asm.

commit f5d496da8cb36d1e6bacf8dfe6b6103e93ec33fb
Merge: e0a8286 28e15d0
Author: tony mancill <tmancill at debian.org>
Date:   Fri Aug 21 19:55:17 2015 -0700

    Imported Debian patch 1.0.2-4

 debian/changelog               | 14 +-------------
 debian/control                 |  7 ++++---
 debian/libjnr-x86asm-java.poms | 28 ++++++++++++++++++++++++++++
 debian/maven.cleanIgnoreRules  |  1 +
 debian/maven.ignoreRules       |  1 +
 debian/maven.publishedRules    |  1 +
 debian/maven.rules             |  2 ++
 debian/rules                   |  2 +-
 8 files changed, 39 insertions(+), 17 deletions(-)

diff --cc debian/changelog
index da9c7ee,0000000..d5c5c04
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,57 -1,0 +1,45 @@@
- jnr-x86asm (1.0.2-5) unstable; urgency=medium
- 
-   * Team upload.
-   * Transition to bnd 2.1.0.
-   * Vcs-Browser: Use https.
-   * Remove maven-repo-helper from B-D because maven-debian-helper already
-     depends on it.
-   * Remove URL for asmjit from package description because Google code is
-     obsolete.
- 
-  -- Markus Koschany <apo at debian.org>  Wed, 18 Nov 2015 19:33:17 +0100
- 
 +jnr-x86asm (1.0.2-4) unstable; urgency=medium
 +
 +  * Team upload.
 +  * Add missing build-dep on junit4 to address FTBFS. (Closes: #796436)
-   * Update debian/watch for new upstream on github.
++  * Update debian/watch for new upstream on github. 
 +    Remove unneeded debian/orig-tar.sh repack script.
 +
 + -- tony mancill <tmancill at debian.org>  Fri, 21 Aug 2015 19:55:17 -0700
 +
 +jnr-x86asm (1.0.2-3) unstable; urgency=medium
 +
 +  * Add OSGi metadata to JAR manifest.
 +  * Add Jakub Adam to Uploaders.
 +  * Fix dep5-copyright-license-name-not-unique Lintian warning.
 +
 + -- Jakub Adam <jakub.adam at ktknet.cz>  Sun, 21 Jun 2015 00:05:55 +0200
 +
 +jnr-x86asm (1.0.2-2) unstable; urgency=medium
 +
 +  * Upload to unstable.
 +
 + -- tony mancill <tmancill at debian.org>  Wed, 29 Apr 2015 21:27:44 -0700
 +
 +jnr-x86asm (1.0.2-1) experimental; urgency=medium
 +
 +  * Team upload.
 +  * New upstream version. (Closes: #771342)
 +  * Add patch to disable sonatype parent in pom.xml.
 +  * Correct and update Vcs URLs in debian/control.
 +  * Update Homepage URL.
 +  * Freshen debian/copyright (Java code now licensed under MIT/X11).
 +  * Drop javadocs included in the libjnr-x86asm-java package;
 +    if there is user demand, we can add a separate -doc package.
 +  * Set debhelper compat level to 9.
 +  * Bump Standards-Version to 3.9.6.
 +  * Add myself to Uploaders.
 +
 + -- tony mancill <tmancill at debian.org>  Sat, 29 Nov 2014 09:05:37 -0800
 +
 +jnr-x86asm (0.1-1) unstable; urgency=low
 +
 +  * Initial Release (closes: #591007).
 +    - The package is needed for JRuby.
 +
 + -- Torsten Werner <twerner at debian.org>  Fri, 30 Jul 2010 04:32:11 +0200
diff --cc debian/control
index 18b4d0d,0000000..8ea6085
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,41 -1,0 +1,42 @@@
 +Source: jnr-x86asm
 +Section: java
 +Priority: optional
 +Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 +Uploaders: Torsten Werner <twerner at debian.org>,
 + tony mancill <tmancill at debian.org>,
 + Jakub Adam <jakub.adam at ktknet.cz>
 +Build-Depends: debhelper (>= 9),
 + cdbs,
 + junit4,
++ maven-repo-helper,
 + maven-debian-helper,
 + ant-optional,
 + default-jdk,
-  bnd (>= 2.1.0)
++ bnd
 +Standards-Version: 3.9.6
 +Vcs-Git: git://anonscm.debian.org/pkg-java/jnr-x86asm.git
- Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jnr-x86asm.git
++Vcs-Browser: http://anonscm.debian.org/cgit/?p=pkg-java/jnr-x86asm.git
 +Homepage: https://github.com/jnr/jnr-x86asm
 +
 +Package: libjnr-x86asm-java
 +Architecture: all
 +Depends: ${misc:Depends}
 +Description: Pure java x86 and x86_64 assembler
-  This is a pure-java port of asmjit.
++ This is a pure-java port of asmjit (http://code.google.com/p/asmjit/).
 + .
 + AsmJit is complete x86/x64 JIT-Assembler for C++ language. It supports
 + 32/64-bit x86 processors including all usable extensions (FPU, MMX, 3dNow, SSE,
 + SSE2, SSE3 and SSE4) through type-safe API that mimics Intel assembler syntax
 + and eliminates nearly all common mistakes that can be done by developers.
 + .
 + AsmJit contains also high-level code generation classes that can be used as a
 + portable way to create JIT code that should run on all supported architectures.
 + High-level classes can handle various function calling-conventions, register
 + allocation and 32/64-bit mode differences.
 + .
 + AsmJit has been successfully tested by various C++ compilers (including MSVC,
 + GCC and BorlandC++) under all major operating systems (including Windows, Linux
 + and MacOS). AsmJit has been also ported to other programming languages
 + including Java, Delphi and Smalltalk (although these ports are not official
 + part of AsmJit and was developed outside).
 +
diff --cc debian/libjnr-x86asm-java.poms
index 0000000,0000000..4c16dce
new file mode 100644
--- /dev/null
+++ b/debian/libjnr-x86asm-java.poms
@@@ -1,0 -1,0 +1,28 @@@
++# List of POM files for the package
++# Format of this file is:
++# <path to pom file> [option]*
++# where option can be:
++#   --ignore: ignore this POM and its artifact if any
++#   --ignore-pom: don't install the POM. To use on POM files that are created
++#     temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
++#   --no-parent: remove the <parent> tag from the POM
++#   --package=<package>: an alternative package to use when installing this POM
++#      and its artifact
++#   --has-package-version: to indicate that the original version of the POM is the same as the upstream part
++#      of the version for the package.
++#   --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
++#      during a clean operation with mh_cleanpom or mh_installpom
++#   --artifact=<path>: path to the build artifact associated with this POM,
++#      it will be installed when using the command mh_install. [mh_install]
++#   --java-lib: install the jar into /usr/share/java to comply with Debian
++#      packaging guidelines
++#   --usj-name=<name>: name to use when installing the library in /usr/share/java
++#   --usj-version=<version>: version to use when installing the library in /usr/share/java
++#   --no-usj-versionless: don't install the versionless link in /usr/share/java
++#   --dest-jar=<path>: the destination for the real jar.
++#     It will be installed with mh_install. [mh_install]
++#   --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
++#   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
++#     Empty by default. [mh_install]
++#
++pom.xml
diff --cc debian/maven.cleanIgnoreRules
index 0000000,0000000..8b13789
new file mode 100644
--- /dev/null
+++ b/debian/maven.cleanIgnoreRules
@@@ -1,0 -1,0 +1,1 @@@
++
diff --cc debian/maven.ignoreRules
index 0000000,0000000..8b13789
new file mode 100644
--- /dev/null
+++ b/debian/maven.ignoreRules
@@@ -1,0 -1,0 +1,1 @@@
++
diff --cc debian/maven.publishedRules
index 0000000,0000000..8b13789
new file mode 100644
--- /dev/null
+++ b/debian/maven.publishedRules
@@@ -1,0 -1,0 +1,1 @@@
++
diff --cc debian/maven.rules
index 0000000,0000000..e85291e
new file mode 100644
--- /dev/null
+++ b/debian/maven.rules
@@@ -1,0 -1,0 +1,2 @@@
++
++junit junit jar s/4\..*/4.x/ * *
diff --cc debian/rules
index 8c6b49f,0000000..cabb017
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,16 -1,0 +1,16 @@@
 +#!/usr/bin/make -f
 +
 +include /usr/share/cdbs/1/rules/debhelper.mk
 +include /usr/share/cdbs/1/class/maven.mk
 +
 +JAVA_HOME := /usr/lib/jvm/default-java
 +
 +VERSION=$(shell dpkg-parsechangelog -S Version | cut -d- -f1)
 +JAR=target/jnr-x86asm-$(VERSION).jar
 +common-post-build-indep::
 +	# Generate OSGi metadata for jffi.jar
- 	bnd wrap --properties debian/jnr-x86asm.bnd --output $(JAR).tmp $(JAR)
++	bnd wrap -properties debian/jnr-x86asm.bnd -output $(JAR).tmp $(JAR)
 +	mv $(JAR).tmp $(JAR)
 +
 +get-orig-source:
 +	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jnr-x86asm.git



More information about the pkg-java-commits mailing list