[jasypt] 06/09: Removed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed May 18 10:36:10 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository jasypt.
commit d3dd19efc86e5d4b559e0ebcc0469f2fd5864059
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed May 18 12:08:15 2016 +0200
Removed the patches
---
debian/changelog | 4 +++-
debian/patches/exclude_some_components.diff | 24 ------------------------
debian/patches/icu.diff | 17 -----------------
debian/patches/series | 2 --
4 files changed, 3 insertions(+), 44 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 04869f4..bb88c94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-jasypt (1.8-4) UNRELEASED; urgency=medium
+jasypt (1.9.2-1) UNRELEASED; urgency=medium
* Team upload.
+ * New upstream release
+ - Removed the patches
* Build with the DH sequencer instead of CDBS
* Standards-Version updated to 3.9.8 (no changes)
* Use a secure Vcs-Git URL
diff --git a/debian/patches/exclude_some_components.diff b/debian/patches/exclude_some_components.diff
deleted file mode 100644
index 45b8621..0000000
--- a/debian/patches/exclude_some_components.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Exclude some packages from build
- as their dependencies are not in Debian :
- - org/jasypt/spring/security/
- - org/jasypt/spring/security2/
- - org/jasypt/spring/security3/
- - org/jasypt/wicket/
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2011-06-19
-Forwarded: not-needed
---- a/pom.xml
-+++ b/pom.xml
-@@ -115,6 +115,12 @@
- <configuration>
- <source>1.4</source>
- <target>1.4</target>
-+<excludes>
-+ <exclude>**/org/jasypt/spring/security/*</exclude>
-+ <exclude>**/org/jasypt/spring/security2/*</exclude>
-+ <exclude>**/org/jasypt/spring/security3/*</exclude>
-+ <exclude>**/org/jasypt/wicket/*</exclude>
-+</excludes>
- </configuration>
- </plugin>
-
diff --git a/debian/patches/icu.diff b/debian/patches/icu.diff
deleted file mode 100644
index 03cfdfc..0000000
--- a/debian/patches/icu.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Use system installed icu (with Maven systemPath)
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2011-06-19
-Forwarded: not-needed
---- a/pom.xml
-+++ b/pom.xml
-@@ -226,8 +226,9 @@
- <groupId>com.ibm.icu</groupId>
- <artifactId>icu4j</artifactId>
- <version>3.4.4</version>
-- <scope>provided</scope>
-+ <scope>system</scope>
- <optional>true</optional>
-+ <systemPath>/usr/share/java/icu4j.jar</systemPath>
- </dependency>
-
- <dependency>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 8df6045..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-exclude_some_components.diff
-icu.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jasypt.git
More information about the pkg-java-commits
mailing list