[jruby-joni] 193/194: drop merged upstream patch

[Hideki Yamane]

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

henrich pushed a commit to branch debian/sid
in repository jruby-joni.

commit 2c00a097e2d7e3ecbc14c3819ad1b172d57ece75
Author: Hideki Yamane <henrich at debian.org>
Date:   Thu Feb 1 21:01:31 2018 +0900

    drop merged upstream patch
---
 debian/changelog                                   |  2 ++
 ...-remove-build-time-for-reproducible-build.patch | 24 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 97765e8..d85d15c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 jruby-joni (2.1.14-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * debian/patches
+    - drop 0002-remove-build-time-for-reproducible-build.patch: merged upstream
 
  -- Hideki Yamane <henrich at debian.org>  Thu, 01 Feb 2018 20:59:05 +0900
 
diff --git a/debian/patches/0002-remove-build-time-for-reproducible-build.patch b/debian/patches/0002-remove-build-time-for-reproducible-build.patch
deleted file mode 100644
index 40b31b8..0000000
--- a/debian/patches/0002-remove-build-time-for-reproducible-build.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Hideki Yamane <henrich at debian.org>
-Date: Sat, 6 Jun 2015 13:05:46 +0900
-Subject: remove build time for reproducible build
-
----
- build.xml | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/build.xml b/build.xml
-index b06feb8..030ee15 100644
---- a/build.xml
-+++ b/build.xml
-@@ -25,11 +25,6 @@
-     <target name="build" depends="compile">
-         <mkdir dir="${dist.dir}" />
- 
--        <tstamp>
--            <format property="buildDate" pattern="yyyy-MM-dd" />
--            <format property="buildTime" pattern="HH:mm:ss" />
--        </tstamp>
--
-         <jar destfile="${dist.dir}/${jar.name}" manifest="MANIFEST.MF">
-             <fileset dir="${bin.dir}" />
- 
diff --git a/debian/patches/series b/debian/patches/series
index 1a8aed7..2ef48f2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 build.xml-jcoding.patch
-0002-remove-build-time-for-reproducible-build.patch
 0003-add-class-path-for-jcodings.patch

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