[openid4java] 01/01: Upload to unstable
Miguel Landaeta
nomadium at moszumanska.debian.org
Sun Jul 20 19:25:03 UTC 2014
This is an automated email from the git hooks/post-receive script.
nomadium pushed a commit to branch master
in repository openid4java.
commit 7bfb1db07e10783606a42289c92db5fbf9292268
Author: Miguel Landaeta <nomadium at debian.org>
Date: Sun Jul 20 16:24:08 2014 -0300
Upload to unstable
---
debian/changelog | 24 +++++++++-----
debian/control | 13 ++++----
debian/copyright | 63 ++++++++++++++++++++-----------------
debian/libopenid4java-java.manifest | 2 +-
debian/libopenid4java-java.poms | 14 +--------
debian/maven.rules | 1 +
debian/patches/buildxml.patch | 3 +-
debian/pom.xml | 60 +++++++++++++++++++++++++++++++++++
debian/rules | 17 +++++-----
9 files changed, 133 insertions(+), 64 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 40b157b..c35ffac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,19 @@
-openid4java (0.9.6.662-2) UNRELEASED; urgency=low
-
- * raise debhelper compat level to 9
- * update Standards-Version to 3.9.4
- * document upstreams insane maven usage in README.source
- * publish maven artifacts (Closes: #690887)
-
- -- Thomas Koch <thomas at koch.ro> Fri, 26 Oct 2012 16:07:34 +0200
+openid4java (0.9.6.662-2) unstable; urgency=low
+
+ [ Miguel Landaeta ]
+ * Add B-D on libservlet2.5-java and update d/patches/buildxml.patch
+ to include it in compilation classpath. (Closes: #755344).
+ * Bump Standards-Version to 3.9.5. No changes were required.
+ * Update Vcs-* URLs fields.
+ * Update d/copyright to make it compliant with format 1.0.
+ * Update my email address.
+
+ [ Thomas Koch ]
+ * Raise debhelper compat level to 9.
+ * Document upstreams insane maven usage in README.source.
+ * Publish Maven artifacts (Closes: #690887).
+
+ -- Miguel Landaeta <nomadium at debian.org> Sun, 20 Jul 2014 13:31:42 -0300
openid4java (0.9.6.662-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 9323d62..d9e0919 100644
--- a/debian/control
+++ b/debian/control
@@ -2,16 +2,17 @@ Source: openid4java
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Olivier Weinstoerffer <olivier.weinstoerffer at gmail.com>, Xavier Oswald <xoswald at debian.org>, Miguel Landaeta <miguel at miguel.cc>
-Build-Depends: debhelper (>= 9), javahelper (>= 0.32), ant, maven-repo-helper (>= 1.7.1)
+Uploaders: Olivier Weinstoerffer <olivier.weinstoerffer at gmail.com>,
+ Xavier Oswald <xoswald at debian.org>, Miguel Landaeta <nomadium at debian.org>
+Build-Depends: debhelper (>= 9), javahelper (>= 0.32), ant, maven-repo-helper
Build-Depends-Indep: default-jdk, libcommons-codec-java,
libcommons-logging-java, libcommons-httpclient-java, libehcache-java,
libspring-transaction-java, libspring-jdbc-java, libnekohtml-java,
- libhttpcore-java, libhttpclient-java, libguice-java
-Standards-Version: 3.9.4
+ libhttpcore-java, libhttpclient-java, libguice-java, libservlet2.5-java
+Standards-Version: 3.9.5
Homepage: http://code.google.com/p/openid4java/
-Vcs-Git: git://git.debian.org/git/pkg-java/openid4java.git
-Vcs-Browser: http://git.debian.org/?p=pkg-java/openid4java.git
+Vcs-Git: git://anonscm.debian.org/pkg-java/openid4java.git
+Vcs-Browser: http://anonscm.debian.org/?p=pkg-java/openid4java.git
Package: libopenid4java-java
Architecture: all
diff --git a/debian/copyright b/debian/copyright
index 7649919..4c9f9d2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,40 +1,47 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
-Name: openid4java
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: openid4java
Source: http://code.google.com/p/openid4java/
Files: *
Copyright: 2006-2009 Sxip Identity Corporation
License: Apache-2
- 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
- .
- On Debian systems, the full text of the Apache
- License version 2 can be found in the file
- `/usr/share/common-licenses/Apache-2.0'.
+ 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
+ .
+ On Debian systems, the full text of the Apache
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/Apache-2.0'.
-Files: samples/appengine-consumer/src/main/java/org/openid4java/appengine/AppEngineGuiceModule.java,
- samples/appengine-consumer/src/main/java/org/openid4java/appengine/AppEngineHttpFetcher.java,
- samples/appengine-consumer/src/main/java/org/openid4java/samples/servlet/ServletContextListener.java,
- src/org/openid4java/server/RealmVerifierFactory.java,
- src/org/openid4java/util/AbstractHttpFetcher.java,
- src/org/openid4java/util/HttpFetcherFactory.java,
- src/org/openid4java/util/HttpFetcher.java,
+Files: samples/appengine-consumer/src/main/java/org/openid4java/appengine/AppEngineGuiceModule.java
+ samples/appengine-consumer/src/main/java/org/openid4java/appengine/AppEngineHttpFetcher.java
+ samples/appengine-consumer/src/main/java/org/openid4java/samples/servlet/ServletContextListener.java
+ src/org/openid4java/server/RealmVerifierFactory.java
+ src/org/openid4java/util/AbstractHttpFetcher.java
+ src/org/openid4java/util/HttpFetcherFactory.java
+ src/org/openid4java/util/HttpFetcher.java
test/src/org/openid4java/consumer/InjectionTest.java
Copyright: 2009 Google Inc.
License: Apache-2
+ 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
+ .
+ On Debian systems, the full text of the Apache
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/Apache-2.0'.
Files: debian/*
-Copyright: 2010, Olivier Weinstoerffer <olivier.weinstoerffer at gmail.com>
- Xavier Oswald <xoswald at debian.org>
- 2011, Miguel Landaeta <miguel at miguel.cc>
+Copyright: 2010 Olivier Weinstoerffer <olivier.weinstoerffer at gmail.com>
+ 2010 Xavier Oswald <xoswald at debian.org>
+ 2011 Miguel Landaeta <nomadium at debian.org>
License: GPL-2
- This program is free software; you can redistribute it
- and/or modify it under the terms of the GNU General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later
- version.
- .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later
+ version.
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/libopenid4java-java.manifest b/debian/libopenid4java-java.manifest
index 449ef0f..2fcbf9d 100644
--- a/debian/libopenid4java-java.manifest
+++ b/debian/libopenid4java-java.manifest
@@ -1,3 +1,3 @@
usr/share/java/openid4java.jar:
- Class-Path: /usr/share/java/commons-codec.jar /usr/share/java/commons-logging.jar /usr/share/java/httpclient.jar /usr/share/java/httpcore.jar /usr/share/java/guice.jar /usr/share/java/ehcache.jar /usr/share/java/spring3-transaction.jar /usr/share/java/spring3-jdbc.jar /usr/share/java/spring3-core.jar /usr/share/java/spring3-beans.jar /usr/share/java/xercesImpl.jar /usr/share/java/nekohtml.jar
+ Class-Path: /usr/share/java/commons-codec.jar /usr/share/java/commons-logging.jar /usr/share/java/httpclient.jar /usr/share/java/httpcore.jar /usr/share/java/guice.jar /usr/share/java/ehcache.jar /usr/share/java/spring3-transaction.jar /usr/share/java/spring3-jdbc.jar /usr/share/java/spring3-core.jar /usr/share/java/spring3-beans.jar /usr/share/java/xercesImpl.jar /usr/share/java/nekohtml.jar /usr/share/java/servlet-api-2.5.jar
diff --git a/debian/libopenid4java-java.poms b/debian/libopenid4java-java.poms
index 5533a4e..1a7e280 100644
--- a/debian/libopenid4java-java.poms
+++ b/debian/libopenid4java-java.poms
@@ -1,13 +1 @@
-maven2/openid4java/pom.xml
-maven2/openid4java-consumer/pom.xml
-maven2/openid4java-consumer-JdbcConsumerAssociationStore/pom.xml
-maven2/openid4java-consumer-JdbcNonceVerifier/pom.xml
-maven2/openid4java-consumer-SampleConsumer/pom.xml
-maven2/openid4java-full/pom.xml
-maven2/openid4java-infocard/pom.xml
-maven2/openid4java-server/pom.xml
-maven2/openid4java-server-JdbcServerAssociationStore/pom.xml
-maven2/openid4java-server-SampleServer/pom.xml
-maven2/openid4java-xri/pom.xml
-maven2/pom.xml
-pom.xml
+debian/pom.xml
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..a468698
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1 @@
+org.springframework * jar s/.*/3.x/ * *
diff --git a/debian/patches/buildxml.patch b/debian/patches/buildxml.patch
index f6fe00d..1732fa4 100644
--- a/debian/patches/buildxml.patch
+++ b/debian/patches/buildxml.patch
@@ -4,7 +4,7 @@ Index: openid4java-0.9.5.593/build.xml
===================================================================
--- openid4java-0.9.5.593.orig/build.xml 2010-12-20 23:15:29.000000000 +0000
+++ openid4java-0.9.5.593/build.xml 2010-12-20 23:53:05.000000000 +0000
-@@ -30,10 +30,25 @@
+@@ -30,10 +30,26 @@
<target name="create_paths" depends="dist_type">
<path id="classpath">
@@ -22,6 +22,7 @@ Index: openid4java-0.9.5.593/build.xml
+ <include name="httpclient.jar"/>
+ <include name="httpcore.jar"/>
+ <include name="ehcache.jar"/>
++ <include name="servlet-api-2.5.jar"/>
+ <include name="spring3-transaction.jar"/>
+ <include name="spring3-jdbc.jar"/>
+ <include name="spring3-core.jar"/>
diff --git a/debian/pom.xml b/debian/pom.xml
new file mode 100644
index 0000000..72e9870
--- /dev/null
+++ b/debian/pom.xml
@@ -0,0 +1,60 @@
+<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>
+ <groupId>org.openid4java</groupId>
+ <artifactId>openid4java</artifactId>
+ <packaging>jar</packaging>
+ <name>OpenID4Java</name>
+ <version>0.9.6</version>
+ <dependencies>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.nekohtml</groupId>
+ <artifactId>nekohtml</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache-core</artifactId>
+ <version>1.3.0</version>
+ </dependency>
+
+ <!-- Discovery -->
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.8.1</version>
+ </dependency>
+
+ <!-- JdbcServerAssociationStore -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>3.x</version>
+ </dependency>
+
+ <!-- Sample Consumer -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>debian</version>
+ </dependency>
+
+ </dependencies>
+
+</project>
diff --git a/debian/rules b/debian/rules
index 5348f2b..ae70477 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,21 @@
#!/usr/bin/make -f
-export JAVA_HOME=/usr/lib/jvm/default-java
+include /usr/share/dpkg/default.mk
-PACKAGE:=openid4java
-DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
+export JAVA_HOME=/usr/lib/jvm/default-java
%:
dh $@ --with javahelper
override_jh_installlibs:
- mh_installpoms -plib$(PACKAGE)-java
- mh_installjar -plib$(PACKAGE)-java --usj-version=$(DEB_UPSTREAM_VERSION) \
- --usj-name=$(PACKAGE) \
- -l pom.xml build/$(PACKAGE).jar
+ mh_installpoms -plib$(DEB_SOURCE)-java
+ mh_installjar -plib$(DEB_SOURCE)-java --usj-version=$(DEB_VERSION_UPSTREAM) \
+ --usj-name=$(DEB_SOURCE) \
+ -l debian/pom.xml build/$(DEB_SOURCE).jar
+
+override_dh_clean:
+ dh_clean
+ mh_clean
get-orig-source:
cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openid4java.git
More information about the pkg-java-commits
mailing list