[librepository] 10/22: Import Debian patch 1.1.6-1

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Tue Nov 8 09:46:43 UTC 2016


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

ebourg-guest pushed a commit to branch master
in repository librepository.

commit e3ac2d341217c5260ebd3b062db3a3f6094d73db
Merge: e8a1b83 c088fe9
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Sep 25 20:51:27 2011 +0000

    Import Debian patch 1.1.6-1

 .classpath                                         |    8 +
 .project                                           |   17 +
 ChangeLog.txt                                      |   49 +
 README.txt                                         |   73 +
 ant/build-lib.xml                                  |  715 +++++++++
 build.properties                                   |    7 +
 build.xml                                          |   44 +
 common_build.xml                                   | 1651 ++++++++++++++++++++
 debian/changelog                                   |   12 +
 debian/control                                     |   26 +-
 debian/patches/jarnames.diff                       |   11 -
 debian/patches/libdir.diff                         |   13 -
 debian/patches/target-source-1.3.diff              |   13 -
 debian/rules                                       |   15 +-
 devresource/META-INF/MANIFEST.MF                   |    7 +
 ivy.xml                                            |   24 +
 ivysettings.xml                                    |   19 +
 librepository.iml                                  |  202 +++
 licence-LGPL.txt                                   |  504 ++++++
 .../repository/ContentCreationException.java       |   56 +
 .../libraries/repository/ContentEntity.java        |   86 +
 .../libraries/repository/ContentIOException.java   |   58 +
 .../libraries/repository/ContentItem.java          |   88 ++
 .../libraries/repository/ContentLocation.java      |   72 +
 .../libraries/repository/DefaultMimeRegistry.java  |  107 ++
 .../libraries/repository/DefaultNameGenerator.java |  150 ++
 .../libraries/repository/LibRepositoryBoot.java    |  119 ++
 .../libraries/repository/LibRepositoryInfo.java    |   70 +
 .../libraries/repository/MimeRegistry.java         |   45 +
 .../libraries/repository/NameGenerator.java        |   39 +
 .../reporting/libraries/repository/Repository.java |   44 +
 .../libraries/repository/RepositoryUtilities.java  |  596 +++++++
 .../libraries/repository/UrlRepository.java        |   38 +
 .../repository/dummy/DummyContentItem.java         |  184 +++
 .../repository/dummy/DummyContentLocation.java     |  211 +++
 .../repository/dummy/DummyRepository.java          |   67 +
 .../repository/dummy/NullOutputStream.java         |   76 +
 .../repository/email/EmailContentItem.java         |  133 ++
 .../repository/email/EmailContentLocation.java     |  131 ++
 .../repository/email/EmailEntryOutputStream.java   |  127 ++
 .../repository/email/EmailRepository.java          |  154 ++
 .../repository/file/FileContentEntity.java         |  201 +++
 .../libraries/repository/file/FileContentItem.java |   77 +
 .../repository/file/FileContentLocation.java       |  245 +++
 .../libraries/repository/file/FileRepository.java  |  109 ++
 .../repository/file/TempFileNameGenerator.java     |   56 +
 .../libraries/repository/librepository.properties  |   19 +
 .../repository/stream/StreamContentItem.java       |  225 +++
 .../repository/stream/StreamContentLocation.java   |  245 +++
 .../repository/stream/StreamRepository.java        |  154 ++
 .../repository/stream/WrappedInputStream.java      |   99 ++
 .../repository/stream/WrappedOutputStream.java     |   77 +
 .../libraries/repository/zip/ZipContentItem.java   |  297 ++++
 .../repository/zip/ZipContentLocation.java         |  355 +++++
 .../repository/zip/ZipEntryOutputStream.java       |  126 ++
 .../libraries/repository/zip/ZipRepository.java    |  122 ++
 .../repository/zipreader/ZipReadContentItem.java   |  157 ++
 .../zipreader/ZipReadContentLocation.java          |  285 ++++
 .../repository/zipreader/ZipReadRepository.java    |   97 ++
 .../repository/zipwriter/ZipContentItem.java       |  224 +++
 .../repository/zipwriter/ZipContentLocation.java   |  225 +++
 .../repository/zipwriter/ZipEntryOutputStream.java |  158 ++
 .../repository/zipwriter/ZipRepository.java        |  109 ++
 63 files changed, 9657 insertions(+), 66 deletions(-)

