This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository netty.
commit 73c0bb87f783f32c061be2de30470a2bc4f26df6 Author: Damien Raude-Morvan <[email protected]> Date: Wed Nov 23 20:21:07 2011 +0000 * New upstream release (Closes: #643832): - Update watch file for github. * Add myself to Uploaders. * Use maven-repo-helper to install jar. * Bump to Standards-Version to 3.9.2: - Provide a get-orig-source target. - Drop Depends on default-jre-headless. - Drop XSBC-* fields (Ubuntu specific) - Add Homepage field. - Add Vcs-* fields. * Use debhelper 7 compat level. * Fix copyright: - now under Apache-2.0 licence. - update to DEP-5. * Switch to 3.0 (quilt) source format. * Add Recommends on logging frameworks. --- debian/build.xml | 1 - debian/changelog | 21 +++++++++++ debian/compat | 2 +- debian/control | 25 ++++++++----- debian/copyright | 87 ++++++++++++++++--------------------------- debian/libnetty-java.poms | 28 ++++++++++++++ debian/maven.cleanIgnoreRules | 17 +++++++++ debian/maven.ignoreRules | 40 ++++++++++++++++++++ debian/maven.publishedRules | 19 ++++++++++ debian/maven.rules | 23 ++++++++++++ debian/orig-tar.sh | 0 debian/rules | 9 ++++- debian/source/format | 1 + debian/watch | 2 +- 14 files changed, 206 insertions(+), 69 deletions(-) diff --git a/debian/build.xml b/debian/build.xml index ae6dd28..7575979 100644 --- a/debian/build.xml +++ b/debian/build.xml @@ -18,7 +18,6 @@ deprecation="false" debug="on"> <src path="${build.sourceDirectory}"/> - <exclude name="org/jboss/netty/channel/xnio/**"/> <exclude name="org/jboss/netty/container/**"/> <exclude name="org/jboss/netty/example/**"/> <exclude name="org/jboss/netty/handler/codec/protobuf/**"/> diff --git a/debian/changelog b/debian/changelog index 4b3c74f..c142347 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,24 @@ +netty (1:3.2.6.Final-1) unstable; urgency=low + + * New upstream release (Closes: #643832): + - Update watch file for github. + * Add myself to Uploaders. + * Use maven-repo-helper to install jar. + * Bump to Standards-Version to 3.9.2: + - Provide a get-orig-source target. + - Drop Depends on default-jre-headless. + - Drop XSBC-* fields (Ubuntu specific) + - Add Homepage field. + - Add Vcs-* fields. + * Use debhelper 7 compat level. + * Fix copyright: + - now under Apache-2.0 licence. + - update to DEP-5. + * Switch to 3.0 (quilt) source format. + * Add Recommends on logging frameworks. + + -- Damien Raude-Morvan <[email protected]> Wed, 23 Nov 2011 21:14:19 +0100 + netty (1:3.1.0.CR1-1) unstable; urgency=low * Port package to pkg-java based largely on existing Ubuntu package diff --git a/debian/compat b/debian/compat index 7ed6ff8..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +7 diff --git a/debian/control b/debian/control index 5944fe6..058a51f 100644 --- a/debian/control +++ b/debian/control @@ -3,19 +3,26 @@ Section: java Priority: optional Maintainer: Chris Grzegorczyk <[email protected]> DM-Upload-Allowed: yes -Uploaders: Graziano Obertelli <[email protected]>, Kyo Lee <[email protected]> -XSBC-Original-Maintainer: Thierry Carrez <[email protected]> +Uploaders: Graziano Obertelli <[email protected]>, + Kyo Lee <[email protected]>, + Damien Raude-Morvan <[email protected]> Build-Depends-Indep: default-jdk, - libcommons-logging-java, - liblog4j1.2-java, - libslf4j-java, - libservlet2.5-java -Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3) -Standards-Version: 3.8.3 + libcommons-logging-java, + liblog4j1.2-java, + libservlet2.5-java, + libslf4j-java, + maven-repo-helper +Build-Depends: ant, cdbs (>= 0.4.5.3), debhelper (>= 7) +Standards-Version: 3.9.2 +Homepage: http://www.jboss.org/netty +Vcs-Svn: svn://svn.debian.org/svn/pkg-eucalyptus/netty/trunk/ +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-eucalyptus/netty/trunk/ Package: libnetty-java Architecture: all -Depends: default-jre-headless | java5-runtime-headless, ${misc:Depends} +Depends: ${misc:Depends} +Recommends: libcommons-logging-java | liblog4j1.2-java | libslf4j-java, + libservlet2.5-java Description: Java NIO client/server socket framework Netty is a Java NIO client/server framework which enables quick and easy development of network applications such as protocol servers and clients. diff --git a/debian/copyright b/debian/copyright index acd120b..9eb15a1 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,55 +1,32 @@ -This package was debianized by Thierry Carrez <[email protected]> on -Tue, 30 Jun 2009 11:11:15 +0200 - -Copyright: - Copyright (C) 2008, Red Hat Middleware LLC, and individual contributors: - Andy Taylor - Daniel Bevenius - Trustin Heuiseung Lee - -Authors: - Andy Taylor - Daniel Bevenius - Trustin Heuiseung Lee - -License: - The Netty Project is licensed under the GNU LGPL (Lesser General Public - License) version 2.1. - - On Debian GNU/Linux and Ubuntu systems, the complete text of the LGPL 2.1 - License can be found in the /usr/share/common-licenses/LGPL-2.1 file. - - The same license and copyright applies to the Debian packaging. - - This product contains a modified version of Robert Harder's Public Domain - Base64 Encoder and Decoder, and extensions to Java Collections Framework - derived from the works by JSR-166 EG, Doug Lea, and Jason T. Greene. Both - have been released to the public domain under the following terms: - -The person or persons who have associated work with this document (the -"Dedicator" or "Certifier") hereby either (a) certifies that, to the best of -his knowledge, the work of authorship identified is in the public domain of -the country from which the work is published, or (b) hereby dedicates whatever -copyright the dedicators holds in the work of authorship identified below (the -"Work") to the public domain. A certifier, moreover, dedicates any copyright -interest he may have in the associated work, and for these purposes, is -described as a "dedicator" below. - -A certifier has taken reasonable steps to verify the copyright status of this -work. Certifier recognizes that his good faith efforts may not shield him from -liability if in fact the work certified is not in the public domain. - -Dedicator makes this dedication for the benefit of the public at large and to -the detriment of the Dedicator's heirs and successors. Dedicator intends this -dedication to be an overt act of relinquishment in perpetuate of all present -and future rights under copyright law, whether vested or contingent, in the -Work. Dedicator understands that such relinquishment of all rights includes -the relinquishment of all rights to enforce (by lawsuit or otherwise) those -copyrights in the Work. - -Dedicator recognizes that, once placed in the public domain, the Work may be -freely reproduced, distributed, transmitted, used, modified, built upon, or -otherwise exploited by anyone for any purpose, commercial or non-commercial, -and in any way, including by methods that have not yet been invented or -conceived. - +Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174 +Upstream-Name: JBoss Netty +Upstream-Contact: http://www.jboss.org/netty/ +Source: https://github.com/netty/netty/ + +Files: * +Copyright: Copyright (C) 2008-2011, Red Hat Inc. +License: Apache-2.0 + +Files: src/main/java/org/jboss/netty/util/internal/* +Copyright: Copyright (C) 2009, Red Hat Inc. +Comments: + Written by Doug Lea with assistance from members of JCP JSR-166 + Expert Group and released to the public domain, as explained at + http://creativecommons.org/licenses/publicdomain +License: Apache-2.0 + +Files: src/main/java/org/jboss/netty/handler/codec/base64/* +Copyright: Copyright (C) 2009, Red Hat Inc. +Comments: + Written by Robert Harder and released to the public domain, as explained at + http://creativecommons.org/licenses/publicdomain +License: Apache-2.0 + +Files: debian/* +Copyright: 2009, Thierry Carrez <[email protected]> +Copyright: 2011, Damien Raude-Morvan <[email protected]> +License: Apache-2.0 + +License: Apache-2.0 + On Debian systems, the complete text of the Apache License Version 2.0, + can be found in /usr/share/common-licenses/Apache-2.0. diff --git a/debian/libnetty-java.poms b/debian/libnetty-java.poms new file mode 100644 index 0000000..5ad70f2 --- /dev/null +++ b/debian/libnetty-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 diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules new file mode 100644 index 0000000..b47b61d --- /dev/null +++ b/debian/maven.cleanIgnoreRules @@ -0,0 +1,17 @@ +# Maven clean ignore rules - ignore some Maven dependencies and plugins +# during the clean phase of a Maven build +# 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 before mvn clean is called +# junit junit jar s/3\\..*/3.x/ + diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..dc4ab99 --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1,40 @@ +# 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/ + +# Packages excluded in debian/build.xml +com.google.protobuf protobuf-java * * * * +org.apache.felix org.osgi.compendium * * * * +org.apache.felix org.osgi.core * * * * +org.jboss.logging jboss-logging-spi * * * * + +# Disable unneeded plugins +org.apache.maven.plugins maven-assembly-plugin * * * * +org.apache.maven.plugins maven-eclipse-plugin * * * * +org.apache.maven.plugins maven-jxr-plugin * * * * +org.apache.maven.plugins maven-release-plugin * * * * +org.apache.maven.plugins maven-source-plugin * * * * + +# No tests +org.apache.maven.plugins maven-surefire-plugin * * * * +junit junit * * * * +org.easymock easymock * * * * +org.easymock easymockclassextension * * * * + +# No docs +org.jboss jbossorg-docbook-xslt * * * * +org.jboss jbossorg-fonts * * * * +org.jboss jbossorg-jdocbook-style * * * * +org.jboss.maven.plugins maven-jdocbook-plugin * * * * diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules new file mode 100644 index 0000000..822f087 --- /dev/null +++ b/debian/maven.publishedRules @@ -0,0 +1,19 @@ +# Maven published rules - additional rules to publish, to help +# the packaging work of Debian maintainers using mh_make +# 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/ + diff --git a/debian/maven.rules b/debian/maven.rules new file mode 100644 index 0000000..bfede64 --- /dev/null +++ b/debian/maven.rules @@ -0,0 +1,23 @@ +# 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/ + +org.jboss.netty netty bundle s/.*/debian/ * * +commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * * +log4j log4j * s/1\.2\..*/1.2.x/ * * +s/ant/org.apache.ant/ * * s/.*/debian/ * * +s/org.apache.tomcat/javax.servlet/ servlet-api jar s/.*/2.5/ * * diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh old mode 100644 new mode 100755 diff --git a/debian/rules b/debian/rules old mode 100644 new mode 100755 index 5dff207..ea2880f --- a/debian/rules +++ b/debian/rules @@ -11,6 +11,11 @@ DEB_JARS := commons-logging log4j-1.2 servlet-api-2.5 \ slf4j-api slf4j-log4j12 binary-post-install/lib$(DEB_SOURCE_PACKAGE)-java:: - dh_install -plib$(DEB_SOURCE_PACKAGE)-java build/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).jar usr/share/java - dh_link -plib$(DEB_SOURCE_PACKAGE)-java usr/share/java/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).jar usr/share/java/$(DEB_SOURCE_PACKAGE).jar + mh_installpoms -plib$(DEB_SOURCE_PACKAGE)-java + mh_installjar -plib$(DEB_SOURCE_PACKAGE)-java -l pom.xml build/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).jar +clean:: + mh_clean + +get-orig-source: + uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch index ea28ede..bbf9fc1 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ version=3 -http://anonsvn.jboss.org/repos/netty/tags/ netty-([0-9].*)/ debian debian/orig-tar.sh +http://githubredir.debian.net/github/netty/netty/netty-(.*).tar.gz -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netty.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
