[pkg-java] r15577 - in trunk: . groovy1.7.2 groovy1.7.2/debian groovy1.7.2/debian/patches groovy1.7.2/debian/source
Steffen Möller
moeller at alioth.debian.org
Thu Dec 22 11:29:44 UTC 2011
Author: moeller
Date: 2011-12-22 11:29:44 +0000 (Thu, 22 Dec 2011)
New Revision: 15577
Added:
trunk/groovy1.7.2/
trunk/groovy1.7.2/debian/
trunk/groovy1.7.2/debian/README.Debian
trunk/groovy1.7.2/debian/changelog
trunk/groovy1.7.2/debian/compat
trunk/groovy1.7.2/debian/control
trunk/groovy1.7.2/debian/copyright
trunk/groovy1.7.2/debian/groovy1.7.poms
trunk/groovy1.7.2/debian/maven.publishedRules
trunk/groovy1.7.2/debian/maven.rules
trunk/groovy1.7.2/debian/orig-tar.sh
trunk/groovy1.7.2/debian/patches/
trunk/groovy1.7.2/debian/patches/0001-start-scripts.patch
trunk/groovy1.7.2/debian/patches/0002-ant-build.diff.patch
trunk/groovy1.7.2/debian/patches/0003-disable-bnd.diff.patch
trunk/groovy1.7.2/debian/patches/series
trunk/groovy1.7.2/debian/rules
trunk/groovy1.7.2/debian/source/
trunk/groovy1.7.2/debian/source/format
trunk/groovy1.7.2/debian/watch
Log:
Adding 1.7.2 version because of API breakage to 1.7.3
affected Eucalyputs beyond repair for its upcoming
3.0 version.
Property changes on: trunk/groovy1.7.2/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Added: trunk/groovy1.7.2/debian/README.Debian
===================================================================
--- trunk/groovy1.7.2/debian/README.Debian (rev 0)
+++ trunk/groovy1.7.2/debian/README.Debian 2011-12-22 11:29:44 UTC (rev 15577)
@@ -0,0 +1,88 @@
+groovy for Debian
+-----------------
+
+A few notes for concerning this package:
+
+Build information:
+
+Groovy is normally built via maven, however since maven isn't in Debian
+just yet and debian policy requires all dependencies to be on the system
+at build time (and not retrieved via a network connection), ant is
+currently being used.
+
+The ant file was generated using the maven build files using the 'maven ant'
+task, and was then modified to include some of the extra maven.xml post/pre
+goals.
+
+As far as I can tell both builds create the same installables, but please
+feel free to let me know if you notice something that is out of sync.
+
+When maven is available in Debian, we can switch over and use it to
+perform an offline build.
+
+Version Number:
+
+Currently groovy is a beta, but since the upstream version number contains
+a 1.0 in it (1.0beta8) this will be considered a higher version than 1.0
+when it's released. For this reason, all beta packages will have a leading
+0 in front of their upstream version. This will allow users to ugprade to
+1.0 cleanly when it's released.
+
+Dependency information:
+
+Debian java policy prefers all dependencies to be packaged as separate
+packages. I've done this for most packages, except those that are CVS cuts,
+development versions, or out of date packages. Since these dependencies are
+a specific snapshot of what's been used, I've bundled those in this package,
+in the debian/bundled.tar.bz2.uue file.
+
+Over time, as each of these dependencies mature and are officially
+released (and groovy adopts them), I'll package them up individually,
+unless someone else beats me to it.
+
+The bundled dependencies are:
+
+axion-1.0-M3-dev (development version)
+commons-collections-3.0-dev2.jar (development version)
+nekohtml-0.7.7 (to be packaged)
+openejb-loader-0.9.2 (needs packaging, but is a large package)
+qdox-1.3 (to be packaged)
+redeox-0.9 (to be packaged)
+redeox-oro-0.9 (to be packaged, oro packageok ?)
+xerces-2.4 (old version, 2.6 in debian, will this work?)
+xml-apis-1.0.b2.jar (old version, 1.1 in debian, part of the xerces package ok?)
+
+Website:
+
+A shallow copy of the Groovy website has been included for offline reading
+in the groovy-doc package. The depth of links mirrored has been set to 2,
+this means most articles of interest will be in the
+/usr/share/doc/groovy-doc/groovy.codehaus.org directory. The main index
+page is Home.html (not index.html as normal) due to the structure of the
+actual Groovy website itself.
+
+The website is pre-fetched and included in the source package as a
+compressed uuencoded file, as part of the debian maintainer diffs. There's
+also a 'site' rule that's part of the debian/rules file. To update the
+website archive, simply run the 'site' rule, and a new website archive
+will be created (fakeroot debian/rules site).
+
+Note that the javadocs which are part of the website, are generated from
+the package source code and are not part of the pre-fetched website mirror.
+
+Misc:
+
+Any ideas, thoughts, help, etc with this package is greatly appreciated,
+please feel free to contact me if you would like to suggest and
+improvements, patches, etc. Thanks for using this package.
+
+ -- Marcus Crafter <crafterm at debian.org>, Sat, 18 Dec 2004 22:45:06 +0100
+
+Groovy's build is now using Ant and compatible with Maven 2.
+I have patched the Ant build to work with Debian, and I'm deploying
+Groovy's jars into the Maven 2 repository for Debian in /usr/share/maven-repo
+
+Documentation is now completely generated from the code, using the Ant build script.
+
+ -- Ludovic Claude <ludovic.claude at laposte.net> Fri, 17 Jul 2009 00:33:18 +0100
+
Added: trunk/groovy1.7.2/debian/changelog
===================================================================
--- trunk/groovy1.7.2/debian/changelog (rev 0)
+++ trunk/groovy1.7.2/debian/changelog 2011-12-22 11:29:44 UTC (rev 15577)
@@ -0,0 +1,275 @@
+groovy1.7.2 (1.7.2-1) unstable; urgency=low
+
+ [ Steffen Moeller ]
+
+ * Renamed package from 1.7 (as Brian describes below) to 1.7.2 because
+ of an API breakage with 1.7.3 that affects Eucalyptus.
+ * Getting in a series of smaller changes to the packaging that were
+ performed for the packaging of later versions of the packaging
+
+ [ Brian Thomason ]
+ * Appended minor version to package name to co-exist with latest groovy
+ package
+ * Added jansi build-dep
+ * Only packaging java lib
+ * Removed doc package as it wasn't building and providing documentation for
+ an outdated library provided for backward compatibility only doesn't seem
+ important.
+
+ [ Torsten Werner ]
+ UNRELEASED, FTBFS: needs jansi
+ * New upstream release
+ * Change maintainers into Maintainers.
+ * Update patches and convert them to dep3 format.
+
+ [ Thierry Carrez ]
+ * debian/control, debian/rules: (Build-)Depend on libservlet2.5-java
+ instead of libservlet2.4-java
+ * debian/control: Remove useless runtime dependency on libclassworlds-java
+
+ -- Brian Thomason <brian.thomason at eucalyptus.com> Fri, 09 Dec 2011 20:52:19 +0000
+
+groovy (1.7.0-3) unstable; urgency=low
+
+ * Replace asm2 with asm3 in debian/maven.rules. (Closes: #571356)
+
+ -- Torsten Werner <twerner at debian.org> Sun, 28 Feb 2010 11:33:39 +0100
+
+groovy (1.7.0-2) unstable; urgency=low
+
+ * Replace asm2 with asm3 in debian/groovy.links (Closes: #571369)
+ * Replace asm2 with asm3 in patches/ant-build.diff
+
+ -- Varun Hiremath <varun at debian.org> Fri, 26 Feb 2010 16:39:51 -0500
+
+groovy (1.7.0-1) unstable; urgency=low
+
+ * New upstream release
+ * Switch to source format 3.0 (quilt)
+ * debian/control:
+ - Switch to default-jdk
+ - Replace Build-Depends: libasm2* with libasm3*
+ - Bump Standards-Version to 3.8.4
+ * Update all the patches
+
+ -- Varun Hiremath <varun at debian.org> Wed, 17 Feb 2010 18:25:49 -0500
+
+groovy (1.6.4-4) unstable; urgency=low
+
+ [ Varun Hiremath ]
+ * Fix debian/copyright file (Closes: #543565)
+ * Bump Standards-Version to 3.8.3
+
+ [ Torsten Werner ]
+ * Remove Build-Depends: bnd and add a patch disable-bn.diff because bnd is
+ not ready for main yet. (Closes: #543130)
+
+ -- Torsten Werner <twerner at debian.org> Wed, 16 Sep 2009 13:25:12 +0200
+
+groovy (1.6.4-3) unstable; urgency=low
+
+ * Patch startGroovy to use Debian paths (Closes: #540688)
+
+ -- Ludovic Claude <ludovic.claude at laposte.net> Fri, 14 Aug 2009 14:26:04 +0100
+
+groovy (1.6.4-2) unstable; urgency=low
+
+ * Update Depends: libcommons-cli-java (>= 1.2). (Closes: #530623)
+
+ -- Torsten Werner <twerner at debian.org> Sun, 09 Aug 2009 11:24:02 +0200
+
+groovy (1.6.4-1) experimental; urgency=low
+
+ * New upstream release
+ * Add myself to Uploaders
+ * Fix classpath for bnd task in the build
+ * Add ant to Suggests: for the groovy package as
+ Ant can be embedded in some Groovy scripts
+
+ -- Ludovic Claude <ludovic.claude at laposte.net> Sun, 02 Aug 2009 23:12:29 +0100
+
+groovy (1.6.3-2) experimental; urgency=low
+
+ * Change the section to java
+ * Update the build to use most of the original ant build script
+ * Remove build.diff patch as it is not useful anymore.
+ * Use BND to add the OSGi metadata to the jar.
+ * Add bnd, libqdox-java, libjarjar-java to Build-Depends
+ * Link ivy.jar into the Groovy lib folder (Closes: #526472)
+ * Add Build-Depends on maven-repo-helper
+ * Deploy groovy jars into the Maven repository
+ * Add embeddable jar groovy-all.jar
+ * Add the Groovy documentation (gapi) and the Groovy changes
+ to the JDK (groovy-jdk) specification.
+ * Move the classloader configuration to /etc/groovy.
+ * Bump Standards-Version to 3.8.2:
+ - Add a README.source to describe patch system
+ - move API documentation to /usr/share/doc/groovy/api
+
+ -- Ludovic Claude <ludovic.claude at laposte.net> Fri, 17 Jul 2009 00:33:18 +0100
+
+groovy (1.6.3-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Torsten Werner <twerner at debian.org> Tue, 19 May 2009 21:49:37 +0200
+
+groovy (1.6.2-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Varun Hiremath <varun at debian.org> Wed, 06 May 2009 14:05:59 -0400
+
+groovy (1.6.0-1) unstable; urgency=low
+
+ [ Torsten Werner ]
+ * New upstream release (Closes: #521648)
+ * Remove Build-Depends: libclassworlds-java.
+ * Switch to source and target version 1.5.
+
+ [ Varun Hiremath ]
+ * Fix build.xml file
+ * Add ivy to Build-Depends
+ * Remove unnecessary Depends -- collections3, mx4j and xpp3
+ * Add build.diff patch to fix a build error
+ * Use quilt to manage patches
+ * Update manpage (Closes: #507862)
+
+ -- Varun Hiremath <varun at debian.org> Wed, 01 Apr 2009 19:24:19 -0400
+
+groovy (1.5.7-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Torsten Werner <twerner at debian.org> Thu, 04 Dec 2008 11:15:20 +0100
+
+groovy (1.5.6-2) unstable; urgency=low
+
+ * Build the package with openjdk-6-jdk now.
+ * Move package to main.
+ * Change Depends: openjdk-6-jre-headless | java5-runtime-headless.
+ * Bump up Standards-Version: 3.8.0 (no changes needed).
+
+ -- Torsten Werner <twerner at debian.org> Mon, 11 Aug 2008 19:21:53 +0200
+
+groovy (1.5.6-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Varun Hiremath <varun at debian.org> Thu, 01 May 2008 10:40:25 +0530
+
+groovy (1.5.5-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Varun Hiremath <varun at debian.org> Mon, 14 Apr 2008 14:53:28 +0530
+
+groovy (1.5.4-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Varun Hiremath <varun at debian.org> Sun, 10 Feb 2008 17:29:48 +0530
+
+groovy (1.5.2-1) unstable; urgency=low
+
+ * New upstream release
+ * Add antlr to Build-Depends-Indep and groovy Depends (Closes: #463147)
+ * Bump debhelper compat to 6
+
+ -- Varun Hiremath <varun at debian.org> Wed, 30 Jan 2008 09:41:16 +0530
+
+groovy (1.5.1-1) unstable; urgency=low
+
+ * New upstream release
+ * Fix hyphens in groovy manpage
+
+ -- Varun Hiremath <varun at debian.org> Sat, 05 Jan 2008 03:42:21 +0530
+
+groovy (1.5.0-2) unstable; urgency=low
+
+ * Set source=1.4 and target=1.4 for javac. (Closes: #458001)
+
+ -- Torsten Werner <twerner at debian.org> Fri, 28 Dec 2007 12:58:00 +0100
+
+groovy (1.5.0-1) unstable; urgency=low
+
+ [ Varun Hiremath ]
+ * New upstream release (Closes: #367010)
+ * debian/control:
+ + Set Debian Java maintainers as Maintainer (Closes: #382815)
+ + Add myself and Torsten to Uploaders
+ + Add sun-java6-jdk, libxstream-java to Build-Depends
+ + Add Homepage, Vcs-{Svn, Browser} headers
+ + Bump up the Standards-Version to 3.7.3
+ + Add Suggests for the binary and doc packages
+ * Add debian/watch, debian/orig-tar.sh to create orig.tar.gz
+ * Write a new debian/build.xml and add debian/ant.properties
+ * debian/rules:
+ + call javadoc to build docs
+ + use sun-java6-jdk to build
+ * Clean up javadoc installation.
+ * Add some missing links in debian/groovy.links
+ * Add manpages
+
+ [ Torsten Werner ]
+ * Switch to libservlet2.4-java.
+ * Add Build-Depends: libjline-java.
+ * Remove the (binary only) PDF file from orig.tar.gz.
+
+ -- Torsten Werner <twerner at debian.org> Sat, 15 Dec 2007 15:21:00 +0100
+
+groovy (0.1.0beta10-3) unstable; urgency=low
+
+ * Fixed dependencies to ant after ant reorganisation into main.
+ (closes: #331647)
+
+ -- Marcus Crafter <crafterm at debian.org> Tue, 18 Oct 2005 12:35:43 +0200
+
+groovy (0.1.0beta10-2) unstable; urgency=low
+
+ * Added missing dependency to bzip2. Thanks for Andreas Jochens
+ <aj at andaco.de> for the bug report.
+ (closes: #302574)
+
+ -- Marcus Crafter <crafterm at debian.org> Sat, 2 Apr 2005 20:32:48 +0200
+
+groovy (0.1.0beta10-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Marcus Crafter <crafterm at debian.org> Wed, 9 Mar 2005 17:11:18 +0100
+
+groovy (0.1.0beta8-4) unstable; urgency=low
+
+ * Improved website mirror in groovy-doc package by increasing the mirrored
+ link depth to 2. This catches many more articles from the Groovy wiki
+ which would be of interest for offline reading.
+ * Fixed broken doc-base links, added doc-base link for the website mirror.
+ * Added examples.
+
+ -- Marcus Crafter <crafterm at debian.org> Mon, 3 Jan 2005 21:34:18 +0100
+
+groovy (0.1.0beta8-3) unstable; urgency=low
+
+ * Added a shallow copy of the Groovy website to the groovy-doc package,
+ which contains various articles, language references and documents for
+ offline use. Rearranged javadoc generation to fit in with the website.
+
+ -- Marcus Crafter <crafterm at debian.org> Mon, 3 Jan 2005 00:37:10 +0100
+
+groovy (0.1.0beta8-2) unstable; urgency=low
+
+ * Updated build to include Groovy API javadoc, and Groovy JDK
+ documentation.
+ * Split package into a software and documentation package.
+ * Added doc-base details for groovy-doc package for the javadocs and
+ groovy API.
+
+ -- Marcus Crafter <crafterm at debian.org> Sun, 2 Jan 2005 14:33:52 +0100
+
+groovy (0.1.0beta8-1) unstable; urgency=low
+
+ * Initial Release.
+ (closes: #268029)
+
+ -- Marcus Crafter <crafterm at debian.org> Sat, 18 Dec 2004 22:45:06 +0100
Added: trunk/groovy1.7.2/debian/compat
===================================================================
--- trunk/groovy1.7.2/debian/compat (rev 0)
+++ trunk/groovy1.7.2/debian/compat 2011-12-22 11:29:44 UTC (rev 15577)
@@ -0,0 +1 @@
+6
Added: trunk/groovy1.7.2/debian/control
===================================================================
--- trunk/groovy1.7.2/debian/control (rev 0)
+++ trunk/groovy1.7.2/debian/control 2011-12-22 11:29:44 UTC (rev 15577)
@@ -0,0 +1,40 @@
+Source: groovy1.7.2
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Brian Thomason <brian.thomason at eucalyptus.com>
+Build-Depends: debhelper (>= 7.0.50~), cdbs
+Build-Depends-Indep: maven-repo-helper, ant (>= 1.7.1), ant-optional, default-jdk, bzip2, libasm3-java,
+ libbsf-java, libcommons-cli-java (>= 1.2), libcommons-logging-java
+ (>= 1.0.3), junit4, libmockobjects-java (>= 0.09), libregexp-java (>=
+ 1.2), libservlet2.5-java, libxstream-java, libjline-java, antlr,
+ tofrodos, ivy, libqdox-java, libjarjar-java, libjansi-java
+Standards-Version: 3.9.2
+Homepage: http://groovy.codehaus.org/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/groovy1.7.2/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/groovy1.7.2/
+
+Package: libgroovy1.7.2-java
+Architecture: all
+Depends: ${misc:Depends}, antlr, libasm3-java, libbsf-java,
+ libcommons-cli-java (>= 1.0),
+ libcommons-logging-java (>= 1.0.3), junit4, libmockobjects-java (>=
+ 0.09), libregexp-java (>= 1.2), libservlet2.5-java, libjline-java,
+ libxstream-java, ivy
+Suggests: ant (>= 1.7.1)
+Description: Agile dynamic language for the Java Virtual Machine
+ Groovy is an agile dynamic language for the JVM combining lots of great
+ features from languages like Python, Ruby and Smalltalk and making them
+ available to the Java developers using a Java-like syntax.
+ .
+ Groovy is designed to help you get things done on the Java platform in a
+ quicker, more concise and fun way - bringing the power of Python and Ruby
+ inside the Java platform.
+ .
+ Groovy can be used as an alternative compiler to javac to generate
+ standard Java bytecode to be used by any Java project or it can be used
+ dynamically as an alternative language such as for scripting Java objects,
+ templating or writing unit test cases.
+ .
+ The groovy API broke between 1.7.2 and 1.7.3 in a way that affects
+ Eucalyptus. The latest version of the groovy 1.7 series is 1.7.10.
Added: trunk/groovy1.7.2/debian/copyright
===================================================================
--- trunk/groovy1.7.2/debian/copyright (rev 0)
+++ trunk/groovy1.7.2/debian/copyright 2011-12-22 11:29:44 UTC (rev 15577)
@@ -0,0 +1,48 @@
+Format: http://dep.debian.net/deps/dep5
+Packager: Marcus Crafter <crafterm at debian.org>
+Source: http://groovy.codehaus.org/
+X-Upstream-Authors: Groovy Development Team, dev at groovy.codehaus.org
+
+Files: *
+Copyright: © 2003-2007 the original author or authors
+License: Apache-2.0
+ On Debian systems the full text of the Apache-2.0 license can be found in
+ the /usr/share/common-licenses/Apache-2.0 file.
+
+Files: src/main/org/codehaus/groovy/jsr223/*
+Copyright: © 2006 Sun Microsystems, Inc.
+License: BSD
+ Copyright (c) The Regents of the University of California.
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the University nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+Files: debian/*
+Copyright: © 2009 Varun Hiremath <varun at debian.org>
+ © 2009 Torsten Werner <twerner at debian.org>
+ © 2009 Ludovic Claude <ludovic.claude at laposte.net>
+License: GPL-2
+ On Debian systems the full text of the GPL Version 2 license can be
+ found in the /usr/share/common-licenses/GPL-2 file.
Added: trunk/groovy1.7.2/debian/groovy1.7.poms
===================================================================
--- trunk/groovy1.7.2/debian/groovy1.7.poms (rev 0)
+++ trunk/groovy1.7.2/debian/groovy1.7.poms 2011-12-22 11:29:44 UTC (rev 15577)
@@ -0,0 +1,3 @@
+pom.xml
+target/groovy1.7-all.pom
+
Added: trunk/groovy1.7.2/debian/maven.publishedRules
===================================================================
--- trunk/groovy1.7.2/debian/maven.publishedRules (rev 0)
+++ trunk/groovy1.7.2/debian/maven.publishedRules 2011-12-22 11:29:44 UTC (rev 15577)
@@ -0,0 +1,3 @@
+s/groovy/org.codehaus.groovy/ groovy*
+
+
Added: trunk/groovy1.7.2/debian/maven.rules
===================================================================
--- trunk/groovy1.7.2/debian/maven.rules (rev 0)
+++ trunk/groovy1.7.2/debian/maven.rules 2011-12-22 11:29:44 UTC (rev 15577)
@@ -0,0 +1,6 @@
+asm asm* jar s/3\..*/3.x/
+antlr antlr jar s/2\..*/2.x/
+junit junit jar s/3\..*/3.x/
+javax.servlet servlet-api jar *
+s/javax.servlet/javax.servlet.jsp/ jsp-api jar *
+
Added: trunk/groovy1.7.2/debian/orig-tar.sh
===================================================================
--- trunk/groovy1.7.2/debian/orig-tar.sh (rev 0)
+++ trunk/groovy1.7.2/debian/orig-tar.sh 2011-12-22 11:29:44 UTC (rev 15577)
@@ -0,0 +1,18 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+TAR=../groovy1.7_$2.orig.tar.gz
+DIR=groovy-$2.orig
+
+# clean up the upstream tarball
+unzip $3
+mv groovy-$2 $DIR
+GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.pdf' $DIR
+rm -rf $3 $DIR
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+ . .svn/deb-layout
+ mv $TAR $origDir
+ echo "moved $TAR to $origDir"
+fi
Property changes on: trunk/groovy1.7.2/debian/orig-tar.sh
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/groovy1.7.2/debian/patches/0001-start-scripts.patch
===================================================================
--- trunk/groovy1.7.2/debian/patches/0001-start-scripts.patch (rev 0)
+++ trunk/groovy1.7.2/debian/patches/0001-start-scripts.patch 2011-12-22 11:29:44 UTC (rev 15577)
@@ -0,0 +1,44 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Sun, 11 Apr 2010 22:05:01 +0200
+Subject: [PATCH] start-scripts
+
+===================================================================
+---
+ src/bin/startGroovy | 19 ++-----------------
+ 1 files changed, 2 insertions(+), 17 deletions(-)
+
+diff --git a/src/bin/startGroovy b/src/bin/startGroovy
+index 7bf8803..76d1457 100644
+--- a/src/bin/startGroovy
++++ b/src/bin/startGroovy
+@@ -105,27 +105,12 @@ fi
+
+ # Attempt to set GROOVY_HOME if it is not already set.
+ if [ -z "$GROOVY_HOME" -o ! -d "$GROOVY_HOME" ] ; then
+- # Resolve links: $0 may be a link to groovy's home.
+- PRG="$0"
+- # Need this for relative symlinks.
+- while [ -h "$PRG" ] ; do
+- ls=`ls -ld "$PRG"`
+- link=`expr "$ls" : '.*-> \(.*\)$'`
+- if expr "$link" : '/.*' > /dev/null; then
+- PRG="$link"
+- else
+- PRG=`dirname "$PRG"`"/$link"
+- fi
+- done
+- SAVED="`pwd`"
+- cd "`dirname \"$PRG\"`/.."
+- GROOVY_HOME="`pwd -P`"
+- cd "$SAVED"
++ GROOVY_HOME="/usr/share/groovy"
+ fi
+
+ # Set the default Groovy config if no specific one is mentioned.
+ if [ -z "$GROOVY_CONF" ] ; then
+- GROOVY_CONF="$GROOVY_HOME/conf/groovy-starter.conf"
++ GROOVY_CONF="/etc/groovy/groovy-starter.conf"
+ fi
+ STARTER_CLASSPATH="$GROOVY_HOME/lib/@GROOVYJAR@"
+
+--
Added: trunk/groovy1.7.2/debian/patches/0002-ant-build.diff.patch
===================================================================
--- trunk/groovy1.7.2/debian/patches/0002-ant-build.diff.patch (rev 0)
+++ trunk/groovy1.7.2/debian/patches/0002-ant-build.diff.patch 2011-12-22 11:29:44 UTC (rev 15577)
@@ -0,0 +1,182 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Sun, 11 Apr 2010 22:05:03 +0200
+Subject: [PATCH] ant-build.diff
+
+===================================================================
+---
+ build.xml | 53 ++++++++++++++++++++++++-------------------
+ config/ant/build-setup.xml | 1 +
+ 2 files changed, 31 insertions(+), 23 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index e9a99b0..ab54309 100644
+--- a/build.xml
++++ b/build.xml
+@@ -28,10 +28,17 @@ $Date: 2010-04-02 16:02:23 +0200 (Fr, 02. Apr 2010) $
+ <property name="ant.requiredVersion" value="1.6.5"/>
+
+ <!-- config/ant/build-maven.xml imports config/ant/build-setup.xml where all the paths are defined. -->
+- <import file="config/ant/build-maven.xml"/>
++ <import file="config/ant/build-setup.xml"/>
+ <import file="config/ant/build-checkstyle.xml"/>
+ <import file="config/ant/build-cobertura.xml"/>
+
++ <path id="compilePath">
++ <path path="${java.class.path}" />
++ </path>
++ <path id="toolsPath">
++ <path path="${java.class.path}" />
++ </path>
++
+ <condition property="_skipTests_">
+ <or>
+ <equals arg1="${test}" arg2="false"/>
+@@ -98,7 +105,9 @@ $Date: 2010-04-02 16:02:23 +0200 (Fr, 02. Apr 2010) $
+ </copy>
+ </target>
+
+- <target name="-init" depends="-fetchDependencies"/>
++ <target name="-init">
++ <xslt in="pom.xml" out="${targetDirectory}/groovy-all.pom" style="config/maven/groovy-all.xsl"/>
++ </target>
+
+ <target name="-banner">
+ <echo message="Java Runtime Environment version: ${java.version}"/>
+@@ -406,13 +415,13 @@ $Date: 2010-04-02 16:02:23 +0200 (Fr, 02. Apr 2010) $
+ <fail message="Test failed, not processing further targets."/>
+ </target>
+
+- <target name="-coverageInstrument" depends="-initCoverage,-coberturaInit" if="_forceCoverage_">
++ <target name="-coverageInstrument" if="_forceCoverage_">
+ <mkdir dir="${instrumentedClassesDirectory}"/>
+- <coberturaInstrument classesDirectory="${mainClassesDirectory}"/>
++ <!--coberturaInstrument classesDirectory="${mainClassesDirectory}"/-->
+ </target>
+
+ <target name="-coverageReport" depends="-initCoverage" if="_forceCoverage_">
+- <coberturaReport reportDirectory="${reportsDirectory}/cobertura" sourceDirectory="${mainSourceDirectory}"/>
++ <!--coberturaReport reportDirectory="${reportsDirectory}/cobertura" sourceDirectory="${mainSourceDirectory}"/-->
+ </target>
+
+ <target name="-actuallyCreateJars"
+@@ -525,12 +534,12 @@ $Date: 2010-04-02 16:02:23 +0200 (Fr, 02. Apr 2010) $
+ <delete dir="${stagingDirectory}" quiet="true"/>
+ <mkdir dir="${stagingDirectory}"/>
+ <unzip dest="${stagingDirectory}">
+- <fileset dir="${runtimeLibDirectory}">
+- <include name="antlr*.jar"/>
+- <include name="asm*.jar"/>
+- <exclude name="asm-attr*.jar"/>
+- <exclude name="asm-util*.jar"/>
+- <exclude name="asm-analysis*.jar"/>
++ <fileset dir="/usr/share/java">
++ <include name="antlr.jar"/>
++ <include name="asm3.jar"/>
++ <include name="asm3-commons.jar"/>
++ <include name="asm3-tree.jar"/>
++ <include name="asm3-xml.jar"/>
+ </fileset>
+ </unzip>
+ <unzip dest="${stagingDirectory}">
+@@ -550,8 +559,8 @@ $Date: 2010-04-02 16:02:23 +0200 (Fr, 02. Apr 2010) $
+ <exclude name="META-INF/MANIFEST.MF"/>
+ </patternset>
+ <globmapper from="META-INF/LICENSE.txt" to="META-INF/CLI-LICENSE.txt"/>
+- <fileset dir="${runtimeLibDirectory}">
+- <include name="commons-cli-*.jar"/>
++ <fileset dir="/usr/share/java">
++ <include name="commons-cli.jar"/>
+ </fileset>
+ </unzip>
+ <makeManifest file="${stagingDirectory}/META-INF/MANIFEST.MF" />
+@@ -575,7 +584,7 @@ $Date: 2010-04-02 16:02:23 +0200 (Fr, 02. Apr 2010) $
+ description="Build Groovy and create the jarfiles."/>
+
+ <target name="updateJarsForOsgi" unless="_skipOsgi_">
+- <taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="toolsPath"/>
++ <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="/usr/share/java/bnd.jar"/>
+ <copy todir="${targetDistDirectory}">
+ <fileset dir="config/bnd" includes="groovy*.bnd"/>
+ <filterset>
+@@ -631,7 +640,6 @@ $Date: 2010-04-02 16:02:23 +0200 (Fr, 02. Apr 2010) $
+ <mkdir dir="${installDirectory}/lib"/>
+ <copy todir="${installDirectory}/lib">
+ <fileset dir="${targetDistDirectory}" includes="groovy-${groovyVersion}.jar"/>
+- <fileset dir="${runtimeLibDirectory}" includes="*.jar"/>
+ </copy>
+
+ <!-- Install the embeddable bits -->
+@@ -669,7 +677,7 @@ $Date: 2010-04-02 16:02:23 +0200 (Fr, 02. Apr 2010) $
+ </chmod>
+ </target>
+
+- <target name="checkstyle" depends="-init,-initializeReports,-checkstyleInit"
++ <target name="checkstyle" depends="-init,-initializeReports"
+ description="Create the code style reports.">
+ <checkAndReport
+ reportDirectory="${reportsDirectory}/checkstyle"
+@@ -721,7 +729,7 @@ $Date: 2010-04-02 16:02:23 +0200 (Fr, 02. Apr 2010) $
+
+ <target name="doc" depends="javadoc, groovydoc" description="Create the documentation."/>
+
+- <target name="javadoc" depends="-fetchDependencies,-docInit,-jvm14BuildWarning,ensureGrammars"
++ <target name="javadoc" depends="-docInit,-jvm14BuildWarning,ensureGrammars"
+ description="Create the javadoc documentation.">
+ <javadoc destdir="${docsDirectory}/api" author="true" version="true"
+ windowtitle="${title}" doctitle="${title}"
+@@ -748,15 +756,14 @@ $Date: 2010-04-02 16:02:23 +0200 (Fr, 02. Apr 2010) $
+ </copy>
+ </target>
+
+- <target name="groovydoc" depends="-fetchDependencies">
++ <target name="groovydoc">
+ <path id="groovydocpath">
+ <path path="${mainClassesDirectory}"/>
+- <path refid="runtimePath"/>
+ </path>
+ <antforked target="realgroovydoc" maxmemory="${groovyDoc_mx}" classpathref="groovydocpath"/>
+ </target>
+
+- <target name="realgroovydoc" depends="-fetchDependencies,-docInit,-includeGroovyDocTemplates,docGDK">
++ <target name="realgroovydoc" depends="-docInit,-includeGroovyDocTemplates,docGDK">
+ <taskdef name="groovydoc" classname="org.codehaus.groovy.ant.Groovydoc">
+ <classpath>
+ <path path="${mainClassesDirectory}"/>
+@@ -781,7 +788,7 @@ $Date: 2010-04-02 16:02:23 +0200 (Fr, 02. Apr 2010) $
+ </groovydoc>
+ </target>
+
+- <target name="docGDK" depends="-fetchDependencies,-compileTools" description="Create the GDK documentation">
++ <target name="docGDK" depends="-compileTools" description="Create the GDK documentation">
+ <java classname="org.codehaus.groovy.tools.DocGenerator" fork="yes" failonerror="true">
+ <classpath>
+ <pathelement path="${toolsClassesDirectory}"/>
+@@ -809,13 +816,13 @@ $Date: 2010-04-02 16:02:23 +0200 (Fr, 02. Apr 2010) $
+ </delete>
+ </target>
+
+- <target name="deploy" depends="-mavenDeployInit,install,doc"
++ <target name="deploy" depends="install,doc"
+ description="Deploy jars to maven repository.">
+ <mavenDeploy version="${groovyVersion}" prefix="groovy"/>
+ <mavenDeploy version="${groovyVersion}" prefix="groovy-all"/>
+ </target>
+
+- <target name="installRepo" depends="-mavenInit,install,doc"
++ <target name="installRepo" depends="install,doc"
+ description="Deploy artifacts to local maven repository.">
+ <mavenInstallRepo version="${groovyVersion}" prefix="groovy"/>
+ <mavenInstallRepo version="${groovyVersion}" prefix="groovy-all"/>
+diff --git a/config/ant/build-setup.xml b/config/ant/build-setup.xml
+index cd24088..d497e40 100644
+--- a/config/ant/build-setup.xml
++++ b/config/ant/build-setup.xml
+@@ -67,6 +67,7 @@ $Date: 2007-03-11 19:14:07 +1000 (Sun, 11 Mar 2007) $
+ <java classname="org.apache.tools.ant.launch.Launcher" fork="true" maxmemory="@{maxmemory}" failonerror="true">
+ <classpath refid="@{classpathref}"/>
+ <jvmarg value="-Duser.home=${user.home}" />
++ <jvmarg line="-Dant.library.dir=/usr/share/ant/lib"/>
+ <arg value="@{target}"/>
+ <arg value="-DskipFetch=${skipFetch}"/>
+ <arg value="-DruntimeLibDirectory=${runtimeLibDirectory}"/>
+--
Added: trunk/groovy1.7.2/debian/patches/0003-disable-bnd.diff.patch
===================================================================
--- trunk/groovy1.7.2/debian/patches/0003-disable-bnd.diff.patch (rev 0)
+++ trunk/groovy1.7.2/debian/patches/0003-disable-bnd.diff.patch 2011-12-22 11:29:44 UTC (rev 15577)
@@ -0,0 +1,23 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Sun, 11 Apr 2010 22:05:05 +0200
+Subject: [PATCH] disable-bnd.diff
+
+===================================================================
+---
+ build.xml | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index ab54309..e97dfce 100644
+--- a/build.xml
++++ b/build.xml
+@@ -610,7 +610,7 @@ $Date: 2010-04-02 16:02:23 +0200 (Fr, 02. Apr 2010) $
+ </move>
+ </target>
+
+- <target name="install" depends="createJars,updateJarsForOsgi,skipOsgi" unless="testFailed"
++ <target name="install" depends="createJars,skipOsgi" unless="testFailed"
+ description="Create an installation hierarchy in target/install.">
+
+ <!--
+--
Added: trunk/groovy1.7.2/debian/patches/series
===================================================================
--- trunk/groovy1.7.2/debian/patches/series (rev 0)
+++ trunk/groovy1.7.2/debian/patches/series 2011-12-22 11:29:44 UTC (rev 15577)
@@ -0,0 +1,3 @@
+0001-start-scripts.patch
+0002-ant-build.diff.patch
+0003-disable-bnd.diff.patch
Added: trunk/groovy1.7.2/debian/rules
===================================================================
--- trunk/groovy1.7.2/debian/rules (rev 0)
+++ trunk/groovy1.7.2/debian/rules 2011-12-22 11:29:44 UTC (rev 15577)
@@ -0,0 +1,35 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+
+PACKAGE := libgroovy1.7.2-java
+VERSION := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME := /usr/lib/jvm/default-java
+DEB_ANT_BUILDFILE := build.xml
+DEB_ANT_BUILD_TARGET := createJars
+DEB_ANT_ARGS := -debug -DskipTests=true -DskipFetch=true
+DEB_JARS := ant mockobjects-core servlet-api-2.5 jsp-api-2.1 commons-cli antlr \
+ ant-antlr ant-trax xstream bsf xercesImpl jline junit4 xstream jline asm3 \
+ asm3-util asm3-tree asm3-analysis ivy bnd qdox jarjar jansi
+#API_DOCS := target/html/api
+
+binary-post-install/$(PACKAGE)::
+ # without bnd:
+ mh_installjar -p$(PACKAGE) -dusr/share/groovy/lib/groovy-$(DEB_UPSTREAM_VERSION).jar -l -s pom.xml target/dist/groovy.jar
+ mh_installjar -p$(PACKAGE) -dusr/share/groovy/embeddable/groovy-all-$(DEB_UPSTREAM_VERSION).jar -l -s target/groovy-all.pom target/dist/groovy-all.jar
+ rm -rf $(CURDIR)/debian/$(PACKAGE)/usr/share/maven-repo/org/codehaus/groovy/groovy-all/debian
+ rm -rf $(CURDIR)/debian/$(PACKAGE)/usr/share/maven-repo/org/codehaus/groovy/groovy/debian
+ # with bnd:
+ #mh_installjar -p$(PACKAGE) -dusr/share/groovy/lib/groovy-$(DEB_UPSTREAM_VERSION).jar -l pom.xml target/install/lib/groovy-$(DEB_UPSTREAM_VERSION).jar
+ #mh_installjar -p$(PACKAGE) -dusr/share/groovy/embeddable/groovy-all-$(DEB_UPSTREAM_VERSION).jar -l target/groovy-all.pom target/install/embeddable/groovy-all-$(DEB_UPSTREAM_VERSION).jar
+
+#binary-post-install/$(PACKAGE)-doc::
+# dh_install -p$(PACKAGE)-doc $(API_DOCS) usr/share/doc/$(PACKAGE)
+
+clean::
+ dh_clean
+ mh_clean
+
+get-orig-source:
+ -uscan --debug --download-version $(VERSION) --force-download --rename
Property changes on: trunk/groovy1.7.2/debian/rules
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/groovy1.7.2/debian/source/format
===================================================================
--- trunk/groovy1.7.2/debian/source/format (rev 0)
+++ trunk/groovy1.7.2/debian/source/format 2011-12-22 11:29:44 UTC (rev 15577)
@@ -0,0 +1 @@
+3.0 (quilt)
Added: trunk/groovy1.7.2/debian/watch
===================================================================
--- trunk/groovy1.7.2/debian/watch (rev 0)
+++ trunk/groovy1.7.2/debian/watch 2011-12-22 11:29:44 UTC (rev 15577)
@@ -0,0 +1,2 @@
+version=3
+http://dist.groovy.codehaus.org/distributions/groovy-src-(1\.7.+).zip debian debian/orig-tar.sh
More information about the pkg-java-commits
mailing list