[pkg-java] r19193 - in tags/libhamcrest-java: . 1.3-6/debian 1.3-6/debian/patches
Markus Koschany
apo at moszumanska.debian.org
Sat Jan 7 01:46:29 UTC 2017
Author: apo
Date: 2017-01-07 01:46:29 +0000 (Sat, 07 Jan 2017)
New Revision: 19193
Added:
tags/libhamcrest-java/1.3-6/
tags/libhamcrest-java/1.3-6/debian/changelog
tags/libhamcrest-java/1.3-6/debian/compat
tags/libhamcrest-java/1.3-6/debian/control
tags/libhamcrest-java/1.3-6/debian/copyright
tags/libhamcrest-java/1.3-6/debian/patches/002-random-build-failure.patch
tags/libhamcrest-java/1.3-6/debian/patches/series
tags/libhamcrest-java/1.3-6/debian/rules
tags/libhamcrest-java/1.3-6/debian/watch
Removed:
tags/libhamcrest-java/1.3-6/debian/changelog
tags/libhamcrest-java/1.3-6/debian/compat
tags/libhamcrest-java/1.3-6/debian/control
tags/libhamcrest-java/1.3-6/debian/copyright
tags/libhamcrest-java/1.3-6/debian/patches/002-fix-random-compilation-failure.patch
tags/libhamcrest-java/1.3-6/debian/patches/series
tags/libhamcrest-java/1.3-6/debian/rules
tags/libhamcrest-java/1.3-6/debian/watch
Log:
[svn-buildpackage] Tagging libhamcrest-java 1.3-6
Deleted: tags/libhamcrest-java/1.3-6/debian/changelog
===================================================================
--- trunk/libhamcrest-java/debian/changelog 2016-12-18 05:26:42 UTC (rev 19189)
+++ tags/libhamcrest-java/1.3-6/debian/changelog 2017-01-07 01:46:29 UTC (rev 19193)
@@ -1,147 +0,0 @@
-libhamcrest-java (1.3-5) unstable; urgency=medium
-
- * Fixed a random build failure (Closes: #738789)
-
- -- Emmanuel Bourg <ebourg at apache.org> Wed, 26 Mar 2014 10:09:07 +0100
-
-libhamcrest-java (1.3-4) unstable; urgency=medium
-
- * Removed the unused build dependency on testng
- * Standards-Version updated to 3.9.5 (no changes)
- * Switch to debhelper level 9
-
- -- Emmanuel Bourg <ebourg at apache.org> Tue, 24 Dec 2013 00:06:49 +0100
-
-libhamcrest-java (1.3-3) unstable; urgency=low
-
- * Install hamcrest-unit-test.jar in /usr/share/java (Closes: #724950)
- * Use canonical URLs for the Vcs-* fields
-
- -- Emmanuel Bourg <ebourg at apache.org> Wed, 16 Oct 2013 13:05:07 +0200
-
-libhamcrest-java (1.3-2) unstable; urgency=low
-
- * Team upload.
- * Upload to unstable.
-
- -- tony mancill <tmancill at debian.org> Wed, 22 May 2013 22:14:58 -0700
-
-libhamcrest-java (1.3-1) experimental; urgency=low
-
- * Team upload.
- * New upstream release
- * Refreshed the patch
- * The poms from the original source are used instead of those in debian/poms
- * Added the hamcrest-all.jar to the jars deployed in /usr/share/java
- * Removed the manifest for the hamcrest-text.jar (no longer used since 1.1)
- * Updated the OSGi metadata
- * debian/control: Updated the homepage
- * debian/control: Removed the deprecated DMUA flag
- * debian/control: Bumped Standards-Version to 3.9.4 (no changes)
- * debian/watch: Fixed the version pattern to exclude the PHP versions
- * debian/copyright: Updated the format URI to the 1.0 version
-
- -- Emmanuel Bourg <ebourg at apache.org> Wed, 10 Apr 2013 14:46:32 +0200
-
-libhamcrest-java (1.2-2) unstable; urgency=low
-
- [ by sponsor Steffen Moeller ]
- * Transition from eperimental (two months with no complaint) to unstable
- (Closes: #548144).
- * Removed Michael Koch from uploaders (Closes: #654068)
-
- -- Brian Thomason <brian.thomason at gmail.com> Sat, 04 Feb 2012 14:36:14 +0100
-
-libhamcrest-java (1.2-1) experimental; urgency=low
-
- * New upstream release
- * Bumped Standards-Version to 3.9.2 (no changes)
- [ by sponsor Steffen Moeller ]
- * Added Brian to uploaders.
- * Added DMUA flag.
- * Added test on existance of file prior to jar generation.
-
- -- Brian Thomason <brian.thomason at gmail.com> Fri, 02 Dec 2011 17:55:55 +0000
-
-libhamcrest-java (1.1-8) unstable; urgency=low
-
- * Team upload.
- * Re-added OSGi-metadata to the jar files.
- * Removed depends on JRE; which is no longer needed per the Java Policy.
- * Removed some B-D-I that appeared twice.
- * Added missing description to a patch.
- * Fixed clean target - it forgot to remvoe some maven-helper files.
-
- -- Niels Thykier <niels at thykier.net> Sun, 27 Jun 2010 17:29:24 +0200
-
-libhamcrest-java (1.1-7) unstable; urgency=low
-
- * Update watch file
- * Use upstream build.xml with necessary patches for the build,
- delete debian/build.xml
- * Add Build-Depends on libjarjar-java, default-jdk-doc, junit-doc
- junit4-doc, junit, junit4, libeasymock-java, libjmock-java, testng
- * Add documentation package containing the javadoc for the package
-
- -- Ludovic Claude <ludovic.claude at laposte.net> Fri, 28 May 2010 23:34:45 +0200
-
-libhamcrest-java (1.1-6) unstable; urgency=low
-
- [ Gabriele Giacone ]
- * Added Maven support.
- - added poms taken from upstream svn trunk
- - added d/copyright section for debian/poms
- - added maven-repo-helper to Build-Depends
-
- [ Damien Raude-Morvan ]
- * Upload to unstable
-
- -- Damien Raude-Morvan <drazzib at debian.org> Fri, 19 Mar 2010 22:42:34 +0100
-
-libhamcrest-java (1.1-5) unstable; urgency=low
-
- [ Gabriele Giacone ]
- * Added generation of one class with all static imports (Matchers.class).
- * Standards-Version to 3.8.4.
- * Source format 3.0 (quilt).
- * d/copyright converted to DEP-5 format.
- * Repackaging info moved from d/copyright to d/README.source
-
- [ Damien Raude-Morvan ]
- * Upload to unstable
-
- -- Damien Raude-Morvan <drazzib at debian.org> Sun, 14 Mar 2010 22:18:34 +0100
-
-libhamcrest-java (1.1-4) unstable; urgency=low
-
- [ Thierry Carrez ]
- * Set minimal dependency to java5-runtime-headless since we build Java5 code
-
- [ Damien Raude-Morvan ]
- * Add myself to Uploaders
- * Add debian/manifest/*.mf for OSGi metadata (Closes: #558185)
-
- -- Damien Raude-Morvan <drazzib at debian.org> Sun, 29 Nov 2009 01:07:12 +0100
-
-libhamcrest-java (1.1-3) unstable; urgency=low
-
- * (Build-)Depends on default-jdk.
- * Build-Depends on debhelper >= 7.
- * Put package into section 'java'.
- * Added Depends ${misc:Depends}.
- * Added myself to Uploaders.
- * Updated Standards-Version to 3.8.3.
-
- -- Michael Koch <konqueror at gmx.de> Thu, 24 Sep 2009 08:04:44 +0200
-
-libhamcrest-java (1.1-2) unstable; urgency=low
-
- * Fix java bytecode / java runtime version mismatch (Closes: #503799)
-
- -- Varun Hiremath <varun at debian.org> Sat, 01 Nov 2008 03:21:49 -0400
-
-libhamcrest-java (1.1-1) unstable; urgency=low
-
- * Initial release (Closes: #470523)
-
- -- Varun Hiremath <varun at debian.org> Tue, 15 Jul 2008 22:24:09 +0530
Copied: tags/libhamcrest-java/1.3-6/debian/changelog (from rev 19192, trunk/libhamcrest-java/debian/changelog)
===================================================================
--- tags/libhamcrest-java/1.3-6/debian/changelog (rev 0)
+++ tags/libhamcrest-java/1.3-6/debian/changelog 2017-01-07 01:46:29 UTC (rev 19193)
@@ -0,0 +1,164 @@
+libhamcrest-java (1.3-6) unstable; urgency=medium
+
+ * Team upload.
+ * wrap-and-sort -sa.
+ * Switch from cdbs to dh sequencer.
+ * Use only Build-Depends field.
+ * Declare compliance with Debian Policy 3.9.8.
+ * Vcs-Browser: Use https.
+ * Switch to compat level 10.
+ * Fix debian/watch file and use the new github.com address from now on.
+ * Drop 002-fix-random-compilation-failure.patch.
+ * Add 002-random-build-failure.patch and ensure that the build uses the
+ preexisting jars in /usr/share/java. Add libhamcrest-java to Build-Depends.
+ (Closes: #846116)
+
+ -- Markus Koschany <apo at debian.org> Sat, 07 Jan 2017 00:33:15 +0100
+
+libhamcrest-java (1.3-5) unstable; urgency=medium
+
+ * Fixed a random build failure (Closes: #738789)
+
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 26 Mar 2014 10:09:07 +0100
+
+libhamcrest-java (1.3-4) unstable; urgency=medium
+
+ * Removed the unused build dependency on testng
+ * Standards-Version updated to 3.9.5 (no changes)
+ * Switch to debhelper level 9
+
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 24 Dec 2013 00:06:49 +0100
+
+libhamcrest-java (1.3-3) unstable; urgency=low
+
+ * Install hamcrest-unit-test.jar in /usr/share/java (Closes: #724950)
+ * Use canonical URLs for the Vcs-* fields
+
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 16 Oct 2013 13:05:07 +0200
+
+libhamcrest-java (1.3-2) unstable; urgency=low
+
+ * Team upload.
+ * Upload to unstable.
+
+ -- tony mancill <tmancill at debian.org> Wed, 22 May 2013 22:14:58 -0700
+
+libhamcrest-java (1.3-1) experimental; urgency=low
+
+ * Team upload.
+ * New upstream release
+ * Refreshed the patch
+ * The poms from the original source are used instead of those in debian/poms
+ * Added the hamcrest-all.jar to the jars deployed in /usr/share/java
+ * Removed the manifest for the hamcrest-text.jar (no longer used since 1.1)
+ * Updated the OSGi metadata
+ * debian/control: Updated the homepage
+ * debian/control: Removed the deprecated DMUA flag
+ * debian/control: Bumped Standards-Version to 3.9.4 (no changes)
+ * debian/watch: Fixed the version pattern to exclude the PHP versions
+ * debian/copyright: Updated the format URI to the 1.0 version
+
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 10 Apr 2013 14:46:32 +0200
+
+libhamcrest-java (1.2-2) unstable; urgency=low
+
+ [ by sponsor Steffen Moeller ]
+ * Transition from eperimental (two months with no complaint) to unstable
+ (Closes: #548144).
+ * Removed Michael Koch from uploaders (Closes: #654068)
+
+ -- Brian Thomason <brian.thomason at gmail.com> Sat, 04 Feb 2012 14:36:14 +0100
+
+libhamcrest-java (1.2-1) experimental; urgency=low
+
+ * New upstream release
+ * Bumped Standards-Version to 3.9.2 (no changes)
+ [ by sponsor Steffen Moeller ]
+ * Added Brian to uploaders.
+ * Added DMUA flag.
+ * Added test on existance of file prior to jar generation.
+
+ -- Brian Thomason <brian.thomason at gmail.com> Fri, 02 Dec 2011 17:55:55 +0000
+
+libhamcrest-java (1.1-8) unstable; urgency=low
+
+ * Team upload.
+ * Re-added OSGi-metadata to the jar files.
+ * Removed depends on JRE; which is no longer needed per the Java Policy.
+ * Removed some B-D-I that appeared twice.
+ * Added missing description to a patch.
+ * Fixed clean target - it forgot to remvoe some maven-helper files.
+
+ -- Niels Thykier <niels at thykier.net> Sun, 27 Jun 2010 17:29:24 +0200
+
+libhamcrest-java (1.1-7) unstable; urgency=low
+
+ * Update watch file
+ * Use upstream build.xml with necessary patches for the build,
+ delete debian/build.xml
+ * Add Build-Depends on libjarjar-java, default-jdk-doc, junit-doc
+ junit4-doc, junit, junit4, libeasymock-java, libjmock-java, testng
+ * Add documentation package containing the javadoc for the package
+
+ -- Ludovic Claude <ludovic.claude at laposte.net> Fri, 28 May 2010 23:34:45 +0200
+
+libhamcrest-java (1.1-6) unstable; urgency=low
+
+ [ Gabriele Giacone ]
+ * Added Maven support.
+ - added poms taken from upstream svn trunk
+ - added d/copyright section for debian/poms
+ - added maven-repo-helper to Build-Depends
+
+ [ Damien Raude-Morvan ]
+ * Upload to unstable
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Fri, 19 Mar 2010 22:42:34 +0100
+
+libhamcrest-java (1.1-5) unstable; urgency=low
+
+ [ Gabriele Giacone ]
+ * Added generation of one class with all static imports (Matchers.class).
+ * Standards-Version to 3.8.4.
+ * Source format 3.0 (quilt).
+ * d/copyright converted to DEP-5 format.
+ * Repackaging info moved from d/copyright to d/README.source
+
+ [ Damien Raude-Morvan ]
+ * Upload to unstable
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sun, 14 Mar 2010 22:18:34 +0100
+
+libhamcrest-java (1.1-4) unstable; urgency=low
+
+ [ Thierry Carrez ]
+ * Set minimal dependency to java5-runtime-headless since we build Java5 code
+
+ [ Damien Raude-Morvan ]
+ * Add myself to Uploaders
+ * Add debian/manifest/*.mf for OSGi metadata (Closes: #558185)
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sun, 29 Nov 2009 01:07:12 +0100
+
+libhamcrest-java (1.1-3) unstable; urgency=low
+
+ * (Build-)Depends on default-jdk.
+ * Build-Depends on debhelper >= 7.
+ * Put package into section 'java'.
+ * Added Depends ${misc:Depends}.
+ * Added myself to Uploaders.
+ * Updated Standards-Version to 3.8.3.
+
+ -- Michael Koch <konqueror at gmx.de> Thu, 24 Sep 2009 08:04:44 +0200
+
+libhamcrest-java (1.1-2) unstable; urgency=low
+
+ * Fix java bytecode / java runtime version mismatch (Closes: #503799)
+
+ -- Varun Hiremath <varun at debian.org> Sat, 01 Nov 2008 03:21:49 -0400
+
+libhamcrest-java (1.1-1) unstable; urgency=low
+
+ * Initial release (Closes: #470523)
+
+ -- Varun Hiremath <varun at debian.org> Tue, 15 Jul 2008 22:24:09 +0530
Deleted: tags/libhamcrest-java/1.3-6/debian/compat
===================================================================
--- trunk/libhamcrest-java/debian/compat 2016-12-18 05:26:42 UTC (rev 19189)
+++ tags/libhamcrest-java/1.3-6/debian/compat 2017-01-07 01:46:29 UTC (rev 19193)
@@ -1 +0,0 @@
-9
Copied: tags/libhamcrest-java/1.3-6/debian/compat (from rev 19190, trunk/libhamcrest-java/debian/compat)
===================================================================
--- tags/libhamcrest-java/1.3-6/debian/compat (rev 0)
+++ tags/libhamcrest-java/1.3-6/debian/compat 2017-01-07 01:46:29 UTC (rev 19193)
@@ -0,0 +1 @@
+10
Deleted: tags/libhamcrest-java/1.3-6/debian/control
===================================================================
--- trunk/libhamcrest-java/debian/control 2016-12-18 05:26:42 UTC (rev 19189)
+++ tags/libhamcrest-java/1.3-6/debian/control 2017-01-07 01:46:29 UTC (rev 19193)
@@ -1,39 +0,0 @@
-Source: libhamcrest-java
-Section: java
-Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Varun Hiremath <varun at debian.org>,
- Damien Raude-Morvan <drazzib at debian.org>,
- Brian Thomason <brian.thomason at gmail.com>,
- Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: cdbs, debhelper (>= 9), ant, ant-optional, default-jdk, maven-repo-helper
-Build-Depends-Indep: libqdox-java, libeasymock-java, libjmock-java, libjarjar-java,
- default-jdk-doc, junit-doc, junit4-doc, junit, junit4
-Standards-Version: 3.9.5
-Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libhamcrest-java
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libhamcrest-java
-Homepage: http://hamcrest.org
-
-Package: libhamcrest-java
-Architecture: all
-Depends: ${misc:Depends}
-Description: library of matchers for building test expressions
- Provides a library of matcher objects (also known as constraints or
- predicates) allowing 'match' rules to be defined declaratively, to be
- used in other frameworks. Typical scenarios include testing
- frameworks, mocking libraries and UI validation rules.
-
-Package: libhamcrest-java-doc
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}
-Recommends: default-jdk-doc, junit-doc, junit4-doc
-Suggests: libhamcrest-java
-Description: library of matchers for building test expressions - documentation
- Provides a library of matcher objects (also known as constraints or
- predicates) allowing 'match' rules to be defined declaratively, to be
- used in other frameworks. Typical scenarios include testing
- frameworks, mocking libraries and UI validation rules.
- .
- This package contains Javadoc API documentation of Hamcrest.
-
Copied: tags/libhamcrest-java/1.3-6/debian/control (from rev 19192, trunk/libhamcrest-java/debian/control)
===================================================================
--- tags/libhamcrest-java/1.3-6/debian/control (rev 0)
+++ tags/libhamcrest-java/1.3-6/debian/control 2017-01-07 01:46:29 UTC (rev 19193)
@@ -0,0 +1,58 @@
+Source: libhamcrest-java
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders:
+ Varun Hiremath <varun at debian.org>,
+ Damien Raude-Morvan <drazzib at debian.org>,
+ Brian Thomason <brian.thomason at gmail.com>,
+ Emmanuel Bourg <ebourg at apache.org>
+Build-Depends:
+ ant,
+ ant-optional,
+ debhelper (>= 10),
+ default-jdk,
+ libhamcrest-java,
+ maven-repo-helper,
+ default-jdk-doc,
+ junit,
+ junit-doc,
+ junit4,
+ junit4-doc,
+ libeasymock-java,
+ libjarjar-java,
+ libjmock-java,
+ libqdox-java
+Standards-Version: 3.9.8
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libhamcrest-java
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-java/trunk/libhamcrest-java
+Homepage: http://hamcrest.org
+
+Package: libhamcrest-java
+Architecture: all
+Depends:
+ ${misc:Depends}
+Description: library of matchers for building test expressions
+ Provides a library of matcher objects (also known as constraints or
+ predicates) allowing 'match' rules to be defined declaratively, to be
+ used in other frameworks. Typical scenarios include testing
+ frameworks, mocking libraries and UI validation rules.
+
+Package: libhamcrest-java-doc
+Architecture: all
+Section: doc
+Depends:
+ ${misc:Depends}
+Recommends:
+ default-jdk-doc,
+ junit-doc,
+ junit4-doc
+Suggests:
+ libhamcrest-java
+Description: library of matchers for building test expressions - documentation
+ Provides a library of matcher objects (also known as constraints or
+ predicates) allowing 'match' rules to be defined declaratively, to be
+ used in other frameworks. Typical scenarios include testing
+ frameworks, mocking libraries and UI validation rules.
+ .
+ This package contains Javadoc API documentation of Hamcrest.
Deleted: tags/libhamcrest-java/1.3-6/debian/copyright
===================================================================
--- trunk/libhamcrest-java/debian/copyright 2016-12-18 05:26:42 UTC (rev 19189)
+++ tags/libhamcrest-java/1.3-6/debian/copyright 2017-01-07 01:46:29 UTC (rev 19193)
@@ -1,39 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Source: http://code.google.com/p/hamcrest/
-
-Files: *
-Copyright: 2000-2006, www.hamcrest.org
-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: 2008, Varun Hiremath <varun at debian.org>
-License: GPL
- On Debian systems, the complete text of the GPL License can be
- found in `/usr/share/common-licenses/GPL'.
Copied: tags/libhamcrest-java/1.3-6/debian/copyright (from rev 19192, trunk/libhamcrest-java/debian/copyright)
===================================================================
--- tags/libhamcrest-java/1.3-6/debian/copyright (rev 0)
+++ tags/libhamcrest-java/1.3-6/debian/copyright 2017-01-07 01:46:29 UTC (rev 19193)
@@ -0,0 +1,39 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: https://github.com/hamcrest/JavaHamcrest
+
+Files: *
+Copyright: 2000-2006, www.hamcrest.org
+License: BSD-3-clause
+ 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: 2008, Varun Hiremath <varun at debian.org>
+License: GPL
+ On Debian systems, the complete text of the GPL License can be
+ found in `/usr/share/common-licenses/GPL'.
Deleted: tags/libhamcrest-java/1.3-6/debian/patches/002-fix-random-compilation-failure.patch
===================================================================
--- trunk/libhamcrest-java/debian/patches/002-fix-random-compilation-failure.patch 2016-12-18 05:26:42 UTC (rev 19189)
+++ tags/libhamcrest-java/1.3-6/debian/patches/002-fix-random-compilation-failure.patch 2017-01-07 01:46:29 UTC (rev 19193)
@@ -1,15 +0,0 @@
-Description: Fixes a random compilation failure
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: yes
-Bug-Debian: https://bugs.debian.org/738789
---- a/build.xml
-+++ b/build.xml
-@@ -36,7 +36,7 @@
- fork="yes"
- failonerror="yes"
- classpath="
-- build/hamcrest-core-${version}.jar;
-+ build/temp/hamcrest-core-${version}.jar.contents;
- build/hamcrest-generator-${version}.jar;
- ">
- <arg value="core-matchers.xml"/>
Copied: tags/libhamcrest-java/1.3-6/debian/patches/002-random-build-failure.patch (from rev 19192, trunk/libhamcrest-java/debian/patches/002-random-build-failure.patch)
===================================================================
--- tags/libhamcrest-java/1.3-6/debian/patches/002-random-build-failure.patch (rev 0)
+++ tags/libhamcrest-java/1.3-6/debian/patches/002-random-build-failure.patch 2017-01-07 01:46:29 UTC (rev 19193)
@@ -0,0 +1,115 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sat, 7 Jan 2017 00:18:56 +0100
+Subject: 002 random build failure
+
+---
+ build.xml | 17 ++++++------
+ .../generator/ReflectiveFactoryReaderTest.java | 32 +---------------------
+ 2 files changed, 10 insertions(+), 39 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index 4f9dc35..ce0c88b 100644
+--- a/build.xml
++++ b/build.xml
+@@ -56,7 +56,7 @@
+ <mkdir dir="build/temp/hamcrest-library/generated-code"/>
+ <java-to-jar srcdir="hamcrest-library/src/main/java"
+ modulename="hamcrest-library"
+- classpath="build/hamcrest-core-${version}.jar"/>
++ classpath="/usr/share/java/hamcrest-core.jar"/>
+ <!-- Generate one class with all static imports -->
+ <java classname="org.hamcrest.generator.config.XmlConfigurator"
+ fork="yes"
+@@ -74,22 +74,22 @@
+ <!-- Append to library jar -->
+ <java-to-jar srcdir="build/temp/hamcrest-library/generated-code"
+ modulename="hamcrest-library"
+- classpath="build/hamcrest-core-${version}.jar"/>
++ classpath="/usr/share/java/hamcrest-core.jar"/>
+ </target>
+
+ <target name="integration" depends="core, library" description="Build integration with external tools">
+ <java-to-jar srcdir="hamcrest-integration/src/main/java"
+ modulename="hamcrest-integration"
+- classpath="build/hamcrest-core-${version}.jar;
+- build/hamcrest-library-${version}.jar"/>
++ classpath="/usr/share/java/hamcrest-core.jar;
++ /usr/share/java/hamcrest-library.jar"/>
+ </target>
+
+ <target name="unit-test" depends="core, library, integration, generator" description="Build and run unit tests.">
+ <java-to-jar srcdir="hamcrest-unit-test/src/main/java" modulename="hamcrest-unit-test"
+- classpath="build/hamcrest-core-${version}.jar;
+- build/hamcrest-library-${version}.jar;
+- build/hamcrest-integration-${version}.jar;
+- build/hamcrest-generator-${version}.jar"/>
++ classpath="/usr/share/java/hamcrest-core.jar;
++ build/hamcrest-library-${version}.jar;
++ build/hamcrest-integration-${version}.jar;
++ build/hamcrest-generator-${version}.jar"/>
+ <junit printsummary="no" fork="no" haltonfailure="${haltonfailure}">
+ <formatter type="brief" usefile="no"/>
+ <classpath>
+@@ -295,6 +295,7 @@
+ <include name="junit4.jar"/>
+ <include name="easymock.jar"/>
+ <include name="jmock.jar"/>
++ <include name="hamcrest-core.jar"/>
+ </fileset>
+ </classpath>
+ </javac>
+diff --git a/hamcrest-unit-test/src/main/java/org/hamcrest/generator/ReflectiveFactoryReaderTest.java b/hamcrest-unit-test/src/main/java/org/hamcrest/generator/ReflectiveFactoryReaderTest.java
+index 5bf6038..d8d195e 100644
+--- a/hamcrest-unit-test/src/main/java/org/hamcrest/generator/ReflectiveFactoryReaderTest.java
++++ b/hamcrest-unit-test/src/main/java/org/hamcrest/generator/ReflectiveFactoryReaderTest.java
+@@ -30,23 +30,6 @@ public class ReflectiveFactoryReaderTest extends TestCase {
+
+ }
+
+- public void testIteratesOverFactoryMethods() {
+- Iterable<FactoryMethod> reader = new ReflectiveFactoryReader(SimpleSetOfMatchers.class);
+- Iterator<FactoryMethod> methods = reader.iterator();
+-
+- assertTrue("Expected first method", methods.hasNext());
+- FactoryMethod firstMethod = methods.next();
+- assertEquals("firstMethod", firstMethod.getName());
+- assertEquals(SimpleSetOfMatchers.class.getName().replace('$', '.'), firstMethod.getMatcherClass());
+-
+- assertTrue("Expected second method", methods.hasNext());
+- FactoryMethod secondMethod = methods.next();
+- assertEquals("secondMethod", secondMethod.getName());
+- assertEquals(SimpleSetOfMatchers.class.getName().replace('$', '.'), secondMethod.getMatcherClass());
+-
+- assertFalse("Expected no more methods", methods.hasNext());
+- }
+-
+ public static class MatchersWithDodgySignatures {
+
+ @Factory
+@@ -79,19 +62,6 @@ public class ReflectiveFactoryReaderTest extends TestCase {
+
+ }
+
+- public void testOnlyReadsPublicStaticAnnotatedMethodsThatReturnNonVoid() {
+- Iterable<FactoryMethod> reader = new ReflectiveFactoryReader(MatchersWithDodgySignatures.class);
+- Iterator<FactoryMethod> methods = reader.iterator();
+-
+- assertTrue("Expected first method", methods.hasNext());
+- assertEquals("goodMethod", methods.next().getName());
+-
+- assertTrue("Expected second method", methods.hasNext());
+- assertEquals("anotherGoodMethod", methods.next().getName());
+-
+- assertFalse("Expected no more methods", methods.hasNext());
+- }
+-
+ public static class GenerifiedMatchers {
+
+ @Factory
+@@ -266,4 +236,4 @@ public class ReflectiveFactoryReaderTest extends TestCase {
+ return null;
+ }
+
+-}
+\ No newline at end of file
++}
Deleted: tags/libhamcrest-java/1.3-6/debian/patches/series
===================================================================
--- trunk/libhamcrest-java/debian/patches/series 2016-12-18 05:26:42 UTC (rev 19189)
+++ tags/libhamcrest-java/1.3-6/debian/patches/series 2017-01-07 01:46:29 UTC (rev 19193)
@@ -1,2 +0,0 @@
-001-build.patch
-002-fix-random-compilation-failure.patch
Copied: tags/libhamcrest-java/1.3-6/debian/patches/series (from rev 19192, trunk/libhamcrest-java/debian/patches/series)
===================================================================
--- tags/libhamcrest-java/1.3-6/debian/patches/series (rev 0)
+++ tags/libhamcrest-java/1.3-6/debian/patches/series 2017-01-07 01:46:29 UTC (rev 19193)
@@ -0,0 +1,2 @@
+001-build.patch
+002-random-build-failure.patch
Deleted: tags/libhamcrest-java/1.3-6/debian/rules
===================================================================
--- trunk/libhamcrest-java/debian/rules 2016-12-18 05:26:42 UTC (rev 19189)
+++ tags/libhamcrest-java/1.3-6/debian/rules 2017-01-07 01:46:29 UTC (rev 19193)
@@ -1,45 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_ANT_BUILDFILE := build.xml
-DEB_ANT_BUILD_TARGET := bigjar unit-test javadoc
-DEB_JARS := easymock jmock qdox ant-junit
-ANT_OPTS := -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 -Dversion=$(DEB_UPSTREAM_VERSION)
-POMS := core generator integration library all
-
-DEST_DIR = $(DEB_DESTDIR)/usr/share/java
-
-binary-post-install/libhamcrest-java::
- # Add OSGi-metadata to the manifests.
- # This is needed for eclipse.
- for manifest in debian/manifest/*.mf ; do \
- base=`basename $$manifest .mf` ; \
- f=`ls build/hamcrest-$$base-$(DEB_UPSTREAM_VERSION).jar` ; \
- if [ -n "$$f" ]; then \
- echo `basename "$$f"` "[ok]" ; \
- jar umf $$manifest $$f ; \
- else \
- echo "No file like 'build/hamcrest-$$base-$(DEB_UPSTREAM_VERSION).jar' existing." ; \
- fi ; \
- done
- for pom in $(POMS); do \
- pomfile=hamcrest-$$pom-$(DEB_UPSTREAM_VERSION).pom; \
- mh_installpom -o -e$(DEB_UPSTREAM_VERSION) \
- -plibhamcrest-java $$pomfile; \
- mh_installjar -l -e$(DEB_UPSTREAM_VERSION) -j$(DEB_UPSTREAM_VERSION) \
- -plibhamcrest-java $$pomfile build/hamcrest-$$pom-$(DEB_UPSTREAM_VERSION).jar; \
- done
-
- dh_install -plibhamcrest-java build/hamcrest-unit-test-$(DEB_UPSTREAM_VERSION).jar usr/share/java
- dh_link -plibhamcrest-java usr/share/java/hamcrest-unit-test-$(DEB_UPSTREAM_VERSION).jar usr/share/java/hamcrest-unit-test.jar
-
-clean::
- rm -fr debian/.mh/
- rm -f *.jar
- mkdir -p lib/integration
-
-get-orig-source:
- -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --debug --rename
Copied: tags/libhamcrest-java/1.3-6/debian/rules (from rev 19192, trunk/libhamcrest-java/debian/rules)
===================================================================
--- tags/libhamcrest-java/1.3-6/debian/rules (rev 0)
+++ tags/libhamcrest-java/1.3-6/debian/rules 2017-01-07 01:46:29 UTC (rev 19193)
@@ -0,0 +1,53 @@
+#!/usr/bin/make -f
+
+export JAVA_HOME := /usr/lib/jvm/default-java
+export CLASSPATH := /usr/share/java/easymock.jar:/usr/share/java/jmock.jar:/usr/share/java/qdox.jar:/usr/share/java/ant-junit.jar:/usr/share/java/junit4.jar
+DEB_UPSTREAM_VERSION := 1.3
+DEB_ANT_BUILD_TARGET := bigjar unit-test javadoc
+ANT_OPTS := -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 -Dversion=$(DEB_UPSTREAM_VERSION)
+POMS := core generator integration library all
+
+%:
+ dh $@ --with maven-repo-helper
+
+override_dh_auto_build:
+ ant $(ANT_OPTS) $(DEB_ANT_BUILD_TARGET)
+
+override_dh_install:
+ # Add OSGi-metadata to the manifests.
+ # This is needed for eclipse.
+ for manifest in debian/manifest/*.mf ; do \
+ base=`basename $$manifest .mf` ; \
+ f=`ls build/hamcrest-$$base-$(DEB_UPSTREAM_VERSION).jar` ; \
+ if [ -n "$$f" ]; then \
+ echo `basename "$$f"` "[ok]" ; \
+ jar umf $$manifest $$f ; \
+ else \
+ echo "No file like 'build/hamcrest-$$base-$(DEB_UPSTREAM_VERSION).jar' existing." ; \
+ fi ; \
+ done
+ for pom in $(POMS); do \
+ pomfile=hamcrest-$$pom-$(DEB_UPSTREAM_VERSION).pom; \
+ mh_installpom -o -e$(DEB_UPSTREAM_VERSION) \
+ -plibhamcrest-java $$pomfile; \
+ mh_installjar -l -e$(DEB_UPSTREAM_VERSION) -j$(DEB_UPSTREAM_VERSION) \
+ -plibhamcrest-java $$pomfile build/hamcrest-$$pom-$(DEB_UPSTREAM_VERSION).jar; \
+ done
+ dh_install -plibhamcrest-java build/hamcrest-unit-test-$(DEB_UPSTREAM_VERSION).jar usr/share/java
+ dh_install
+
+override_dh_link:
+ dh_link
+ dh_link -plibhamcrest-java usr/share/java/hamcrest-unit-test-$(DEB_UPSTREAM_VERSION).jar usr/share/java/hamcrest-unit-test.jar
+
+override_dh_auto_clean:
+ ant clean
+
+override_dh_clean:
+ dh_clean
+ rm -fr debian/.mh/
+ find . -name "*.jar" -delete
+ mkdir -p lib/integration
+
+get-orig-source:
+ -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --debug --rename
Deleted: tags/libhamcrest-java/1.3-6/debian/watch
===================================================================
--- trunk/libhamcrest-java/debian/watch 2016-12-18 05:26:42 UTC (rev 19189)
+++ tags/libhamcrest-java/1.3-6/debian/watch 2017-01-07 01:46:29 UTC (rev 19193)
@@ -1,3 +0,0 @@
-version=3
-opts="downloadurlmangle=s|.*(hamcrest-.*\.tgz).*|http://hamcrest.googlecode.com/files/$1|,filenamemangle=s/.*=(.*)/$1/" \
- http://code.google.com/p/hamcrest/downloads/list .*?name=hamcrest-([\d\.]+).tgz&.* debian debian/orig-tar.sh
Copied: tags/libhamcrest-java/1.3-6/debian/watch (from rev 19190, trunk/libhamcrest-java/debian/watch)
===================================================================
--- tags/libhamcrest-java/1.3-6/debian/watch (rev 0)
+++ tags/libhamcrest-java/1.3-6/debian/watch 2017-01-07 01:46:29 UTC (rev 19193)
@@ -0,0 +1,5 @@
+version=4
+opts=dversionmangle=s/(\da?)[\+\.\-~](?:dfsg|debian|ds|repack|repacked)\.?\d*$/$1/,\
+uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*)$/$1~$2/ \
+https://github.com/hamcrest/JavaHamcrest/tags \
+.*/archive/(?:upstream/)?(?:v||version-|release-|X|R|r)hamcrest-java-(\d\S*)\.tar\.gz
More information about the pkg-java-commits
mailing list