[jnr-constants] 08/09: Merge changes from Tim Potter
Tim Potter
tpot-guest at moszumanska.debian.org
Tue Feb 10 03:09:08 UTC 2015
This is an automated email from the git hooks/post-receive script.
tpot-guest pushed a commit to branch master
in repository jnr-constants.
commit 0755284e97c42e7cdb6466c2d250878404946206
Author: Miguel Landaeta <nomadium at debian.org>
Date: Wed Jan 28 10:45:40 2015 -0300
Merge changes from Tim Potter
---
debian/changelog | 18 ++++--
debian/constantine.bnd | 5 --
debian/control | 35 +++++++-----
debian/copyright | 84 ++++++++++------------------
debian/libconstantine-java-doc.README.Debian | 14 -----
debian/libconstantine-java.README.Debian | 18 ------
debian/libconstantine-java.poms | 28 ++++++++++
debian/maven.rules | 3 +
debian/rules | 81 ++-------------------------
9 files changed, 100 insertions(+), 186 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 54aa397..9167977 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,17 @@
-libconstantine-java (0.7-6.1) UNRELEASED; urgency=medium
-
- * Non-maintainer upload.
- * Moved the package to Git
+libconstantine-java (0.8.5-1) UNRELEASED; urgency=medium
+
+ [ Tim Potter ]
+ * Team upload.
+ * New upstream release.
+ * Add myself to Uploaders list.
+ * Bump Standards-Version to 3.9.6.
+ * Update B-D list.
+ * Remove outdated or unused packaging files.
+ * Update d/copyright file.
+ * Rewrite d/rules file.
+
+ [ Miguel Landaeta ]
+ * Moved the package to Git.
-- Miguel Landaeta <nomadium at debian.org> Tue, 27 Jan 2015 18:28:33 -0300
diff --git a/debian/constantine.bnd b/debian/constantine.bnd
deleted file mode 100644
index 0569048..0000000
--- a/debian/constantine.bnd
+++ /dev/null
@@ -1,5 +0,0 @@
-Bundle-Name: platform constants for Java
-Bundle-SymbolicName: com.kenai.constantine
-Bundle-Version: 1.0.0
-Bundle-Vendor: Debian.org
-Import-Package: *
diff --git a/debian/control b/debian/control
index 2758b82..3a182a9 100644
--- a/debian/control
+++ b/debian/control
@@ -2,27 +2,26 @@ Source: libconstantine-java
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: tony mancill <tmancill at debian.org>
-Build-Depends: debhelper (>= 9~), ant
-Build-Depends-Indep: default-jdk,
- junit4,
- ant-optional,
- maven-repo-helper,
- bnd
-Standards-Version: 3.9.5
+Uploaders: tony mancill <tmancill at debian.org>, Tim Potter <tpot at hp.com>
+Build-Depends: debhelper (>= 9~), maven-debian-helper, javahelper, junit4
+Standards-Version: 3.9.6
Homepage: http://github.com/jnr/jnr-constants/
Vcs-Git: git://anonscm.debian.org/pkg-java/libconstantine-java.git
Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/libconstantine-java.git
Package: libconstantine-java
Architecture: all
-Section: java
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, ${maven:Depends}
Description: platform constants for Java
- This package provides Java values for common platform C constants
- like those of files errno.h or sys/socket.h.
+ Java Native Runtime (JNR) is a collection of Java libraries to make
+ interfacing with OS-level features easier. JNR uses an alternate
+ method to JNI or JNA to achieve programming simplicity while still
+ retaining performance.
.
The upstream version of this package is now also known as jnr-constants.
+ .
+ The jnr-constants package gives Java programs access to platform-level
+ constants, for example errno values.
Package: libconstantine-java-doc
Architecture: all
@@ -31,8 +30,14 @@ Depends: ${misc:Depends}
Recommends: w3m | www-browser
Suggests: libconstantine-java
Description: Java Constantine library API documentation
- This package includes the development documentation for the Constantine Java
- library which provides Java values for common platform C constants like
- those of files errno.h or sys/socket.h.
+ Java Native Runtime (JNR) is a collection of Java libraries to make
+ interfacing with OS-level features easier. JNR uses an alternate
+ method to JNI or JNA to achieve programming simplicity while still
+ retaining performance.
.
The upstream version of this package is now also known as jnr-constants.
+ .
+ The jnr-constants package gives Java programs access to platform-level
+ constants, for example errno values.
+ .
+ This package contains jnr-constants API javadocs.
diff --git a/debian/copyright b/debian/copyright
index b1ea417..af1f44f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,54 +1,30 @@
-This package was initially debianized by Nicolas Duboc <nduboc at debian.org>
-on Sun, 20 Sep 2009.
-
-It was downloaded from http://github.com/jnr/jnr-constants/
-
-Upstream authors are Wayne Meissner, Philip Jenvey and Charles Nutter (headius).
-
----
-Original package:
-Copyright (c) 2008 The JRuby project.
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-
----
-Debian packaging (files in debian/ directory):
-Copyright @ 2009, 2011 Nicolas Duboc
-
-ermission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: jnr-constants
+Source: https://github.com/jnr/jnr-constants
+
+Files: *
+Copyright: 2008-2014 Wayne Meissner
+ 2008-2014 Charles Nutter
+License: Apache-2.0
+
+Files: debian/*
+Copyright: 2009 Nicolas Duboc <nduboc at debian.org>
+ 2014 Tim Potter <tpot at hp.com>
+License: Apache-2.0
+Comment: the Debian packaging is licensed under the same terms as the original package.
+
+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
+ .
+ http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ 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'
diff --git a/debian/libconstantine-java-doc.README.Debian b/debian/libconstantine-java-doc.README.Debian
deleted file mode 100644
index 0c1918c..0000000
--- a/debian/libconstantine-java-doc.README.Debian
+++ /dev/null
@@ -1,14 +0,0 @@
-Debian package of the Constantine library documentation
--------------------------------------------------------
-
- This package contains the documentation for the Constantine Java
-library (also known as jnr-constants) which provides typical platform
-C constants like those of errno.h or sys/socket.h.
-
- API documentation (javadoc) is available in directory
-/usr/share/doc/libconstantine-java-doc/javadoc .
-
- The library itself is provided by the libconstantine-java package.
-
---
-Nicolas Duboc <nduboc at debian.org>
diff --git a/debian/libconstantine-java.README.Debian b/debian/libconstantine-java.README.Debian
deleted file mode 100644
index d2f8044..0000000
--- a/debian/libconstantine-java.README.Debian
+++ /dev/null
@@ -1,18 +0,0 @@
-Debian package of the Constantine library
------------------------------------------
-
- This package contains the Constantine Java library (also known as jnr-constants)
-which provides typical platform C constants like those of errno.h or sys/socket.h.
-
- The library is composed of only one jar file and has no external dependency.
-Developers should include the following path in the CLASSPATH:
- /usr/share/java/constantine.jar
-
- This jar is also installed in the local Maven Debian repository in
-/usr/share/maven-repo. The artifact ID is org.jruby.extras:constantine:0.7 .
-
- API documentation (javadoc) is provided by package libconstantine-java-doc in
-directory /usr/share/doc/libconstantine-java-doc/javadoc .
-
---
-Nicolas Duboc <nduboc at debian.org>
diff --git a/debian/libconstantine-java.poms b/debian/libconstantine-java.poms
new file mode 100644
index 0000000..64b1188
--- /dev/null
+++ b/debian/libconstantine-java.poms
@@ -0,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 --has-package-version --java-lib
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..0f9ded2
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,3 @@
+
+junit junit jar s/.*/4.x/ * *
+junit junit jar s/4\..*/4.x/ * *
diff --git a/debian/rules b/debian/rules
index 5189604..1817089 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,78 +1,7 @@
#!/usr/bin/make -f
+
+export JAVA_HOME=/usr/lib/jvm/default-java
+export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8
-
-JAVA_DIR = usr/share/java
-DOC_DIR = usr/share/doc/libconstantine-java-doc
-PKG_BUILDDIR = debian/libconstantine-java
-PKG_DOC_BUILDDIR = debian/libconstantine-java-doc
-
-jarname = constantine
-altjarname = libconstantine-java
-jarversion = 0.7
-
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-
-build-stamp:
- dh_testdir
-ifneq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
- # TODO: hack upstream build system to support this
- ant -Dlibs.junit_4.classpath=/usr/share/java/junit4.jar
-else
- ant -Dlibs.junit_4.classpath=/usr/share/java/junit4.jar
-endif
-
- # Generate OSGi metadata for constantine.jar
- bnd wrap -properties debian/constantine.bnd \
- -output dist/constantine.jar dist/constantine.jar
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
-
- rm -f build-stamp
- ant clean
- rm -rf debian/.mh
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
-
- dh_installdirs -p libconstantine-java $(JAVA_DIR)
-
- mh_installjar -plibconstantine-java --java-lib --usj-name=$(jarname) pom.xml dist/constantine.jar
- mh_installpom -plibconstantine-java pom.xml
-
- # links in /usr/share/java for the old, obsolete jar name
- dh_link usr/share/java/$(jarname)-$(jarversion).jar usr/share/java/$(altjarname).jar
- # this one can be removed once the upstream version is bumped to higher than 0.7:
- dh_link usr/share/java/$(jarname)-$(jarversion).jar usr/share/java/$(altjarname)-$(jarversion).jar
-
- dh_installdirs -p libconstantine-java-doc $(DOC_DIR)
- mv dist/javadoc $(PKG_DOC_BUILDDIR)/$(DOC_DIR)
-
-
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs --indep
- dh_installdocs --indep
- dh_compress --indep
- dh_fixperms --indep
- dh_installdeb --indep
- dh_gencontrol --indep
- dh_md5sums --indep
- dh_builddeb --indep
-
-binary-arch:
-
-binary: binary-indep binary-arch
-
-
-.PHONY: build install clean binary-indep binary
+%:
+ dh $@ --buildsystem=maven --with javahelper
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jnr-constants.git
More information about the pkg-java-commits
mailing list