[jboss-modules] 01/01: Imported Debian patch 1.4.1.Final-1
Markus Koschany
apo-guest at moszumanska.debian.org
Tue Mar 3 11:00:36 UTC 2015
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository jboss-modules.
commit 3c54c7adcbb266c8343e664dda9263d4f1e57a2a
Merge: 1f1ece1 7e2e8db
Author: Markus Koschany <apo at gambaru.de>
Date: Mon Mar 2 18:58:24 2015 +0100
Imported Debian patch 1.4.1.Final-1
debian/README.source | 2 +-
debian/changelog | 6 +--
debian/control | 47 +++++++++++++-----
debian/copyright | 68 +++++++++++++++++++++++++-
debian/libjboss-modules-java-doc.install | 1 -
debian/libjboss-modules-java.lintian-overrides | 2 +
debian/libjboss-modules-java.poms | 2 +-
debian/maven.ignoreRules | 6 ---
debian/maven.properties | 5 +-
debian/maven.rules | 2 +-
debian/patches/build.patch | 54 ++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 2 +-
debian/watch | 6 ++-
14 files changed, 173 insertions(+), 31 deletions(-)
diff --cc debian/README.source
index 1c6c23c,0000000..c948319
mode 100644,000000..100644
--- a/debian/README.source
+++ b/debian/README.source
@@@ -1,9 -1,0 +1,9 @@@
+Information about jboss-modules
- ------------------------------
++-------------------------------
+
+This package was debianized using the mh_make command
+from the maven-debian-helper package.
+
+The build system uses Maven but prevents it from downloading
+anything from the Internet, making the build compliant with
+the Debian policy.
diff --cc debian/changelog
index 3705687,0000000..44aaa58
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,0 +1,5 @@@
- jboss-modules (1.4.1.Final-1) unstable; urgency=low
++jboss-modules (1.4.1.Final-1) unstable; urgency=medium
+
- * Initial release (Closes: #)
++ * Initial release (Closes: #779598)
+
- -- Alexandre Viau <alexandre at alexandreviau.net> Mon, 02 Mar 2015 01:18:32 -0500
++ -- Markus Koschany <apo at gambaru.de> Mon, 02 Mar 2015 18:58:24 +0100
diff --cc debian/control
index 6af6950,0000000..00ad316
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,32 -1,0 +1,55 @@@
+Source: jboss-modules
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
- Uploaders: Alexandre Viau <alexandre at alexandreviau.net>
- Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.5)
- Build-Depends-Indep: default-jdk-doc, libmaven-javadoc-plugin-java
- Standards-Version: 3.9.4
++Uploaders:
++ Markus Koschany <apo at gambaru.de>
++Build-Depends:
++ cdbs,
++ debhelper (>= 9),
++ default-jdk,
++ maven-debian-helper (>= 1.5)
++Build-Depends-Indep:
++ default-jdk-doc,
++ junit4,
++ libmaven-enforcer-plugin-java,
++ libmaven-javadoc-plugin-java,
++ libmaven-source-plugin-java
++Standards-Version: 3.9.6
+Vcs-Git: git://anonscm.debian.org/pkg-java/jboss-modules.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jboss-modules.git
+Homepage: https://github.com/jboss-modules/jboss-modules
+
+Package: libjboss-modules-java
+Architecture: all
- Depends: ${misc:Depends}, ${maven:Depends}
- Recommends: ${maven:OptionalDepends}
- Suggests: libjboss-modules-java-doc
- Description: JBoss Modules
++Depends:
++ ${maven:Depends},
++ ${misc:Depends}
++Suggests:
++ libjboss-modules-java-doc,
++ ${maven:OptionalDepends}
++Description: Modular Classloading System
+ JBoss Modules is a standalone implementation of a modular (non-hierarchical)
- class loading and execution environment for Java.
++ class loading and execution environment for Java. In other words, rather than
++ a single class loader which loads all JARs into a flat class path, each
++ library becomes a module which only links against the exact modules it depends
++ on, and nothing more. It implements a thread-safe, fast, and highly concurrent
++ delegating class loader model, coupled to an extensible module resolution
++ system, which combine to form a unique, simple and powerful system for
++ application execution and distribution.
+
+Package: libjboss-modules-java-doc
+Architecture: all
+Section: doc
- Depends: ${misc:Depends}, ${maven:DocDepends}
- Recommends: ${maven:DocOptionalDepends}
- Suggests: libjboss-modules-java
++Depends:
++ ${misc:Depends}
++Recommends:
++ ${maven:DocDepends},
++ ${maven:DocOptionalDepends}
++Suggests:
++ libjboss-modules-java
+Description: Documentation for JBoss Modules
+ JBoss Modules is a standalone implementation of a modular (non-hierarchical)
+ class loading and execution environment for Java.
+ .
+ This package contains the API documentation of libjboss-modules-java.
diff --cc debian/copyright
index 5599104,0000000..9cc8c3a
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,16 -1,0 +1,82 @@@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: JBoss Modules
+Source: https://github.com/jboss-modules/jboss-modules
+
+Files: *
+Copyright: 2014, Red Hat, Inc.
+License: Apache-2.0
++Comment:
++ pom.xml contains a LGPL-2.1 license header but this is a mistake and was
++ already corrected in upstream's git repository. The license is Apache-2.0.
++
++Files: src/main/java/org/jboss/modules/xml/XmlPullParser.java
++ src/main/java/org/jboss/modules/xml/XmlPullParserException.java
++ src/main/java/org/jboss/modules/xml/MXParser.java
++Copyright: 2003, The Trustees of Indiana University
++License: XPP3
+
+Files: debian/*
- Copyright: 2015, Alexandre Viau <alexandre at alexandreviau.net>
++Copyright: 2015, Markus Koschany <apo at gambaru.de>
+License: Apache-2.0
+
+License: Apache-2.0
+ On Debian systems, the full text of the Apache-2.0 license
+ can be found in the file '/usr/share/common-licenses/Apache-2.0'
+
++License: XPP3
++ Indiana University Extreme! Lab Software License, Version 1.2
++ .
++ Copyright (C) 2003 The Trustees of Indiana University.
++ All rights reserved.
++ .
++ Redistribution and use in source and binary forms, with or without
++ modification, are permitted provided that the following conditions are
++ met:
++ .
++ 1) All redistributions of source code must retain the above
++ copyright notice, the list of authors in the original source
++ code, this list of conditions and the disclaimer listed in this
++ license;
++ .
++ 2) All redistributions in binary form must reproduce the above
++ copyright notice, this list of conditions and the disclaimer
++ listed in this license in the documentation and/or other
++ materials provided with the distribution;
++ .
++ 3) Any documentation included with all redistributions must include
++ the following acknowledgement:
++ .
++ "This product includes software developed by the Indiana
++ University Extreme! Lab. For further information please visit
++ http://www.extreme.indiana.edu/"
++ .
++ Alternatively, this acknowledgment may appear in the software
++ itself, and wherever such third-party acknowledgments normally
++ appear.
++ .
++ 4) The name "Indiana University" or "Indiana University
++ Extreme! Lab" shall not be used to endorse or promote
++ products derived from this software without prior written
++ permission from Indiana University. For written permission,
++ please contact http://www.extreme.indiana.edu/.
++ .
++ 5) Products derived from this software may not use "Indiana
++ University" name nor may "Indiana University" appear in their name,
++ without prior written permission of the Indiana University.
++ .
++ Indiana University provides no reassurances that the source code
++ provided does not infringe the patent or any other intellectual
++ property rights of any other entity. Indiana University disclaims any
++ liability to any recipient for claims brought by any other entity
++ based on infringement of intellectual property rights or otherwise.
++ .
++ LICENSEE UNDERSTANDS THAT SOFTWARE IS PROVIDED "AS IS" FOR WHICH
++ NO WARRANTIES AS TO CAPABILITIES OR ACCURACY ARE MADE. INDIANA
++ UNIVERSITY GIVES NO WARRANTIES AND MAKES NO REPRESENTATION THAT
++ SOFTWARE IS FREE OF INFRINGEMENT OF THIRD PARTY PATENT, COPYRIGHT, OR
++ OTHER PROPRIETARY RIGHTS. INDIANA UNIVERSITY MAKES NO WARRANTIES THAT
++ SOFTWARE IS FREE FROM "BUGS", "VIRUSES", "TROJAN HORSES", "TRAP
++ DOORS", "WORMS", OR OTHER HARMFUL CODE. LICENSEE ASSUMES THE ENTIRE
++ RISK AS TO THE PERFORMANCE OF SOFTWARE AND/OR ASSOCIATED MATERIALS,
++ AND TO THE PERFORMANCE AND VALIDITY OF INFORMATION GENERATED USING
++ SOFTWARE.
diff --cc debian/libjboss-modules-java-doc.install
index 7630d7e,0000000..e4769a8
mode 100644,000000..100644
--- a/debian/libjboss-modules-java-doc.install
+++ b/debian/libjboss-modules-java-doc.install
@@@ -1,2 -1,0 +1,1 @@@
+target/apidocs/* usr/share/doc/libjboss-modules-java/api
-
diff --cc debian/libjboss-modules-java.lintian-overrides
index 0000000,0000000..6d1e24c
new file mode 100644
--- /dev/null
+++ b/debian/libjboss-modules-java.lintian-overrides
@@@ -1,0 -1,0 +1,2 @@@
++# Java7 is the default JRE
++libjboss-modules-java: incompatible-java-bytecode-format Java7 version (Class format: 51)
diff --cc debian/libjboss-modules-java.poms
index 1b9db31,0000000..5ad70f2
mode 100644,000000..100644
--- a/debian/libjboss-modules-java.poms
+++ b/debian/libjboss-modules-java.poms
@@@ -1,28 -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 --no-parent --java-lib --has-package-version
++pom.xml --no-parent --has-package-version
diff --cc debian/maven.ignoreRules
index 751f265,0000000..21eb81d
mode 100644,000000..100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@@ -1,7 -1,0 +1,1 @@@
-
- junit junit * * * *
- org.apache.maven.plugins maven-enforcer-plugin * * * *
- org.apache.maven.plugins maven-javadoc-plugin * * * *
- org.apache.maven.plugins maven-source-plugin * * * *
- org.apache.maven.plugins maven-surefire-plugin * * * *
+org.jboss.shrinkwrap shrinkwrap-impl-base * * * *
diff --cc debian/maven.properties
index e593715,0000000..2bc54bb
mode 100644,000000..100644
--- a/debian/maven.properties
+++ b/debian/maven.properties
@@@ -1,5 -1,0 +1,6 @@@
+# Include here properties to pass to Maven during the build.
+# For example:
- # maven.test.skip=true
-
+maven.test.skip=true
++maven.compiler.source=1.7
++maven.compiler.target=1.7
++project.build.sourceEncoding=UTF-8
diff --cc debian/maven.rules
index 4a27f22,0000000..102ac0b
mode 100644,000000..100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@@ -1,2 -1,0 +1,2 @@@
-
++junit junit jar s/4\..*/4.x/ * *
+org.jboss.modules jboss-modules jar s/.*/debian/ * *
diff --cc debian/patches/build.patch
index 0000000,0000000..929f051
new file mode 100644
--- /dev/null
+++ b/debian/patches/build.patch
@@@ -1,0 -1,0 +1,54 @@@
++From: Markus Koschany <apo at gambaru.de>
++Date: Mon, 2 Mar 2015 21:08:56 +0100
++Subject: build
++
++Do not run and compile the tests because jboss-shrinkwrap has not been packaged
++yet. Disable a javadoc docletArtifact which is also not available.
++---
++ pom.xml | 26 ++++++++++++--------------
++ 1 file changed, 12 insertions(+), 14 deletions(-)
++
++diff --git a/pom.xml b/pom.xml
++index 2d89857..51ef008 100644
++--- a/pom.xml
+++++ b/pom.xml
++@@ -60,6 +60,18 @@
++ <skipMain>${skip.compile}</skipMain>
++ <skip>${skip.compile}</skip>
++ </configuration>
+++ <executions>
+++ <execution>
+++ <id>default-testCompile</id>
+++ <phase>test-compile</phase>
+++ <goals>
+++ <goal>testCompile</goal>
+++ </goals>
+++ <configuration>
+++ <skip>true</skip>
+++ </configuration>
+++ </execution>
+++ </executions>
++ </plugin>
++
++ <!-- Surefire -->
++@@ -99,20 +111,6 @@
++ <artifactId>maven-source-plugin</artifactId>
++ </plugin>
++
++- <!-- Javadoc -->
++- <plugin>
++- <artifactId>maven-javadoc-plugin</artifactId>
++- <configuration>
++- <doclet>net.gleamynode.apiviz.APIviz</doclet>
++- <docletArtifact>
++- <groupId>org.jboss.apiviz</groupId>
++- <artifactId>apiviz</artifactId>
++- <version>1.3.2.GA</version>
++- </docletArtifact>
++- <excludePackageNames>__redirected</excludePackageNames>
++- </configuration>
++- </plugin>
++-
++ <!-- Enforcer -->
++ <plugin>
++ <artifactId>maven-enforcer-plugin</artifactId>
diff --cc debian/patches/series
index 0000000,0000000..5879227
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++build.patch
diff --cc debian/rules
index b76c54a,0000000..4a061cf
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,9 -1,0 +1,9 @@@
+#!/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
+
+get-orig-source:
- uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
++ uscan --download-current-version --force-download --no-symlink
diff --cc debian/watch
index 95f13c4,0000000..74e29f8
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,3 -1,0 +1,5 @@@
+version=3
- opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/<project>-$1\.tar\.gz/ \
- https://github.com/jboss-modules/jboss-modules/tags .*/v?(\d\S*)\.tar\.gz
++opts=dversionmangle=s/(\da?)[\+\.\-~](?:dfsg|debian|ds|repack|repacked)\.?\d*$/$1/,uversionmangle=s/_/./g \
++https://github.com/jboss-modules/jboss-modules/tags \
++.*/archive/(?:upstream/)?(?:v||version-|release-|X|R|r)(\d\S*)\.tar\.gz
++
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jboss-modules.git
More information about the pkg-java-commits
mailing list