[SCM] stapler packaging branch, master, updated. debian/1.182-1-4-g86b5ba3
James Page
james.page at ubuntu.com
Wed Sep 19 10:20:31 UTC 2012
The following commit has been merged in the master branch:
commit 479a0eff700a5864c7d12c44290493c50186dd83
Merge: d8b73c372422164102967f16a61bef853a23b9ca 0d2b06370fbb7a3747c782de3626cdbf04b49800
Author: James Page <james.page at ubuntu.com>
Date: Fri Jul 27 15:28:43 2012 +0100
Imported Debian patch 1.189-0ubuntu1
diff --combined debian/changelog
index 10ae0ab,0000000..ee0c05b
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,38 -1,0 +1,46 @@@
++stapler (1.189-0ubuntu1) quantal; urgency=low
++
++ * New upstream release:
++ - d/control: Added new BD on libannotation-indexer-java.
++ - d/maven.{ignoreRules,rules}: Updated for new release.
++
++ -- James Page <james.page at ubuntu.com> Fri, 27 Jul 2012 15:28:43 +0100
++
+stapler (1.182-1) unstable; urgency=low
+
+ * New upstream release:
+ - d/patches/asm3-compat.patch: Dropped - included upstream.
+ - d/maven.rules, d/patches/revert-kohsuke-asm3.patch: Use stock asm3
+ rather than package renamed fork from upstream as asm version is
+ consistent between stapler and jenkins in the archive.
+ - Refreshed remaining patches.
+ * Enabled test suite.
+
+ -- James Page <james.page at ubuntu.com> Thu, 26 Apr 2012 11:15:09 +0100
+
+stapler (1.174-2) unstable; urgency=low
+
+ * Fix FTBFS (Closes: #663548):
+ - d/libstapler-java.poms: Add --java-lib to ensure artifacts are
+ deployed to /usr/share/java.
+ * Bumped Standards-Version: 3.9.3
+ - d/copyright: Updated Format to release specification.
+ * d/libstapler-java-doc.lintian-overrides: Dropped - no longer required.
+
+ [tony mancill]
+ * Set DMUA flag.
+
+ -- James Page <james.page at ubuntu.com> Tue, 13 Mar 2012 11:51:03 +0000
+
+stapler (1.174-1) unstable; urgency=low
+
+ * Initial Debian release (Closes: #631959)
+ * New upstream release
+
+ -- James Page <james.page at ubuntu.com> Thu, 29 Sep 2011 10:13:35 +0100
+
+stapler (1.167-0ubuntu1) oneiric; urgency=low
+
+ * Initial release
+
+ -- James Page <james.page at ubuntu.com> Tue, 28 Jun 2011 15:14:30 +0100
diff --combined debian/control
index 0b8fd3e,0000000..9eca60f
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,81 -1,0 +1,83 @@@
+Source: stapler
+Section: java
+Priority: optional
- Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
++Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
++XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: James Page <james.page at ubuntu.com>
+DM-Upload-Allowed: yes
+Build-Depends:
+ cdbs,
+ debhelper (>= 7),
+ default-jdk,
+ javahelper,
+ maven-debian-helper
+Build-Depends-Indep:
+ default-jdk-doc,
+ groovy,
+ junit4,
++ libannotation-indexer-java,
+ libasm3-java,
+ libcommons-beanutils-java,
+ libcommons-discovery-java,
+ libcommons-fileupload-java,
+ libcommons-io-java,
+ libcommons-jexl-java,
+ libcssparser-java,
+ libguava-java,
+ libguava-java-doc,
+ libjellydoc-java,
+ libjenkins-commons-jelly-java,
+ libjenkins-htmlunit-java,
+ libjenkins-dom4j-java,
+ libjenkins-json-java,
+ libjetty-java,
+ liblocalizer-java,
+ libmaven-enforcer-plugin-java,
+ libmaven-install-plugin-java,
+ libmaven-javadoc-plugin-java,
+ libmetainf-services-java,
+ libmetainf-services-java-doc,
+ libmockito-java,
+ libservlet2.5-java,
+ libtiger-types-java
+Standards-Version: 3.9.3
+Homepage: http://stapler.java.net
+Vcs-Git: git://git.debian.org/git/pkg-java/stapler.git
+Vcs-Browser: http://git.debian.org/?p=pkg-java/stapler.git
+
+Package: libstapler-java
+Architecture: all
+Depends: ${maven:Depends}, ${misc:Depends}
+Recommends: ${maven:OptionalDepends}
+Description: Stapler HTTP request handling engine
+ Stapler is a library that "staples" your application objects to URLs,
+ making it easier to write web applications. The core idea of Stapler
+ is to automatically assign URLs for your objects, creating an intuitive
+ URL hierarchy.
+ .
+ Stapler provides bindings for:
+ * Commons Jelly
+ * Groovy
+ * JRuby (not packaged)
+ * Java Server Pages
+
+Package: libstapler-java-doc
+Architecture: all
+Section: doc
+Depends: ${maven:DocDepends}, ${misc:Depends}
+Recommends: ${maven:DocOptionalDepends}
+Suggests: libstapler-java
+Description: Documentation for libstapler-java
+ Stapler is a library that "staples" your application objects to URLs,
+ making it easier to write web applications. The core idea of Stapler
+ is to automatically assign URLs for your objects, creating an intuitive
+ URL hierarchy.
+ .
+ Stapler provides bindings for:
+ * Commons Jelly
+ * Groovy
+ * JRuby (not packaged)
+ * Java Server Pages
+ * JRebel (not packaged)
+ .
+ This package provides the API documentation for libstapler-java.
diff --combined debian/maven.ignoreRules
index ca31100,0000000..42c79dd
mode 100644,000000..100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@@ -1,21 -1,0 +1,23 @@@
+# Maven ignore rules - ignore some Maven dependencies and plugins
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+# for the version. In this case, the element is simply matched
+# and left as it is
+# - * (the star character, alone). In this case, anything will
+# match and be left as it is. For example, using * on the
+# position of the artifact field will match any artifact id
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., this dependency is then removed
+# from the POM
+# junit junit jar s/3\\..*/3.x/
+org.apache.maven.plugins maven-project-info-reports-plugin * * * *
+org.apache.maven.plugins maven-release-plugin * * * *
+org.jvnet.maven-jellydoc-plugin maven-jellydoc-plugin * * * *
+org.jvnet.fix1600 fix1600 * * * *
+org.jvnet.wagon-svn wagon-svn * * * *
+org.apache.maven.wagon wagon-webdav * * * *
++org.kathrynhuxtable.maven.wagon wagon-gitsite * * * *
++org.apache.maven.plugins maven-site-plugin * * * *
diff --combined debian/maven.rules
index fb25dae,0000000..35c026e
mode 100644,000000..100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@@ -1,29 -1,0 +1,30 @@@
+# Maven rules - transform Maven dependencies and plugins
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+# for the version. In this case, the element is simply matched
+# and left as it is
+# - * (the star character, alone). In this case, anything will
+# match and be left as it is. For example, using * on the
+# position of the artifact field will match any artifact id
+# - a regular expression of the form s/match/replace/
+# in this case, elements that match are transformed using
+# the regex rule.
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., replacing the version with 3.x
+# junit junit jar s/3\\..*/3.x/
+
+junit junit jar s/4\..*/4.x/ * *
+commons-collections commons-collections * s/3\..*/3.x/ * *
+s/org.kohsuke/asm/ s/asm3/asm-all/ * s/.*/3.x/ * *
+s/groovy/org.codehaus.groovy/ groovy * s/.*/debian/ * *
+s/javax.servlet/javax.servlet.jsp/ jsp-api jar s/2\..*/2.1/ * *
+javax.servlet servlet-api jar s/2\..*/2.5/ * *
+org.jvnet.maven-jellydoc-plugin * * s/1\..*/1.x/ * *
+s/org.jvnet.hudson/org.jenkins-ci/ commons-jelly-tags-define * * * *
+s/org.jvnet.hudson/org.jenkins-ci/ htmlunit * s/.*/debian/ * *
+org.mockito s/mockito-all/mockito-core/ * s/.*/debian/ * *
+org.mortbay.jetty jetty * s/6\..*/6.x/ * *
++s/org.jvnet.hudson/org.jenkins-ci/ annotation-indexer * s/.*/debian/ * *
--
stapler packaging
More information about the pkg-java-commits
mailing list