[libjsonp-java] 01/06: Reboot the packaging using maven-debian-helper
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Jan 15 11:12:05 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository libjsonp-java.
commit a6e4cba2bcf742fbb1a067b3484e83d64f4b9a4c
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Fri Jan 15 10:12:33 2016 +0100
Reboot the packaging using maven-debian-helper
---
debian/README.source | 9 +++++++++
debian/changelog | 2 +-
debian/control | 32 ++++++++++++++++----------------
debian/get-orig-source | 26 --------------------------
debian/libjsonp-java-doc.doc-base.api | 12 ++++++++++++
debian/libjsonp-java-doc.install | 2 ++
debian/libjsonp-java-doc.javadoc | 1 -
debian/libjsonp-java.jlibs | 1 -
debian/{poms => libjsonp-java.poms} | 10 +++++++++-
debian/maven.cleanIgnoreRules | 1 +
debian/maven.ignoreRules | 12 ++++++++++++
debian/maven.properties | 4 ++++
debian/maven.publishedRules | 6 ++++++
debian/maven.rules | 7 +++++++
debian/orig-tar.sh | 16 ++++++++++++++++
debian/rules | 8 +++-----
debian/watch | 3 ++-
17 files changed, 100 insertions(+), 52 deletions(-)
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..571851e
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,9 @@
+Information about libjsonp-java
+-------------------------------
+
+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 --git a/debian/changelog b/debian/changelog
index bcfc8ae..c87e25f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libjsonp-java (0.0.20150930-1) UNRELEASED; urgency=medium
+libjsonp-java (1.0.4-1) UNRELEASED; urgency=medium
* Initial release (Closes: #??)
diff --git a/debian/control b/debian/control
index 037d634..fb5dec2 100644
--- a/debian/control
+++ b/debian/control
@@ -1,36 +1,36 @@
Source: libjsonp-java
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Tille <tille at debian.org>
Section: java
-XS-Autobuild: no
Priority: optional
-Build-Depends: debhelper (>= 9),
- javahelper,
- maven-debian-helper,
- default-jdk,
- ant
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Andreas Tille <tille at debian.org>
+Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.5)
+Build-Depends-Indep: libmaven-bundle-plugin-java,
+ libmaven-dependency-plugin-java,
+ libmaven-javadoc-plugin-java,
+ default-jdk-doc
Standards-Version: 3.9.6
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libjsonp-java.git
Vcs-Git: git://anonscm.debian.org/pkg-java/libjsonp-java.git
-Homepage: https://jsonp.java.net/
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libjsonp-java.git
+Homepage: http://jsonp.java.net
Package: libjsonp-java
Architecture: all
-Depends: ${misc:Depends},
- ${java:Depends}
-Recommends: ${java:Recommends}
+Depends: ${misc:Depends}, ${maven:Depends}
+Suggests: ${maven:OptionalDepends}, libjsonp-java-doc
Description: Java API for JSON Processing
JSON Processing project is the open source reference implementation of
JSR 353 - Java API for JSON Processing. The JSR provides portable APIs
to parse, generate, transform, and query JSON using the streaming API or
the object model API.
+ .
+ This package contains the javadoc documentation files.
Package: libjsonp-java-doc
Architecture: all
Section: doc
-Depends: ${misc:Depends},
- ${java:Depends}
-Recommends: ${java:Recommends}
+Depends: ${misc:Depends}
+Recommends: ${maven:DocDepends}, ${maven:DocOptionalDepends}
+Suggests: libjsonp-java
Description: Java API for JSON Processing (documentation)
JSON Processing project is the open source reference implementation of
JSR 353 - Java API for JSON Processing. The JSR provides portable APIs
diff --git a/debian/get-orig-source b/debian/get-orig-source
deleted file mode 100755
index 683c0ea..0000000
--- a/debian/get-orig-source
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-COMPRESS=xz
-
-set -e
-
-ORIGNAME=jsonp
-NAME=`dpkg-parsechangelog | awk '/^Source/ { print $2 }'`
-VERSION=`dpkg-parsechangelog | awk '/^Version:/ { print $2 }' | sed -e 's/\([0-9\.]\+\)-[0-9]\+$/\1/' -e 's/\.[0-9]\+$/./'`
-
-mkdir -p ../tarballs
-cd ../tarballs
-# need to clean up the tarballs dir first because upstream tarball might
-# contain a directory with unpredictable name
-rm -rf *
-git clone --quiet git://java.net/jsonp~git
-cd "${ORIGNAME}~git"
-VERSION=${VERSION}`git log -n 1 --format="%ad" --date=short | sed 's/-//g'`
-cd ..
-TARDIR=${NAME}-${VERSION}
-mv "${ORIGNAME}~git" ${TARDIR}
-rm -rf ${TARDIR}/.git
-rm -f ${TARDIR}/.gitignore
-
-tar --owner=root --group=root --mode=a+rX -caf "$NAME"_"$VERSION".orig.tar.${COMPRESS} "${TARDIR}"
-rm -rf ${TARDIR}
diff --git a/debian/libjsonp-java-doc.doc-base.api b/debian/libjsonp-java-doc.doc-base.api
new file mode 100644
index 0000000..5aee0b2
--- /dev/null
+++ b/debian/libjsonp-java-doc.doc-base.api
@@ -0,0 +1,12 @@
+Document: libjsonp-java
+Title: API Javadoc for JSR 374 (JSON Processing) RI
+Author: Oracle developers
+Abstract: This is the API Javadoc provided for the
+ libjsonp-java libraries.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libjsonp-java/api/index.html
+Files: /usr/share/doc/libjsonp-java/api/*
+Index: /usr/share/doc/libjsonp-java/impl/index.html
+Files: /usr/share/doc/libjsonp-java/impl/*
diff --git a/debian/libjsonp-java-doc.install b/debian/libjsonp-java-doc.install
new file mode 100644
index 0000000..32df334
--- /dev/null
+++ b/debian/libjsonp-java-doc.install
@@ -0,0 +1,2 @@
+api/target/apidocs/* usr/share/doc/libjsonp-java/api/
+impl/target/apidocs/* usr/share/doc/libjsonp-java/impl/
diff --git a/debian/libjsonp-java-doc.javadoc b/debian/libjsonp-java-doc.javadoc
deleted file mode 100644
index ff8c6e8..0000000
--- a/debian/libjsonp-java-doc.javadoc
+++ /dev/null
@@ -1 +0,0 @@
-doc/api /usr/share/doc/libjsonp-java
diff --git a/debian/libjsonp-java.jlibs b/debian/libjsonp-java.jlibs
deleted file mode 100644
index 8c5987b..0000000
--- a/debian/libjsonp-java.jlibs
+++ /dev/null
@@ -1 +0,0 @@
-lib/*.jar
diff --git a/debian/poms b/debian/libjsonp-java.poms
similarity index 86%
rename from debian/poms
rename to debian/libjsonp-java.poms
index 4c16dce..25eb836 100644
--- a/debian/poms
+++ b/debian/libjsonp-java.poms
@@ -25,4 +25,12 @@
# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
# Empty by default. [mh_install]
#
-pom.xml
+pom.xml --no-parent --has-package-version
+impl/pom.xml --has-package-version
+api/pom.xml --has-package-version
+jaxrs/pom.xml --ignore
+jaxrs-1x/pom.xml --ignore
+tests/pom.xml --ignore
+gf/pom.xml --ignore
+demos/pom.xml --ignore
+bundles/pom.xml --ignore
diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/debian/maven.cleanIgnoreRules
@@ -0,0 +1 @@
+
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..71d5835
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1,12 @@
+
+org.glassfish json-bundles pom * * *
+org.glassfish jsonp-jaxrs-1x bundle * * *
+org.glassfish jsonp-jaxrs bundle * * *
+org.glassfish jsonp-tests jar * * *
+org.glassfish.jsonp demos pom * * *
+org.glassfish.jsonp providers pom * * *
+org.apache.maven.plugins maven-release-plugin * * * *
+org.apache.maven.plugins maven-source-plugin * * * *
+org.codehaus.mojo findbugs-maven-plugin * * * *
+org.glassfish.build spec-version-maven-plugin * * * *
+org.glassfish.copyright glassfish-copyright-maven-plugin * * * *
diff --git a/debian/maven.properties b/debian/maven.properties
new file mode 100644
index 0000000..7c29bd7
--- /dev/null
+++ b/debian/maven.properties
@@ -0,0 +1,4 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
+
diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules
new file mode 100644
index 0000000..888c69c
--- /dev/null
+++ b/debian/maven.publishedRules
@@ -0,0 +1,6 @@
+
+javax.json javax.json-api bundle s/.*/debian/ * *
+javax.json javax.json-api s/jar/bundle/ s/.*/debian/ * *
+org.glassfish javax.json bundle s/.*/debian/ * *
+org.glassfish javax.json s/jar/bundle/ s/.*/debian/ * *
+org.glassfish json pom s/.*/debian/ * *
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..8d21a48
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,7 @@
+
+javax.json javax.json-api bundle s/.*/debian/ * *
+javax.json javax.json-api jar s/.*/debian/ * *
+junit junit jar s/4\..*/4.x/ * *
+org.glassfish javax.json bundle s/.*/debian/ * *
+org.glassfish javax.json jar s/.*/debian/ * *
+org.glassfish json pom s/.*/debian/ * *
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
new file mode 100755
index 0000000..85dfd5b
--- /dev/null
+++ b/debian/orig-tar.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+set -e
+
+PACKAGE=$(dpkg-parsechangelog -S Source)
+VERSION=$2
+DIR=${PACKAGE}-${VERSION}
+TAR=../${PACKAGE}_${VERSION}.orig.tar.xz
+
+git clone --branch jsonp-${VERSION} git://java.net/jsonp~git $DIR
+
+rm $3
+XZ_OPT=--best tar -c -v -J -f $TAR \
+ --exclude '*.git' \
+ --exclude '*.gitignore' \
+ $DIR
+rm -Rf $DIR
diff --git a/debian/rules b/debian/rules
index a16d5b7..9867785 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,9 @@
#!/usr/bin/make -f
-# DH_VERBOSE := 1
-
-JAVA_HOME=/usr/lib/jvm/default-java
+export JAVA_HOME = /usr/lib/jvm/default-java
%:
- dh $@ --buildsystem=maven --with javahelper
+ dh $@ --buildsystem=maven
get-orig-source:
- . debian/get-orig-source
+ uscan --download-current-version --force-download --no-symlink
diff --git a/debian/watch b/debian/watch
index 80d93a8..52506cb 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1 +1,2 @@
-# Upstream does not provide versioned tarballs
\ No newline at end of file
+version=3
+http://repo1.maven.org/maven2/org/glassfish/javax.json/ (\d[\d\.]+)/ debian debian/orig-tar.sh
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjsonp-java.git
More information about the pkg-java-commits
mailing list