[pkg-eucalyptus-commits] r188 - in netty/tags: . 1:3.2.6.Final-2/debian
Damien Raude-Morvan
drazzib at alioth.debian.org
Sun Feb 12 11:47:20 UTC 2012
Author: drazzib
Date: 2012-02-12 11:47:19 +0000 (Sun, 12 Feb 2012)
New Revision: 188
Added:
netty/tags/1:3.2.6.Final-2/
netty/tags/1:3.2.6.Final-2/debian/README.source
netty/tags/1:3.2.6.Final-2/debian/build.xml
netty/tags/1:3.2.6.Final-2/debian/changelog
netty/tags/1:3.2.6.Final-2/debian/control
netty/tags/1:3.2.6.Final-2/debian/rules
Removed:
netty/tags/1:3.2.6.Final-2/debian/README.source
netty/tags/1:3.2.6.Final-2/debian/build.xml
netty/tags/1:3.2.6.Final-2/debian/changelog
netty/tags/1:3.2.6.Final-2/debian/control
netty/tags/1:3.2.6.Final-2/debian/orig-tar.sh
netty/tags/1:3.2.6.Final-2/debian/rules
Log:
[svn-buildpackage] Tagging netty 1:3.2.6.Final-2
Deleted: netty/tags/1:3.2.6.Final-2/debian/README.source
===================================================================
--- netty/trunk/debian/README.source 2012-02-10 09:22:37 UTC (rev 186)
+++ netty/tags/1:3.2.6.Final-2/debian/README.source 2012-02-12 11:47:19 UTC (rev 188)
@@ -1,15 +0,0 @@
-Building the source tarball
----------------------------
-
-Tarball is now built from the tagged source repository and requires no
-additional changes to meet DFSG.
-
- -- Chris Grzegorczyk <grze at eucalyptus.com> Thu, 17 Dec 2009 03:12:31 -0800
-
-The source tarball is repacked from the original source tarball downloaded
-from [1]. The doc/ subdirectory was removed, as it contains binary elements
-without source code (png, odg, pdf).
-
-[1] http://www.jboss.org/netty/downloads.html
-
- -- Thierry Carrez <thierry.carrez at ubuntu.com> Wed, 26 Aug 2009 15:13:13 +0200
Copied: netty/tags/1:3.2.6.Final-2/debian/README.source (from rev 187, netty/trunk/debian/README.source)
===================================================================
--- netty/tags/1:3.2.6.Final-2/debian/README.source (rev 0)
+++ netty/tags/1:3.2.6.Final-2/debian/README.source 2012-02-12 11:47:19 UTC (rev 188)
@@ -0,0 +1,23 @@
+Building the source tarball
+---------------------------
+
+Tarball is now built from the tagged source repository and requires no
+additional changes to meet DFSG.
+
+ -- Chris Grzegorczyk <grze at eucalyptus.com> Thu, 17 Dec 2009 03:12:31 -0800
+
+The source tarball is repacked from the original source tarball downloaded
+from [1]. The doc/ subdirectory was removed, as it contains binary elements
+without source code (png, odg, pdf).
+
+[1] http://www.jboss.org/netty/downloads.html
+
+ -- Thierry Carrez <thierry.carrez at ubuntu.com> Wed, 26 Aug 2009 15:13:13 +0200
+
+Test Suite Execution
+--------------------
+
+The unit test suite has been enabled based on a) the features built from this
+source package and b) the version of easymock currently avaliable in the archive.
+
+ -- James Page <james.page at ubuntu.com> Tue, 24 Jan 2012 09:02:56 +0000
Deleted: netty/tags/1:3.2.6.Final-2/debian/build.xml
===================================================================
--- netty/trunk/debian/build.xml 2012-02-10 09:22:37 UTC (rev 186)
+++ netty/tags/1:3.2.6.Final-2/debian/build.xml 2012-02-12 11:47:19 UTC (rev 188)
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<project name="pkg-java" default="package" basedir="..">
-
- <property name="build.sourceDirectory" value="src/main/java"/>
- <property name="build.directory" value="build"/>
- <property name="build.outputDirectory" value="${build.directory}/classes"/>
-
- <target name="clean">
- <delete dir="${build.directory}"/>
- </target>
-
- <target name="compile">
- <mkdir dir="${build.outputDirectory}"/>
- <javac
- destdir="${build.outputDirectory}"
- nowarn="true"
- target="1.5"
- deprecation="false"
- debug="on">
- <src path="${build.sourceDirectory}"/>
- <exclude name="org/jboss/netty/container/**"/>
- <exclude name="org/jboss/netty/example/**"/>
- <exclude name="org/jboss/netty/handler/codec/protobuf/**"/>
- <exclude name="org/jboss/netty/logging/JBossLogger*.java"/>
- <exclude name="org/jboss/netty/logging/OsgiLogger*.java"/>
- </javac>
- </target>
-
- <target name="package" depends="compile">
- <jar jarfile="${build.directory}/${artifactId}-${artifactVersion}.jar"
- basedir="${build.outputDirectory}"/>
- </target>
-
-</project>
Copied: netty/tags/1:3.2.6.Final-2/debian/build.xml (from rev 187, netty/trunk/debian/build.xml)
===================================================================
--- netty/tags/1:3.2.6.Final-2/debian/build.xml (rev 0)
+++ netty/tags/1:3.2.6.Final-2/debian/build.xml 2012-02-12 11:47:19 UTC (rev 188)
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+<project name="pkg-java" default="package" basedir="..">
+
+ <property name="build.sourceDirectory" value="src/main/java"/>
+ <property name="build.testSourceDirectory" value="src/test/java"/>
+ <property name="build.directory" value="build"/>
+ <property name="build.outputDirectory" value="${build.directory}/classes"/>
+ <property name="build.testOutputDirectory" value="${build.directory}/test-classes"/>
+ <property name="classpath.full.test" value="${build.testOutputDirectory}:${build.outputDirectory}"/>
+ <property name="build.javaVersion" value="1.5"/>
+
+ <target name="clean">
+ <delete dir="${build.directory}"/>
+ </target>
+
+ <target name="compile">
+ <mkdir dir="${build.outputDirectory}"/>
+ <javac
+ destdir="${build.outputDirectory}"
+ nowarn="true"
+ source="${build.javaVersion}" target="${build.javaVersion}"
+ deprecation="false"
+ debug="on">
+ <src path="${build.sourceDirectory}"/>
+ <exclude name="org/jboss/netty/container/**"/>
+ <exclude name="org/jboss/netty/example/**"/>
+ <exclude name="org/jboss/netty/handler/codec/protobuf/**"/>
+ <exclude name="org/jboss/netty/logging/JBossLogger*.java"/>
+ <exclude name="org/jboss/netty/logging/OsgiLogger*.java"/>
+ </javac>
+ </target>
+
+ <patternset id="test.sources.exclude">
+ <exclude name="**/ChannelBuffersTest.java"/>
+ <exclude name="**/JdkLoggerTest.java"/>
+ <exclude name="**/InternalLoggerFactoryTest.java"/>
+ <exclude name="**/Log4JLoggerTest.java"/>
+ <exclude name="org/jboss/netty/logging/JBoss*.java"/>
+ <exclude name="org/jboss/netty/handler/codec/protobuf/**"/>
+ <exclude name="**/StackTraceSimplifierTest.java"/>
+ <exclude name="org/jboss/netty/handler/ssl/**"/>
+ <exclude name="**/SwitchableInputStreamTest.java"/>
+ </patternset>
+
+ <target name="test-compile">
+ <mkdir dir="${build.testOutputDirectory}"/>
+ <javac
+ destdir="${build.testOutputDirectory}"
+ classpath="${classpath.full.test}"
+ nowarn="true"
+ source="${build.javaVersion}" target="${build.javaVersion}"
+ debug="on">
+ <src path="${build.testSourceDirectory}"/>
+ <patternset refid="test.sources.exclude"/>
+ </javac>
+ </target>
+
+ <target name="test" depends="test-compile">
+ <mkdir dir="${build.directory}/test-output"/>
+ <junit printsummary="yes" haltonfailure="yes">
+ <sysproperty key="basedir" value="${basedir}"/>
+ <classpath>
+ <pathelement path="${classpath.full.test}"/>
+ </classpath>
+ <formatter type="plain"/>
+ <batchtest todir="${build.directory}/test-output">
+ <fileset dir="${build.testSourceDirectory}">
+ <include name="**/*Test.java"/>
+ <exclude name="**/Abstract*"/>
+ <patternset refid="test.sources.exclude"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+ <target name="package" depends="compile,test">
+ <jar jarfile="${build.directory}/${artifactId}-${artifactVersion}.jar"
+ basedir="${build.outputDirectory}"/>
+ </target>
+
+</project>
Deleted: netty/tags/1:3.2.6.Final-2/debian/changelog
===================================================================
--- netty/trunk/debian/changelog 2012-02-10 09:22:37 UTC (rev 186)
+++ netty/tags/1:3.2.6.Final-2/debian/changelog 2012-02-12 11:47:19 UTC (rev 188)
@@ -1,42 +0,0 @@
-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 <drazzib at debian.org> 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
- * Pull sources from svn to build orig tarball avoiding DFSG non-compliance
- * debian/copyright, debian/README.source: Update to reflect DFSG-compliant
- packaging.
-
- -- Chris Grzegorczyk <grze at eucalyptus.com> Thu, 17 Dec 2009 03:12:31 -0800
-
-netty (3.1.0.CR1+dfsg-0ubuntu1) karmic; urgency=low
-
- * Repackaged orig tarball to avoid shipping sourceless doc/ elements.
- * debian/copyright, debian/README.source: Explain repacking.
-
- -- Thierry Carrez <thierry.carrez at ubuntu.com> Wed, 26 Aug 2009 15:13:13 +0200
-
-netty (3.1.0.CR1-0ubuntu1) karmic; urgency=low
-
- * Initial release. New Eucalyptus dependency.
-
- -- Thierry Carrez <thierry.carrez at ubuntu.com> Tue, 21 Jul 2009 16:48:12 +0200
Copied: netty/tags/1:3.2.6.Final-2/debian/changelog (from rev 187, netty/trunk/debian/changelog)
===================================================================
--- netty/tags/1:3.2.6.Final-2/debian/changelog (rev 0)
+++ netty/tags/1:3.2.6.Final-2/debian/changelog 2012-02-12 11:47:19 UTC (rev 188)
@@ -0,0 +1,54 @@
+netty (1:3.2.6.Final-2) unstable; urgency=low
+
+ * Merge from James Page (thanks!):
+ * Enable test suite to support Ubuntu MIR (LP: #913878) (Closes: #658250):
+ - d/build.xml: Add extra targets to compile and execute unit tests.
+ - d/rules: Add testing dependencies to build classpath.
+ - d/control: Added junit4 and libeasymock-java to BDI's and ant-optional
+ to BD's.
+ * d/orig-tar.sh; Dropped - not used.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sun, 12 Feb 2012 12:43:50 +0100
+
+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 <drazzib at debian.org> 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
+ * Pull sources from svn to build orig tarball avoiding DFSG non-compliance
+ * debian/copyright, debian/README.source: Update to reflect DFSG-compliant
+ packaging.
+
+ -- Chris Grzegorczyk <grze at eucalyptus.com> Thu, 17 Dec 2009 03:12:31 -0800
+
+netty (3.1.0.CR1+dfsg-0ubuntu1) karmic; urgency=low
+
+ * Repackaged orig tarball to avoid shipping sourceless doc/ elements.
+ * debian/copyright, debian/README.source: Explain repacking.
+
+ -- Thierry Carrez <thierry.carrez at ubuntu.com> Wed, 26 Aug 2009 15:13:13 +0200
+
+netty (3.1.0.CR1-0ubuntu1) karmic; urgency=low
+
+ * Initial release. New Eucalyptus dependency.
+
+ -- Thierry Carrez <thierry.carrez at ubuntu.com> Tue, 21 Jul 2009 16:48:12 +0200
Deleted: netty/tags/1:3.2.6.Final-2/debian/control
===================================================================
--- netty/trunk/debian/control 2012-02-10 09:22:37 UTC (rev 186)
+++ netty/tags/1:3.2.6.Final-2/debian/control 2012-02-12 11:47:19 UTC (rev 188)
@@ -1,30 +0,0 @@
-Source: netty
-Section: java
-Priority: optional
-Maintainer: Chris Grzegorczyk <grze at eucalyptus.com>
-DM-Upload-Allowed: yes
-Uploaders: Graziano Obertelli <graziano at eucalyptus.com>,
- Kyo Lee <kyo.lee at eucalyptus.com>,
- Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends-Indep: default-jdk,
- 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: ${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.
- It greatly simplifies and streamlines network programming such as TCP and UDP
- socket server.
Copied: netty/tags/1:3.2.6.Final-2/debian/control (from rev 187, netty/trunk/debian/control)
===================================================================
--- netty/tags/1:3.2.6.Final-2/debian/control (rev 0)
+++ netty/tags/1:3.2.6.Final-2/debian/control 2012-02-12 11:47:19 UTC (rev 188)
@@ -0,0 +1,32 @@
+Source: netty
+Section: java
+Priority: optional
+Maintainer: Chris Grzegorczyk <grze at eucalyptus.com>
+DM-Upload-Allowed: yes
+Uploaders: Graziano Obertelli <graziano at eucalyptus.com>,
+ Kyo Lee <kyo.lee at eucalyptus.com>,
+ Damien Raude-Morvan <drazzib at debian.org>
+Build-Depends-Indep: default-jdk,
+ junit4,
+ libcommons-logging-java,
+ libeasymock-java,
+ liblog4j1.2-java,
+ libservlet2.5-java,
+ libslf4j-java,
+ maven-repo-helper
+Build-Depends: ant, ant-optional, 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: ${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.
+ It greatly simplifies and streamlines network programming such as TCP and UDP
+ socket server.
Deleted: netty/tags/1:3.2.6.Final-2/debian/orig-tar.sh
===================================================================
--- netty/trunk/debian/orig-tar.sh 2012-02-10 09:22:37 UTC (rev 186)
+++ netty/tags/1:3.2.6.Final-2/debian/orig-tar.sh 2012-02-12 11:47:19 UTC (rev 188)
@@ -1,18 +0,0 @@
-#!/bin/sh -e
-
-# $1 = version
-TAR=../netty_$2.orig.tar.gz
-DIR=libnetty-java-$2.orig
-
-# clean up the upstream tarball
-svn export http://anonsvn.jboss.org/repos/netty/tags/netty-$2/ $DIR
-GZIP=--best tar -c -z -f $TAR $DIR
-rm -rf $DIR
-rm ../netty-$2
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
- . .svn/deb-layout
- mv $TAR $origDir
- echo "moved $TAR to $origDir"
-fi
Deleted: netty/tags/1:3.2.6.Final-2/debian/rules
===================================================================
--- netty/trunk/debian/rules 2012-02-10 09:22:37 UTC (rev 186)
+++ netty/tags/1:3.2.6.Final-2/debian/rules 2012-02-12 11:47:19 UTC (rev 188)
@@ -1,21 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_ANT_BUILDFILE := debian/build.xml
-DEB_ANT_ARGS := -DartifactVersion=$(DEB_UPSTREAM_VERSION) \
- -DartifactId=$(DEB_SOURCE_PACKAGE)
-DEB_JARS := commons-logging log4j-1.2 servlet-api-2.5 \
- slf4j-api slf4j-log4j12
-
-binary-post-install/lib$(DEB_SOURCE_PACKAGE)-java::
- 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
Copied: netty/tags/1:3.2.6.Final-2/debian/rules (from rev 187, netty/trunk/debian/rules)
===================================================================
--- netty/tags/1:3.2.6.Final-2/debian/rules (rev 0)
+++ netty/tags/1:3.2.6.Final-2/debian/rules 2012-02-12 11:47:19 UTC (rev 188)
@@ -0,0 +1,21 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+
+JAVA_HOME := /usr/lib/jvm/default-java
+DEB_ANT_BUILDFILE := debian/build.xml
+DEB_ANT_ARGS := -DartifactVersion=$(DEB_UPSTREAM_VERSION) \
+ -DartifactId=$(DEB_SOURCE_PACKAGE)
+DEB_JARS := commons-logging log4j-1.2 servlet-api-2.5 \
+ slf4j-api slf4j-log4j12 junit4 easymock ant-junit4 ant-junit
+
+binary-post-install/lib$(DEB_SOURCE_PACKAGE)-java::
+ 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
More information about the pkg-eucalyptus-commits
mailing list