[bnd] 02/22: Use patch extension instead of diff

Markus Koschany apo-guest at moszumanska.debian.org
Sat May 16 22:35:36 UTC 2015 

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

apo-guest pushed a commit to branch experimental
in repository bnd.

commit 0d5a702ffcad554438c0d6bd43fd28ca1b721481
Author: Markus Koschany <apo at gambaru.de>
Date:   Thu May 14 13:17:56 2015 +0200

    Use patch extension instead of diff
---
 .../{build_excludes.diff => build_excludes.patch}  | 16 ++++++++++------
 ...le.diff => display_bsn_on_missing_bundle.patch} | 22 ++++++++++------------
 .../{fix-encoding.diff => fix-encoding.patch}      | 14 +++++++++++---
 .../{no_ee_minimum.diff => no_ee_minimum.patch}    | 15 ++++++++++-----
 debian/patches/{no_felix.diff => no_felix.patch}   | 16 +++++++++-------
 ...during_build.diff => no_git_during_build.patch} | 16 +++++++++-------
 debian/patches/series                              | 12 ++++++------
 7 files changed, 65 insertions(+), 46 deletions(-)

diff --git a/debian/patches/build_excludes.diff b/debian/patches/build_excludes.patch
similarity index 79%
rename from debian/patches/build_excludes.diff
rename to debian/patches/build_excludes.patch
index 31a3483..20b1798 100644
--- a/debian/patches/build_excludes.diff
+++ b/debian/patches/build_excludes.patch
@@ -1,10 +1,14 @@
-Description: Add a way to exclude some source file from build using
- javac.excludes property (used in debian/ant.properties)
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2011-10-26
-Forwarded: no
-Index: b/cnf/build.xml
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Thu, 14 May 2015 13:17:37 +0200
+Subject: build_excludes
+
 ===================================================================
+---
+ cnf/build.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cnf/build.xml b/cnf/build.xml
+index 87d9b4e..9bca47d 100644
 --- a/cnf/build.xml
 +++ b/cnf/build.xml
 @@ -75,7 +75,7 @@
diff --git a/debian/patches/display_bsn_on_missing_bundle.diff b/debian/patches/display_bsn_on_missing_bundle.patch
similarity index 51%
rename from debian/patches/display_bsn_on_missing_bundle.diff
rename to debian/patches/display_bsn_on_missing_bundle.patch
index 8ca3230..a48c130 100644
--- a/debian/patches/display_bsn_on_missing_bundle.diff
+++ b/debian/patches/display_bsn_on_missing_bundle.patch
@@ -1,7 +1,13 @@
-Description: Add a print to System.err when some bundle
- is missing (will improve diagnostic when some symlink is broken).
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2012-01-17
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Thu, 14 May 2015 13:17:37 +0200
+Subject: display_bsn_on_missing_bundle
+
+---
+ biz.aQute.bndlib/src/aQute/bnd/build/Project.java | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/biz.aQute.bndlib/src/aQute/bnd/build/Project.java b/biz.aQute.bndlib/src/aQute/bnd/build/Project.java
+index 954da2e..8725b4a 100644
 --- a/biz.aQute.bndlib/src/aQute/bnd/build/Project.java
 +++ b/biz.aQute.bndlib/src/aQute/bnd/build/Project.java
 @@ -878,8 +878,11 @@ public class Project extends Processor {
@@ -17,11 +23,3 @@ Last-Update: 2012-01-17
  					}
  				}
  			}
-On branch master
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git checkout -- <file>..." to discard changes in working directory)
-
-	modified:   biz.aQute.bndlib/src/aQute/bnd/osgi/Analyzer.java
-
-no changes added to commit (use "git add" and/or "git commit -a")
diff --git a/debian/patches/fix-encoding.diff b/debian/patches/fix-encoding.patch
similarity index 77%
rename from debian/patches/fix-encoding.diff
rename to debian/patches/fix-encoding.patch
index 35d0f25..374d101 100644
--- a/debian/patches/fix-encoding.diff
+++ b/debian/patches/fix-encoding.patch
@@ -1,8 +1,16 @@
-Description: Set the encoding of the source file to avoid compilation warnings/errors
-Author: Emmanuel Bourg <ebourg at apache.org>
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Thu, 14 May 2015 13:17:37 +0200
+Subject: fix-encoding
+
+---
+ cnf/build.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cnf/build.xml b/cnf/build.xml
+index 9bca47d..44d9552 100644
 --- a/cnf/build.xml
 +++ b/cnf/build.xml
