[libparanamer-java] 12/12: Imported Debian patch 2.7-1

Markus Koschany apo-guest at moszumanska.debian.org
Fri Oct 24 17:16:47 BST 2014


This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository libparanamer-java.

commit 0b45aaf40cbca00e70056f10e2e15c895fb6862e
Merge: 091fca1 b84f133
Author: Markus Koschany <apo at gambaru.de>
Date:   Fri Oct 17 14:38:24 2014 +0200

    Imported Debian patch 2.7-1

 META-INF/MANIFEST.MF                               |    6 +
 com/thoughtworks/paranamer/AdaptiveParanamer.java  |   83 ++
 .../paranamer/AnnotationParanamer.java             |  184 +++
 .../paranamer/BytecodeReadingParanamer.java        | 1166 ++++++++++++++++++++
 com/thoughtworks/paranamer/CachingParanamer.java   |  123 +++
 com/thoughtworks/paranamer/DefaultParanamer.java   |  183 +++
 com/thoughtworks/paranamer/JavadocParanamer.java   |  268 +++++
 com/thoughtworks/paranamer/NullParanamer.java      |   52 +
 .../paranamer/ParameterNamesNotFoundException.java |   59 +
 com/thoughtworks/paranamer/Paranamer.java          |   84 ++
 .../paranamer/PositionalParanamer.java             |   87 ++
 debian/ant.properties                              |    4 -
 debian/build.xml                                   |   23 -
 debian/changelog                                   |   18 +-
 debian/compat                                      |    2 +-
 debian/control                                     |   53 +-
 debian/copyright                                   |   92 +-
 debian/libparanamer-java-doc.javadoc               |    1 +
 debian/libparanamer-java.jlibs                     |    1 +
 debian/libparanamer-java.poms                      |    1 +
 debian/orig-tar.sh                                 |   23 -
 debian/pom.xml                                     |  152 +++
 debian/rules                                       |   23 +-
 debian/source/format                               |    1 +
 debian/watch                                       |    4 +-
 25 files changed, 2574 insertions(+), 119 deletions(-)

diff --cc debian/changelog
index f0f7123,0000000..9380865
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,61 -1,0 +1,59 @@@
- libparanamer-java (2.1-3) UNRELEASED; urgency=medium
++libparanamer-java (2.7-1) unstable; urgency=low
 +
