[Git][java-team/lucene4.10][master] 3 commits: Adapt patches for hamcrest version 2.2

[Jochen Sprickerhof (@jspricke)]

Jochen Sprickerhof pushed to branch master at Debian Java Maintainers / lucene4.10


Commits:
d3064fe8 by David Prévot at 2023-01-29T11:38:52+01:00
Adapt patches for hamcrest version 2.2

Closes: #1022325

- - - - -
363070e3 by David Prévot at 2023-01-29T11:39:08+01:00
Update changelog for 4.10.4+dfsg-7.1 release

- - - - -
b20b4148 by Jochen Sprickerhof at 2025-11-27T09:38:10+00:00
Merge branch 'master' into 'master'

Adapt patches for hamcrest version 2.2

See merge request java-team/lucene4.10!3
- - - - -


3 changed files:

- debian/changelog
- debian/patches/0007-missing-hamcrest-dependency.patch
- debian/patches/carrotsearch-juni4-ant.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+lucene4.10 (4.10.4+dfsg-7.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Adapt patches for hamcrest version 2.2 (Closes: #1022325)
+
+ -- David Prévot <taffit at debian.org>  Sun, 29 Jan 2023 11:36:35 +0100
+
 lucene4.10 (4.10.4+dfsg-7) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/0007-missing-hamcrest-dependency.patch
=====================================
@@ -8,7 +8,7 @@ Bug-Debian: https://bugs.debian.org/822843
      <dependency org="org.apache.ant" name="ant" rev="${/org.apache.ant/ant}" conf="compile"/>
  
      <dependency org="junit" name="junit" rev="${/junit/junit}" conf="compile,junit4-stdalone"/>
-+    <dependency org="org.hamcrest" name="hamcrest-core" rev="debian" conf="compile,junit4-stdalone"/>
++    <dependency org="org.hamcrest" name="hamcrest" rev="debian" conf="compile,junit4-stdalone"/>
      <dependency org="com.carrotsearch.randomizedtesting" name="junit4-ant" rev="${/com.carrotsearch.randomizedtesting/junit4-ant}" conf="compile,junit4-stdalone"/>
      <dependency org="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner" rev="${/com.carrotsearch.randomizedtesting/randomizedtesting-runner}" conf="compile,junit4-stdalone"/>
  


=====================================
debian/patches/carrotsearch-juni4-ant.patch
=====================================
@@ -15,7 +15,7 @@ index 7390a0a..ace6359 100644
 @@ -33,7 +33,6 @@
  
      <dependency org="junit" name="junit" rev="${/junit/junit}" conf="compile,junit4-stdalone"/>
-     <dependency org="org.hamcrest" name="hamcrest-core" rev="debian" conf="compile,junit4-stdalone"/>
+     <dependency org="org.hamcrest" name="hamcrest" rev="debian" conf="compile,junit4-stdalone"/>
 -    <dependency org="com.carrotsearch.randomizedtesting" name="junit4-ant" rev="${/com.carrotsearch.randomizedtesting/junit4-ant}" conf="compile,junit4-stdalone"/>
      <dependency org="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner" rev="${/com.carrotsearch.randomizedtesting/randomizedtesting-runner}" conf="compile,junit4-stdalone"/>
  



View it on GitLab: https://salsa.debian.org/java-team/lucene4.10/-/compare/4172f60739c597714060397c81f437de7d87ba11...b20b4148bea76b3a46db9fb1bd8f423816c2c882

-- 
View it on GitLab: https://salsa.debian.org/java-team/lucene4.10/-/compare/4172f60739c597714060397c81f437de7d87ba11...b20b4148bea76b3a46db9fb1bd8f423816c2c882
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20251127/ebc83110/attachment.htm>