-@@ -49,7 +49,7 @@
+@@ -75,7 +75,7 @@
  	-->
  	<target name="compile" depends="dependencies" if="project.sourcepath">
  		<mkdir dir="${project.output}" />
diff --git a/debian/patches/no_ee_minimum.diff b/debian/patches/no_ee_minimum.patch
similarity index 81%
rename from debian/patches/no_ee_minimum.diff
rename to debian/patches/no_ee_minimum.patch
index 0d21c0b..35d4ba5 100644
--- a/debian/patches/no_ee_minimum.diff
+++ b/debian/patches/no_ee_minimum.patch
@@ -1,8 +1,13 @@
-Description: Don't request ee.minimum since we have a full
- blown JVM.
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2011-10-26
-Forwarded: no
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Thu, 14 May 2015 13:17:37 +0200
+Subject: no_ee_minimum
+
+---
+ biz.aQute.bndlib/bnd.bnd | 1 -
+ biz.aQute.junit/bnd.bnd  | 3 +--
+ demo/bnd.bnd             | 4 +---
+ 3 files changed, 2 insertions(+), 6 deletions(-)
+
 diff --git a/biz.aQute.bndlib/bnd.bnd b/biz.aQute.bndlib/bnd.bnd
 index e583927..49d247f 100644
 --- a/biz.aQute.bndlib/bnd.bnd
diff --git a/debian/patches/no_felix.diff b/debian/patches/no_felix.patch
similarity index 52%
rename from debian/patches/no_felix.diff
rename to debian/patches/no_felix.patch
index 9acca81..fb7d2f1 100644
--- a/debian/patches/no_felix.diff
+++ b/debian/patches/no_felix.patch
@@ -1,11 +1,13 @@
-Description: Don't depends on felix for runtime
- to break dependencies-cycles.
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2011-11-09
-Forwarded: no
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Thu, 14 May 2015 13:17:37 +0200
+Subject: no_felix
 
-Index: b/demo/bnd.bnd
-===================================================================
+---
+ demo/bnd.bnd | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/demo/bnd.bnd b/demo/bnd.bnd
+index 9819530..83aae12 100644
 --- a/demo/bnd.bnd
 +++ b/demo/bnd.bnd
 @@ -13,9 +13,6 @@ Bundle-SymbolicName: demo
diff --git a/debian/patches/no_git_during_build.diff b/debian/patches/no_git_during_build.patch
similarity index 55%
rename from debian/patches/no_git_during_build.diff
rename to debian/patches/no_git_during_build.patch
index d57528d..d7cb36b 100644
--- a/debian/patches/no_git_during_build.diff
+++ b/debian/patches/no_git_during_build.patch
@@ -1,11 +1,13 @@
-Description: Don't embed Git SHASUM in build MANIFEST.MF
- since our tarball doesn't contains git metadata.
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2011-11-09
-Forwarded: no
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Thu, 14 May 2015 13:17:37 +0200
+Subject: no_git_during_build
 
-Index: b/cnf/build.bnd
-===================================================================
+---
+ cnf/build.bnd | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cnf/build.bnd b/cnf/build.bnd
+index 79189ef..7140407 100644
 --- a/cnf/build.bnd
 +++ b/cnf/build.bnd
 @@ -1,6 +1,6 @@
diff --git a/debian/patches/series b/debian/patches/series
index 1f54f41..1622a7f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,6 @@
-build_excludes.diff
-no_ee_minimum.diff
-no_felix.diff
-no_git_during_build.diff
-display_bsn_on_missing_bundle.diff
-fix-encoding.diff
+build_excludes.patch
+no_ee_minimum.patch
+no_felix.patch
+no_git_during_build.patch
+display_bsn_on_missing_bundle.patch
+fix-encoding.patch

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

More information about the pkg-java-commits mailing list