diff --cc debian/changelog
index 2672770,0000000..943fa4e
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,60 -1,0 +1,72 @@@
++librepository (1.1.6-1) unstable; urgency=low
++
++  * New upstream release
++  * switch back to Debian Java Maintainers, me as Uploader
++  * remove JRE depends
++  * add classpath to jar using jh_classpath
++  * stop building -gcj, we don't have one in the rest of jfreereport libs
++    either (and fix build-dep: s/default-jdk-builddep/default-jdk/)
++  * use jh_depends / ${java:Depends} 
++
++ -- Rene Engelhard <rene at debian.org>  Sun, 25 Sep 2011 20:51:27 +0000
++
 +librepository (0.1.4-5) unstable; urgency=low
 +
 +  [ Miguel Landaeta ]
 +  * Team upload.
 +  * Include javadoc files in librepository-java-doc. (Closes: #601216).
 +  * Bump Standards-Version to 3.9.1. No changes were required.
 +  * Set debian source format explicitly to 1.0.
 +
 +  [ Torsten Werner ]
 +  * QA upload.
 +  * Orphaning package.
 +
 + -- Torsten Werner <twerner at debian.org>  Tue, 16 Aug 2011 22:53:43 +0200
 +
 +librepository (0.1.4-4) unstable; urgency=low
 +
 +  [ Matthias Klose ]
 +  * Depend on default-jre-headless.
 +
 +  [ Torsten Werner ]
 +  * Add myself to Uploaders.
 +  * Reset Maintainer back to Debian Java Maintainers.
 +  * Add missing Depends: ${misc:Depends}.
 +  * Add Vcs-* headers.
 +  * Update Standards-Version: 3.8.2.
 +
 + -- Torsten Werner <twerner at debian.org>  Mon, 03 Aug 2009 22:33:03 +0200
 +
 +librepository (0.1.4-3) unstable; urgency=low
 +
 +  * use default-jdk-builddep (closes: #477887) 
 +
 + -- Rene Engelhard <rene at debian.org>  Sun, 27 Apr 2008 00:29:04 +0200
 +
 +librepository (0.1.4-2) unstable; urgency=low
 +
 +  * upload to unstable 
 +
 + -- Rene Engelhard <rene at debian.org>  Sun, 27 Apr 2008 00:29:02 +0200
 +
 +librepository (0.1.4-1) experimental; urgency=low
 +
 +  * New upstream release
 +
 + -- Rene Engelhard <rene at debian.org>  Sat, 29 Dec 2007 20:39:09 +0100
 +
 +librepository (0.1.1-2) unstable; urgency=low
 +
 +  * Fixed typos in long descriptions. Closes: #446603.
 +  * Build-Depends on debhelper >= 5.
 +  * Updated Standards-Version to 3.7.2.
 +  * Added myself to Uploaders.
 +
 + -- Michael Koch <konqueror at gmx.de>  Wed, 24 Oct 2007 13:04:55 +0200
 +
 +librepository (0.1.1-1) unstable; urgency=low
 +
 +  * Initial release
 +
 + -- Rene Engelhard <rene at debian.org>  Sat, 06 Oct 2007 16:35:33 +0200
diff --cc debian/control
index 0f297a2,0000000..ba6e2a6
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,65 -1,0 +1,47 @@@
 +Source: librepository
 +Section: java
 +Priority: optional
- Maintainer: Debian QA Group <packages at qa.debian.org>
- Build-Depends: debhelper (>= 5), cdbs, default-jdk-builddep, ant, libjcommon-java (>= 1.0.10)
++Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
++Uploaders: Rene Engelhard <rene at debian.org>
++Build-Depends: debhelper (>= 5), cdbs, default-jdk, ant, libjcommon-java (>= 1.0.10), libbase-java, libgnumail-java, libcommons-logging-java, javahelper
 +Standards-Version: 3.9.1
 +Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/librepository
 +Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/librepository/
 +
 +Package: librepository-java
 +Architecture: all
- Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless, libjcommon-java (>= 1.0.10-1), ${misc:Depends}
++Depends: ${java:Depends}, ${misc:Depends}
 +Recommends: librepository-java-gcj
 +Suggests: librepository-java-doc
 +Description: abstraction library for accessing hierachic bulk content
 + LibRepository provides a simple abstraction layer to access bulk content that
 + is organized in a hierarchical layer.
 + .
 + Unlike the JSR-000170, this library does not aim to solve all problems
 + associated with content storages. The main purpose of LibRepository is to
 + give users an abstract view over an filesystem like structure so that content
 + generator and content consumer do no longer have to make assumptions about
 + where to store the generated content.
 + .
 + The repositories described here should not be used to store other things than
 + BLOBs.
 +
 +Package: librepository-java-doc
 +Section: doc
 +Architecture: all
 +Depends: ${misc:Depends}
 +Description: abstraction library for accessing hierachic bulk content -- documentation
 + LibRepository provides a simple abstraction layer to access bulk content that
 + is organized in a hierarchical layer.
 + .
 + Unlike the JSR-000170, this library does not aim to solve all problems
 + associated with content storages. The main purpose of LibRepository is to
 + give users an abstract view over an filesystem like structure so that content
 + generator and content consumer do no longer have to make assumptions about
 + where to store the generated content.
 + .
 + The repositories described here should not be used to store other things than
 + BLOBs.
 + .
 + This package contains the Javadoc.
 +
- Package: librepository-java-gcj
- Section: libs
- Architecture: any
- Depends: ${shlibs:Depends}, libjcommon-java (>= 1.0.10-1), librepository-java (= ${source:Version}), ${misc:Depends}
- Description: abstraction library for accessing hierachic bulk content (native code)
-  LibRepository provides a simple abstraction layer to access bulk content that
-  is organized in a hierarchical layer.
-  .
-  Unlike the JSR-000170, this library does not aim to solve all problems
-  associated with content storages. The main purpose of LibRepository is to
-  give users an abstract view over an filesystem like structure so that content
-  generator and content consumer do no longer have to make assumptions about
-  where to store the generated content.
-  .
-  The repositories described here should not be used to store other things than
-  BLOBs.
-  .
-  This package contains the library compiled to native code for use with gij.
- 
diff --cc debian/rules
index fe45081,0000000..b1c4a5b
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,31 -1,0 +1,32 @@@
 +#!/usr/bin/make -f
 +# debian/rules file for libfonts-java (uses cdbs)
 +
 +include /usr/share/cdbs/1/rules/debhelper.mk
 +include /usr/share/cdbs/1/class/ant.mk
 +include /usr/share/cdbs/1/rules/simple-patchsys.mk
 +
 +JAVA_HOME := /usr/lib/jvm/default-java
 +ANT_HOME := /usr/share/ant
 +
- DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar jcommon
++DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar jcommon libbase gnumail commons-logging
 +DEB_ANT_BUILDFILE := build.xml
- DEB_ANT_BUILD_TARGET := compile javadoc
++DEB_ANT_BUILD_TARGET := compile jar javadoc
++
++DEB_UPSTREAM_VERSION := 1.1-SNAPSHOT
 +
 +clean::
 +	-rm -rf build
 +	-rm -rf javadoc
 +	-rm -f librepository-$(DEB_UPSTREAM_VERSION).jar
 +	# don't use them, go sure
 +	-rm -f lib/* lib/optional/*
 +
 +install/librepository-java::
- 	install -m 644 librepository-$(DEB_UPSTREAM_VERSION).jar debian/librepository-java/usr/share/java/librepository-$(DEB_UPSTREAM_VERSION).jar
++	install -m 644 dist/librepository-$(DEB_UPSTREAM_VERSION).jar debian/librepository-java/usr/share/java/librepository-$(DEB_UPSTREAM_VERSION).jar
 +	ln -s librepository-$(DEB_UPSTREAM_VERSION).jar debian/librepository-java/usr/share/java/librepository.jar
- 
- install/librepository-java-gcj:: install/librepository-java
- 	dh_nativejava -plibrepository-java-gcj
++	jh_classpath -plibrepository-java --classpath="/usr/share/java/jcommon.jar" debian/librepository-java/usr/share/java/librepository-$(DEB_UPSTREAM_VERSION).jar
++	jh_depends
 +
 +install/librepository-java-doc::
- 	dh_install -plibrepository-java-doc 'javadoc/*' usr/share/doc/librepository-java/api
++	dh_install -plibrepository-java-doc 'bin/javadoc/*' usr/share/doc/librepository-java/api
 +

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



More information about the pkg-java-commits mailing list