-   * Moved the package to Git
++  * Reintroduction of libparanamer-java. (Closes: #766255)
++  * Switch to dh sequencer, javahelper and maven_repo_helper.
++  * Declare compliance with Debian Policy 3.9.6.
++  * Use Git repository for packaging.
++  * Add libparanamer-java-doc binary package.
++  * Use compat level 9 and require debhelper >= 9.
 +
-  -- Markus Koschany <apo at gambaru.de>  Fri, 24 Oct 2014 18:10:42 +0200
- 
- libparanamer-java (2.1-2) unstable; urgency=low
- 
-   * QA upload.
-   * Orphaning package.
- 
-  -- Torsten Werner <twerner at debian.org>  Tue, 16 Aug 2011 15:50:39 +0200
++ -- Markus Koschany <apo at gambaru.de>  Fri, 17 Oct 2014 14:38:24 +0200
 +
 +libparanamer-java (2.1-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * (Build-)Depends on default-jdk.
 +  * Build-Depends on debhelper (>= 7).
 +  * Move package into java section.
 +  * Added myself to Uploaders.
 +  * Updated Standards-Version to 3.8.3.
 +
 + -- Michael Koch <konqueror at gmx.de>  Wed, 04 Nov 2009 19:48:16 +0100
 +
 +libparanamer-java (1.3-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Varun Hiremath <varun at debian.org>  Sun, 01 Mar 2009 15:08:49 -0500
 +
 +libparanamer-java (1.1.4-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Bump Standards-Version to 3.8.0
 +
 + -- Varun Hiremath <varun at debian.org>  Sun, 22 Jun 2008 17:46:37 +0530
 +
 +libparanamer-java (1.1.3-1) unstable; urgency=low
 +
 +  * New upstream release (Closes: #482984)
 +
 + -- Varun Hiremath <varun at debian.org>  Sat, 31 May 2008 19:13:35 +0530
 +
 +libparanamer-java (1.1.2-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Fix watch file
 +
 + -- Varun Hiremath <varun at debian.org>  Wed, 19 Mar 2008 16:21:07 +0530
 +
 +libparanamer-java (1.1.1-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Varun Hiremath <varun at debian.org>  Wed, 06 Feb 2008 16:53:51 +0530
 +
 +libparanamer-java (1.1-1) unstable; urgency=low
 +
 +  * Initial release (Closes: #462081)
 +
 + -- Varun Hiremath <varun at debian.org>  Tue, 22 Jan 2008 19:07:12 +0530
diff --cc debian/compat
index 7f8f011,0000000..ec63514
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 7
++9
diff --cc debian/control
index 59d4372,0000000..949459c
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,17 -1,0 +1,50 @@@
 +Source: libparanamer-java
 +Section: java
 +Priority: optional
- Maintainer: Debian QA Group <packages at qa.debian.org>
- Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant
- Standards-Version: 3.8.3
- Homepage: http://paranamer.codehaus.org/
++Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
++Uploaders:
++ Markus Koschany <apo at gambaru.de>
++Build-Depends:
++ debhelper (>= 9),
++ javahelper,
++ maven-repo-helper (>= 1.6~)
++Build-Depends-Indep:
++ default-jdk,
++ default-jdk-doc,
++ libatinject-jsr330-api-java
++Standards-Version: 3.9.6
++Homepage: https://github.com/paul-hammant/paranamer
 +Vcs-Git: git://anonscm.debian.org/pkg-java/libparanamer-java.git
- Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/libparanamer-java.git
++Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/libparanamer-java.git
 +
 +Package: libparanamer-java
 +Architecture: all
- Depends: default-jre | java1-runtime-headless | java2-runtime-headless, ${misc:Depends}
- Description: library to access method parameter names at runtime
-  Paranamer is a library that allows the parameter names of methods and
-  constructors to be accessed at runtime. Normally this information is
-  dropped by the compiler.
++Depends:
++ ${java:Depends},
++ ${misc:Depends}
++Recommends:
++ ${java:Recommends}
++Suggests:
++ libparanamer-java-doc
++Description: Java library to access method parameter names at runtime
++ Paranamer is a library that allows the parameter names of non-private methods
++ and constructors to be accessed at runtime. Normally this information is
++ dropped by the compiler. With the advent of advanced scripting languages and
++ web action frameworks for the Java Virtual Machine it is of increasing
++ importance to be able to leverage a method's parameter names. Scripting
++ languages like Groovy & JRuby, web action frameworks like Waffle and VRaptor
++ and the compelling Grails as well as SOAP and REST designs could also benefit.
++
++Package: libparanamer-java-doc
++Section: doc
++Architecture: all
++Depends:
++ ${misc:Depends}
++Recommends:
++ default-jdk-doc,
++ ${java:Recommends}
++Description: Java library to access method parameter names at runtime -- docs
++ Paranamer is a library that allows the parameter names of non-private methods
++ and constructors to be accessed at runtime.
++ .
++ This package contains the Javadoc API documentation for libparanamer-java.
diff --cc debian/copyright
index 12dd348,0000000..72ebed2
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,39 -1,0 +1,57 @@@
- This package was debianized by Varun Hiremath <varun at debian.org> on
- Tue, 22 Jan 2008 17:07:08 +0530.
++Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
++Upstream-Name: ParaNamer
++Source: https://github.com/paul-hammant/paranamer
 +
- It was downloaded from
- http://repository.codehaus.org/com/thoughtworks/paranamer/
++Files: *
++Copyright: 2000-2007 INRIA, France Telecom
++           2013,            Samuel Halliday
++           2007-2014,       Paul Hammant
++License: BSD-3-clause
++ * Copyright (c) 2007-2014 Paul Hammant
++ * 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 copyright holders 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
++ */
 +
- Copyright: (c) 2007 Paul Hammant
- 	   (c) 2000-2007 INRIA, France Telecom
- 
- License:
-     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 copyright holders 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
- 
-     On Debian systems, the complete text of the BSD License can be 
-     found in `/usr/share/common-licenses/BSD'.
- 
- The Debian packaging is (C) 2007, Varun Hiremath <varunhiremath at gmail.com> and
- is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
++Files: debian/*
++Copyright: 2014, Markus Koschany <apo at gambaru.de>
++License: Expat
++ Permission is hereby granted, free of charge, to any person obtaining a copy
++ of this software and associated documentation files (the "Software"), to deal
++ in the Software without restriction, including without limitation the rights
++ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ copies of the Software, and to permit persons to whom the Software is
++ furnished to do so, subject to the following conditions:
++ .
++ The above copyright notice and this permission notice shall be included in all
++ copies or substantial portions of the Software.
++ .
++ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
++ SOFTWARE.
diff --cc debian/libparanamer-java-doc.javadoc
index 0000000,0000000..ce83b25
new file mode 100644
--- /dev/null
+++ b/debian/libparanamer-java-doc.javadoc
@@@ -1,0 -1,0 +1,1 @@@
++internal
diff --cc debian/libparanamer-java.jlibs
index 0000000,0000000..73c1056
new file mode 100644
--- /dev/null
+++ b/debian/libparanamer-java.jlibs
@@@ -1,0 -1,0 +1,1 @@@
++paranamer-2.7.jar
diff --cc debian/libparanamer-java.poms
index 0000000,0000000..fd1c760
new file mode 100644
--- /dev/null
+++ b/debian/libparanamer-java.poms
@@@ -1,0 -1,0 +1,1 @@@
++debian/pom.xml --usj-name=paranamer
diff --cc debian/pom.xml
index 0000000,0000000..f263ff0
new file mode 100644
--- /dev/null
+++ b/debian/pom.xml
@@@ -1,0 -1,0 +1,152 @@@
++<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
++  <modelVersion>4.0.0</modelVersion>
++  <parent>
++    <groupId>com.thoughtworks.paranamer</groupId>
++    <artifactId>paranamer-parent</artifactId>
++    <version>2.7</version>
++  </parent>
++  <artifactId>paranamer</artifactId>
++  <packaging>bundle</packaging>
++  <name>ParaNamer Core</name>
++  <dependencies>
++    <dependency>
++      <groupId>org.mockito</groupId>
++      <artifactId>mockito-all</artifactId>
++      <version>1.9.0</version>
++      <scope>test</scope>
++    </dependency>
++    <dependency>
++        <groupId>javax.inject</groupId>
++        <artifactId>javax.inject</artifactId>
++        <version>1</version>
++        <optional>true</optional>
++    </dependency>
++    <dependency>
++        <groupId>net.sourceforge.f2j</groupId>
++        <artifactId>arpack_combined_all</artifactId>
++        <version>0.1</version>
++        <scope>test</scope>
++    </dependency>
++    <dependency>
++        <groupId>net.sourceforge.f2j</groupId>
++        <artifactId>arpack_combined_all</artifactId>
++        <version>0.1</version>
++        <classifier>javadoc</classifier>
++        <scope>test</scope>
++    </dependency>
++      <dependency>
++          <groupId>${project.groupId}</groupId>
++          <artifactId>${project.artifactId}</artifactId>
++          <version>2.5.5</version>
++          <classifier>javadoc</classifier>
++          <scope>test</scope>
++      </dependency>
++  </dependencies>
++  <build>
++    <plugins>
++		<plugin>
++			<groupId>org.apache.maven.plugins</groupId>
++			<artifactId>maven-source-plugin</artifactId>
++			<executions>
++				<execution>
++					<id>attach-sources</id>
++					<goals>
++						<goal>jar</goal>
++					</goals>
++				</execution>
++			</executions>
++		</plugin>
++		<plugin>
++			<groupId>org.apache.maven.plugins</groupId>
++			<artifactId>maven-javadoc-plugin</artifactId>
++			<executions>
++				<execution>
++					<id>attach-javadocs</id>
++					<goals>
++						<goal>jar</goal>
++					</goals>
++				</execution>
++			</executions>
++		</plugin>
++      <plugin>
++        <groupId>com.thoughtworks.paranamer</groupId>
++        <artifactId>paranamer-maven-plugin</artifactId>
++        <version>${project.version}</version>
++        <executions>
++          <execution>
++            <phase>compile</phase>
++            <goals>
++              <goal>generate</goal>
++            </goals>
++          </execution>
++        </executions>
++        <configuration>
++          <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
++          <outputDirectory>${project.build.outputDirectory}</outputDirectory>
++        </configuration>
++      </plugin>
++        <plugin>
++            <groupId>org.apache.maven.plugins</groupId>
++            <artifactId>maven-dependency-plugin</artifactId>
++            <executions>
++                <execution>
++                    <id>javadocs</id>
++                    <phase>test-compile</phase>
++                    <goals>
++                        <goal>copy-dependencies</goal>
++                    </goals>
++                    <configuration>
++                        <excludeTransitive>true</excludeTransitive>
++                        <classifier>javadoc</classifier>
++                        <includeGroupIds>net.sourceforge.f2j,${project.groupId}</includeGroupIds>
++                        <includeArtifactIds>arpack_combined_all,${project.artifactId}</includeArtifactIds>
++                        <failOnMissingClassifierArtifact>true</failOnMissingClassifierArtifact>
++                        <outputDirectory>${project.build.directory}/test-data</outputDirectory>
++                    </configuration>
++                </execution>
++            </executions>
++        </plugin>
++
++        <plugin>
++          <groupId>org.apache.felix</groupId>
++          <artifactId>maven-bundle-plugin</artifactId>
++          <extensions>true</extensions>
++          <configuration>
++            <instructions>
++              <Export-Package>com.thoughtworks.paranamer</Export-Package>
++            </instructions>
++          </configuration>
++        </plugin>
++        
++    </plugins>
++    <pluginManagement>
++      <plugins>
++        <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
++        <plugin>
++          <groupId>org.eclipse.m2e</groupId>
++          <artifactId>lifecycle-mapping</artifactId>
++          <version>1.0.0</version>
++          <configuration>
++            <lifecycleMappingMetadata>
++              <pluginExecutions>
++                <pluginExecution>
++                  <pluginExecutionFilter>
++                    <groupId>com.thoughtworks.paranamer</groupId>
++                    <artifactId>paranamer-maven-plugin</artifactId>
++                    <versionRange>[2.4.1,)</versionRange>
++                    <goals>
++                      <goal>generate</goal>
++                    </goals>
++                  </pluginExecutionFilter>
++                  <action>
++                    <ignore />
++                  </action>
++                </pluginExecution>
++              </pluginExecutions>
++            </lifecycleMappingMetadata>
++          </configuration>
++        </plugin>
++      </plugins>
++    </pluginManagement>
++  </build>
++</project>
diff --cc debian/rules
index 6f4c376,0000000..c9e71e9
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,14 -1,0 +1,19 @@@
 +#!/usr/bin/make -f
++# export DH_VERBOSE=1
++PKD  = $(abspath $(dir $(MAKEFILE_LIST)))
++VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s*([\d\.]+)}')
++export JAVA_HOME=/usr/lib/jvm/default-java
++export CLASSPATH=/usr/share/java/atinject-jsr330-api.jar
 +
- include /usr/share/cdbs/1/class/ant.mk
- include /usr/share/cdbs/1/rules/debhelper.mk
++%:
++	dh $@ --parallel --with javahelper,jh_maven_repo_helper
 +
- JAVA_HOME		:= /usr/lib/jvm/default-java
- DEB_ANT_BUILDFILE	:= debian/build.xml
- 
- install/libparanamer-java:: 
- 	install -D -m644 paranamer.jar $(DEB_DESTDIR)/usr/share/java/paranamer-$(DEB_UPSTREAM_VERSION).jar
- 	dh_link /usr/share/java/paranamer-$(DEB_UPSTREAM_VERSION).jar usr/share/java/paranamer.jar
++override_dh_auto_build:
++	jh_build --javadoc paranamer-$(VER).jar com
 +
 +get-orig-source:
- 	-uscan --upstream-version 0 --rename	
++	uscan --verbose --repack --compression xz --force-download
++
++get-orig-pom:
++	wget -O debian/pom.xml \
++	http://repo1.maven.org/maven2/com/thoughtworks/paranamer/paranamer/$(VER)/paranamer-$(VER).pom
diff --cc debian/source/format
index 0000000,0000000..163aaf8
new file mode 100644
--- /dev/null
+++ b/debian/source/format
@@@ -1,0 -1,0 +1,1 @@@
++3.0 (quilt)
diff --cc debian/watch
index 1260dfd,0000000..c6b0c61
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,3 -1,0 +1,3 @@@
 +version=3
- http://repository.codehaus.org/com/thoughtworks/paranamer/paranamer/ ([0-9].*)/ \
- debian debian/orig-tar.sh
++http://repo1.maven.org/maven2/com/thoughtworks/paranamer/paranamer/(\d.*)/\
++ paranamer-(\d.*)-sources\.jar

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libparanamer-java.git



More information about the pkg-java-commits mailing list