Bug#518226: plexus-component-api: New upstream version + fix packaging issues
Ludovic Claude
ludovic.claude at laposte.net
Wed Mar 4 21:28:50 UTC 2009
Package: plexus-component-api
Version: 1.0+svn6316
Severity: minor
Tags: patch
New upstream version 1.0-alpha-23 (very close to 1.0+svn6316)
Fix packaging issues: use svn tags to locate new upstream releases, fix lintian
warnings
-- System Information:
Debian Release: lenny/sid
APT prefers intrepid-updates
APT policy: (500, 'intrepid-updates'), (500, 'intrepid-security'), (500, 'intrepid-backports'), (500, 'intrepid')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.27-11-generic (SMP w/2 CPU cores)
Locale: LANG=fr_FR.UTF-8 at euro, LC_CTYPE=fr_FR.UTF-8 at euro (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-------------- next part --------------
diff -Nru plexus-component-api-1.0+svn6316/debian/build.xml plexus-component-api-1.0.0~alpha23/debian/build.xml
--- plexus-component-api-1.0+svn6316/debian/build.xml 2009-03-04 20:20:59.000000000 +0000
+++ plexus-component-api-1.0.0~alpha23/debian/build.xml 2009-03-04 20:20:59.000000000 +0000
@@ -73,8 +73,6 @@
href="/usr/share/doc/libplexus-classworlds-java/api/" />
<link packagelistLoc="/usr/share/doc/classpath-doc/api"
href="/usr/share/doc/classpath-doc/api/" />
- <link packagelistLoc="/usr/share/doc/libplexus-utils-java/api"
- href="/usr/share/doc/libplexus-utils-java/api/" />
</javadoc>
</target>
diff -Nru plexus-component-api-1.0+svn6316/debian/changelog plexus-component-api-1.0.0~alpha23/debian/changelog
--- plexus-component-api-1.0+svn6316/debian/changelog 2009-03-04 20:20:59.000000000 +0000
+++ plexus-component-api-1.0.0~alpha23/debian/changelog 2009-03-04 20:20:59.000000000 +0000
@@ -1,3 +1,18 @@
+plexus-component-api (1.0.0~alpha23-1) jaunty; urgency=low
+
+ * New upstream version (to cater for plexus-active-collections), use version
+ trick (1.0.0 instead of 1.0) to take precedence over 1.0+svn versions
+ * Update watch file as the location has changed on the svn server
+ * debian/rules: get-orig-sources uses uscan
+ * debian/control: bump up standards version to 3.8.0, fix lintian warnings,
+ add lib-plexus-classwords-java-doc to the javadoc package as it is used by
+ it.
+ * debian/build: remove the link to libplexus-utils-java javadoc as it's not
+ used by this component.
+ * debian/copyright: cleanup, made the file machine-interpretable
+
+ -- Ludovic Claude <ludovic.claude at laposte.net> Wed, 04 Mar 2009 12:52:52 +0000
+
plexus-component-api (1.0+svn6316-1) unstable; urgency=low
* New upstream svn version (to cater for plexus-container-default
diff -Nru plexus-component-api-1.0+svn6316/debian/control plexus-component-api-1.0.0~alpha23/debian/control
--- plexus-component-api-1.0+svn6316/debian/control 2009-03-04 20:20:59.000000000 +0000
+++ plexus-component-api-1.0.0~alpha23/debian/control 2009-03-04 20:20:59.000000000 +0000
@@ -2,16 +2,18 @@
Section: libs
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Paul Cager <paul-debian at home.paulcager.org>
+Uploaders: Ludovic Claude <ludovic.claude at laposte.net>,
+ Paul Cager <paul-debian at home.paulcager.org>
Build-Depends-Indep: java-gcj-compat-dev (>=1.0.65), ant-optional, libxalan2-java,
libplexus-classworlds-java, libplexus-classworlds-java-doc
Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3)
-Standards-Version: 3.7.2
+Standards-Version: 3.8.0
+Homepage: http://plexus.codehaus.org/
Package: libplexus-component-api-java
Architecture: all
Section: libs
-Depends: libplexus-classworlds-java
+Depends: ${misc:Depends}, libplexus-classworlds-java
Suggests: libplexus-component-api-java-doc
Description: utilities for the Plexus framework
The Plexus project provides a full software stack for creating and executing
@@ -32,12 +34,11 @@
* Various dependency injection techniques including constructor injection,
setter injection, and private field injection.
.
- Homepage: http://plexus.codehaus.org/
Package: libplexus-component-api-java-doc
Architecture: all
Section: doc
-Depends: classpath-doc
+Depends: ${misc:Depends}, classpath-doc, libplexus-classworlds-java-doc
Suggests: libplexus-component-api-java
Description: API Documentation for plexus-component-api
The Plexus project provides a full software stack for creating and executing
@@ -60,4 +61,4 @@
.
This package contains the API documentation for plexus-component-api
.
- Homepage: http://plexus.codehaus.org/
+
diff -Nru plexus-component-api-1.0+svn6316/debian/copyright plexus-component-api-1.0.0~alpha23/debian/copyright
--- plexus-component-api-1.0+svn6316/debian/copyright 2009-03-04 20:20:59.000000000 +0000
+++ plexus-component-api-1.0.0~alpha23/debian/copyright 2009-03-04 20:20:59.000000000 +0000
@@ -1,75 +1,37 @@
-This package was debianized by Paul Cager <paul-debian at home.paulcager.org>
-Sun, 25 Mar 2007 18:27:29 +0100
-
-The Debian packaging is Copyright (c) 2007 Paul Cager and is licensed under
-the GNU General Public License version 2. On Debian systems, the complete text
-of the GNU General Public License version 2 can be found in
-'/usr/share/common-licenses/GPL-2'.
-
-
-plex-classworlds was downloaded from http://plexus.codehaus.org/
-
-Upstream Authors:
- Ben Walding <bwalding at jakarta.org>
- bob mcwhirter<bob at eng.werken.com>
- Jason van Zyl<jason at maven.org>
- Andrew Williams
- Hani Suleiman <hani at formicary.net>
-
-COPYRIGHT NOTICES:
- Copyright 2002 (C) The Werken Company. All Rights Reserved.
-
- Redistribution and use of this software and associated documentation
- ("Software"), with or without modification, are permitted provided
- that the following conditions are met:
-
- 1. Redistributions of source code must retain copyright
- statements and notices. Redistributions must also contain a
- copy of this document.
-
- 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. The name "classworlds" must not be used to endorse or promote
- products derived from this Software without prior written
- permission of The Werken Company. For written permission,
- please contact bob at werken.com.
-
- 4. Products derived from this Software may not be called "classworlds"
- nor may "classworlds" appear in their names without prior written
- permission of The Werken Company. "classworlds" is a registered
- trademark of The Werken Company.
-
- 5. Due credit should be given to The Werken Company.
- (http://classworlds.werken.com/).
-
- THIS SOFTWARE IS PROVIDED BY THE WERKEN COMPANY AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESSED 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 WERKEN COMPANY OR ITS 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.
-
-
- * Copyright 2001-2006 Codehaus Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=437
+Upstream-Name: Plexus Component API
+Upstream-Maintainer: The Codehaus Foundation
+Upstream-Source: http://plexus.codehaus.org/
+
+Files: *
+Copyright: Copyright 2006-2009, Jason van Zyl <jason at maven.org>
+Copyright: Copyright 2006-2009, Pete Kazmier
+Copyright: Copyright 2006-2009, James Taylor <james at jamestaylor.org>
+Copyright: Copyright 2006-2009, Dan Diephouse <dan at envoisolutions.com>
+Copyright: Copyright 2006-2009, Kasper Nielsen <apache at kav.dk>
+Copyright: Copyright 2006-2009, Ben Walding <bwalding at jakarta.org>
+Copyright: Copyright 2006-2009, Mark Wilkinson <mhw at kremvax.net>
+Copyright: Copyright 2006-2009, Michal Maczka <mmaczka at interia.pl>
+Copyright: Copyright 2006-2009, Emmanuel Venisse <evenisse at codehaus.org>
+Copyright: Copyright 2006-2009, Trygve Laugst?l <trygvis at codehaus.org>
+Copyright: Copyright 2006-2009, Kenney Westerhof <kenney at codehaus.org>
+Copyright: Copyright 2006-2009, Carlos Sanchez <carlos at codehaus.org>
+Copyright: Copyright 2006-2009, Brett Porter <brett at codehaus.org>
+Copyright: Copyright 2006-2009, John Casey <jdcasey at codehaus.org>
+Copyright: Copyright 2006-2009, Andrew Williams <andy at handyande.co.uk>
+Copyright: Copyright 2006-2009, Rahul Thakur <rahul.thakur.xdev at gmail.com>
+Copyright: Copyright 2006-2009, Olivier Lamy <olamy at codehaus.org>
+Copyright: Copyright 2006-2009, Herv? Boutemy <hboutemy at codehaus.org>
+Copyright: Copyright 2006-2009, Oleg Gusakov <olegy at codehaus.org>
+Copyright: Copyright 2006-2009, Vincent Siveton <vsiveton at codehaus.org>
+License: Apache-2.0
+ On Debian GNU/Linux system you can find the complete text of the
+ Apache-2.0 license in '/usr/share/common-licenses/Apache-2.0'
+
+Files: debian/*
+Copyright: Copyright (C) 2007, Paul Cager <paul-debian at home.paulcager.org>
+Copyright: Copyright (C) 2009, Ludovic Claude <ludovic.claude at laposte.net>
+License: GPL-2
+ On Debian GNU/Linux system you can find the complete text of the
+ BSD license in `/usr/share/common-licenses/BSD'.
diff -Nru plexus-component-api-1.0+svn6316/debian/libplexus-component-api-java-doc.doc-base plexus-component-api-1.0.0~alpha23/debian/libplexus-component-api-java-doc.doc-base
--- plexus-component-api-1.0+svn6316/debian/libplexus-component-api-java-doc.doc-base 2009-03-04 20:20:59.000000000 +0000
+++ plexus-component-api-1.0.0~alpha23/debian/libplexus-component-api-java-doc.doc-base 1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-Document: libplexus-component-api-java
-Title: API Javadoc for plexus-component-api
-Author: plexus-component-api developers
-Abstract: This is the API Javadoc provided by the plexus-component-api library.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libplexus-component-api-java/api/index.html
-Files: /usr/share/doc/libplexus-component-api-java/api/*
diff -Nru plexus-component-api-1.0+svn6316/debian/orig-tar.sh plexus-component-api-1.0.0~alpha23/debian/orig-tar.sh
--- plexus-component-api-1.0+svn6316/debian/orig-tar.sh 1970-01-01 01:00:00.000000000 +0100
+++ plexus-component-api-1.0.0~alpha23/debian/orig-tar.sh 2009-03-04 20:20:59.000000000 +0000
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -e
+
+TAR=../plexus-component-api_$2.orig.tar.gz
+DIR=plexus-component-api-$2
+TAG=$(echo plexus-containers-$2 | sed -e's,1.0.0~alpha,1.0-alpha-,'| sed -e's,~beta,-beta-,')
+
+svn export http://svn.codehaus.org/plexus/plexus-containers/tags/$TAG/plexus-component-api/ $DIR
+tar -c -z -f $TAR $DIR
+rm -rf $DIR ../$TAG
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+ . .svn/deb-layout
+ mv $TAR $origDir
+ echo "moved $TAR to $origDir"
+fi
diff -Nru plexus-component-api-1.0+svn6316/debian/rules plexus-component-api-1.0.0~alpha23/debian/rules
--- plexus-component-api-1.0+svn6316/debian/rules 2009-03-04 20:20:59.000000000 +0000
+++ plexus-component-api-1.0.0~alpha23/debian/rules 2009-03-04 20:20:59.000000000 +0000
@@ -14,18 +14,9 @@
DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
#DEB_ANT_INVOKE := ant -verbose -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -f $(BUILD_FILE)
API_DOCS := build/doc/api
-SVN := http://svn.codehaus.org/plexus/plexus-containers/trunk/plexus-component-api
-REVISION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | cut -f1 -d- | sed 's/.*svn//' | sed 's/[^0-9].*//')
-
get-orig-source:
- echo "Getting revision $(REVISION) from $(SVN)"
- mkdir orig_tmp
- cd orig_tmp && \
- svn export -q -r $(REVISION) $(SVN) $(PACKAGE) && \
- tar czf ../../$(PACKAGE)_$(VERSION).orig.tar.gz $(PACKAGE)
- rm -rf orig_tmp
-
+ uscan --force-download --download-version $(DEB_UPSTREAM_VERSION) --rename
makebuilddir/lib$(PACKAGE)-java::
echo "build/$(PACKAGE)-$(VERSION).jar usr/share/java" >debian/lib$(PACKAGE)-java.install
diff -Nru plexus-component-api-1.0+svn6316/debian/watch plexus-component-api-1.0.0~alpha23/debian/watch
--- plexus-component-api-1.0+svn6316/debian/watch 1970-01-01 01:00:00.000000000 +0100
+++ plexus-component-api-1.0.0~alpha23/debian/watch 2009-03-04 20:20:59.000000000 +0000
@@ -0,0 +1,4 @@
+version=3
+opts="uversionmangle=s{1.0-alpha-}{1.0.0~alpha};s{-beta-}{~beta}" \
+ http://svn.codehaus.org/plexus/plexus-containers/tags/ \
+ plexus-containers-(.*)/ debian debian/orig-tar.sh
diff -Nru plexus-component-api-1.0+svn6316/pom.xml plexus-component-api-1.0.0~alpha23/pom.xml
--- plexus-component-api-1.0+svn6316/pom.xml 2007-04-06 19:12:23.000000000 +0100
+++ plexus-component-api-1.0.0~alpha23/pom.xml 2007-04-24 01:46:05.000000000 +0100
@@ -3,11 +3,11 @@
<parent>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-containers</artifactId>
- <version>1.0-alpha-23-SNAPSHOT</version>
+ <version>1.0-alpha-23</version>
</parent>
<artifactId>plexus-component-api</artifactId>
<name>Plexus Component API</name>
- <version>1.0-alpha-23-SNAPSHOT</version>
+ <version>1.0-alpha-23</version>
<build>
<plugins>
<plugin>
diff -Nru plexus-component-api-1.0+svn6316/src/main/java/org/codehaus/plexus/context/ContextException.java plexus-component-api-1.0.0~alpha23/src/main/java/org/codehaus/plexus/context/ContextException.java
--- plexus-component-api-1.0+svn6316/src/main/java/org/codehaus/plexus/context/ContextException.java 2007-01-17 22:54:30.000000000 +0000
+++ plexus-component-api-1.0.0~alpha23/src/main/java/org/codehaus/plexus/context/ContextException.java 2007-01-17 22:54:30.000000000 +0000
@@ -25,7 +25,7 @@
* when Component detects a malformed containerContext value.
*
* @author <a href="mailto:dev at avalon.apache.org">Avalon Development Team</a>
- * @version CVS $Revision: 5457 $ $Date: 2007-01-17 22:54:30 +0000 (Wed, 17 Jan 2007) $
+ * @version CVS $Revision: 5457 $ $Date: 2007-01-17 22:54:30 +0000 (mer 17 jan 2007) $
*/
public class ContextException
extends Exception
More information about the pkg-java-maintainers
mailing list