[SCM] eclipse-subclipse packaging branch, master, updated. upstream/1.8.16-22-g33401db

Jakub Adam jakub.adam at ktknet.cz
Fri Oct 12 22:13:05 UTC 2012 

The following commit has been merged in the master branch:
commit 73ce2bee14cac80760d991d307e042ff79160982
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sun Jun 17 22:16:32 2012 +0200

    Refreshed d/patches

diff --git a/debian/patches/use-distribution-javahl.patch b/debian/patches/use-distribution-javahl.patch
index 000231d..37980e8 100644
--- a/debian/patches/use-distribution-javahl.patch
+++ b/debian/patches/use-distribution-javahl.patch
@@ -3,12 +3,12 @@ Date: Tue, 4 Oct 2011 23:30:53 +0200
 Subject: use-distribution-javahl
 
 ---
- .../feature.xml                                    |    9 ++++++++-
- .../META-INF/MANIFEST.MF                           |    5 ++---
- 2 files changed, 10 insertions(+), 4 deletions(-)
+ org.tigris.subversion.clientadapter.feature/feature.xml       |    9 ++++++++-
+ .../META-INF/MANIFEST.MF                                      |    6 ++----
+ 2 files changed, 10 insertions(+), 5 deletions(-)
 
 diff --git a/org.tigris.subversion.clientadapter.feature/feature.xml b/org.tigris.subversion.clientadapter.feature/feature.xml
-index 47cff1c..c8f9446 100644
+index 7eb6b78..e4f8e75 100644
 --- a/org.tigris.subversion.clientadapter.feature/feature.xml
 +++ b/org.tigris.subversion.clientadapter.feature/feature.xml
 @@ -28,7 +28,7 @@
@@ -33,18 +33,18 @@ index 47cff1c..c8f9446 100644
 +
  </feature>
 diff --git a/org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF b/org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF
-index e5ebf52..6615f9f 100644
+index be8a795..d30e769 100644
 --- a/org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF
 +++ b/org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF
-@@ -6,8 +6,7 @@ Bundle-Version: 1.6.17
+@@ -6,9 +6,7 @@ Bundle-Version: 1.7.5.1
  Bundle-Activator: org.tigris.subversion.clientadapter.javahl.Activator
  Bundle-Vendor: tigris.org
  Require-Bundle: org.eclipse.core.runtime,
-- org.tigris.subversion.clientadapter;bundle-version="[1.6.12,1.7.0)"
-+ org.tigris.subversion.clientadapter;bundle-version="[1.6.12,1.7.0)",
+- org.tigris.subversion.clientadapter;bundle-version="[1.8.1,1.9.0)"
++ org.tigris.subversion.clientadapter;bundle-version="[1.8.1,1.9.0)",
 + org.tigris.subversion.svnclientadapter
  Eclipse-LazyStart: true
--Import-Package: org.tigris.subversion.svnclientadapter,
+-Import-Package: org.tigris.subversion.clientadapter,
+- org.tigris.subversion.svnclientadapter,
 - org.tigris.subversion.svnclientadapter.javahl
- Bundle-RequiredExecutionEnvironment: J2SE-1.4
--- 
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/debian/patches/use-distribution-svnclient.patch b/debian/patches/use-distribution-svnclient.patch
index 689a217..1c0536e 100644
--- a/debian/patches/use-distribution-svnclient.patch
+++ b/debian/patches/use-distribution-svnclient.patch
@@ -1,18 +1,17 @@
 From: Jakub Adam <jakub.adam at ktknet.cz>
 Date: Tue, 4 Oct 2011 23:33:13 +0200
-Subject: use-distribution-svnclient
- package
+Subject: use-distribution-svnclient package
 
 ---
- .../feature.xml                                    |    7 +++++++
- .../META-INF/MANIFEST.MF                           |    2 +-
- .../META-INF/MANIFEST.MF                           |    7 +++----
- .../META-INF/MANIFEST.MF                           |    2 ++
- .../META-INF/MANIFEST.MF                           |    2 ++
- 5 files changed, 15 insertions(+), 5 deletions(-)
+ org.tigris.subversion.clientadapter.feature/feature.xml         |    7 +++++++
+ org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF |    5 ++---
+ org.tigris.subversion.clientadapter/META-INF/MANIFEST.MF        |    7 +++----
+ org.tigris.subversion.subclipse.core/META-INF/MANIFEST.MF       |    2 ++
+ org.tigris.subversion.subclipse.ui/META-INF/MANIFEST.MF         |    2 ++
+ 5 files changed, 16 insertions(+), 7 deletions(-)
 
 diff --git a/org.tigris.subversion.clientadapter.feature/feature.xml b/org.tigris.subversion.clientadapter.feature/feature.xml
-index 17bd78a..47cff1c 100644
+index 2a46e02..7eb6b78 100644
 --- a/org.tigris.subversion.clientadapter.feature/feature.xml
 +++ b/org.tigris.subversion.clientadapter.feature/feature.xml
 @@ -34,4 +34,11 @@
@@ -28,23 +27,26 @@ index 17bd78a..47cff1c 100644
 +
  </feature>
 diff --git a/org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF b/org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF
-index 2886068..e5ebf52 100644
+index ed49560..be8a795 100644
 --- a/org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF
 +++ b/org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF
-@@ -8,6 +8,6 @@ Bundle-Vendor: tigris.org
+@@ -8,8 +8,7 @@ Bundle-Vendor: tigris.org
  Require-Bundle: org.eclipse.core.runtime,
-  org.tigris.subversion.clientadapter;bundle-version="[1.6.12,1.7.0)"
+  org.tigris.subversion.clientadapter;bundle-version="[1.8.1,1.9.0)"
  Eclipse-LazyStart: true
--Export-Package: org.tigris.subversion.javahl,
-+Import-Package: org.tigris.subversion.svnclientadapter,
+-Export-Package: org.apache.subversion.javahl,
+- org.apache.subversion.javahl.callback,
+- org.tigris.subversion.clientadapter.javahl,
++Import-Package: org.tigris.subversion.clientadapter,
++ org.tigris.subversion.svnclientadapter,
   org.tigris.subversion.svnclientadapter.javahl
- Bundle-RequiredExecutionEnvironment: J2SE-1.4
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 diff --git a/org.tigris.subversion.clientadapter/META-INF/MANIFEST.MF b/org.tigris.subversion.clientadapter/META-INF/MANIFEST.MF
-index 2bcb8ad..316f120 100644
+index b1f33b4..6dd2cf8 100644
 --- a/org.tigris.subversion.clientadapter/META-INF/MANIFEST.MF
 +++ b/org.tigris.subversion.clientadapter/META-INF/MANIFEST.MF
 @@ -5,9 +5,8 @@ Bundle-SymbolicName: org.tigris.subversion.clientadapter;singleton:=true
- Bundle-Version: 1.6.12
+ Bundle-Version: 1.8.3
  Bundle-Activator: org.tigris.subversion.clientadapter.Activator
  Bundle-Vendor: tigris.org
 -Require-Bundle: org.eclipse.core.runtime
@@ -57,7 +59,7 @@ index 2bcb8ad..316f120 100644
 +Export-Package: org.tigris.subversion.clientadapter
  Bundle-RequiredExecutionEnvironment: J2SE-1.4
 diff --git a/org.tigris.subversion.subclipse.core/META-INF/MANIFEST.MF b/org.tigris.subversion.subclipse.core/META-INF/MANIFEST.MF
-index 32475b7..610c343 100644
+index efcbd8e..bff2ef5 100644
 --- a/org.tigris.subversion.subclipse.core/META-INF/MANIFEST.MF
 +++ b/org.tigris.subversion.subclipse.core/META-INF/MANIFEST.MF
 @@ -25,4 +25,6 @@ Export-Package: org.tigris.subversion.subclipse.core,
@@ -66,16 +68,15 @@ index 32475b7..610c343 100644
   org.tigris.subversion.subclipse.core.util
 +Import-Package: org.tigris.subversion.svnclientadapter,
 + org.tigris.subversion.svnclientadapter.utils
- Bundle-RequiredExecutionEnvironment: J2SE-1.4
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 diff --git a/org.tigris.subversion.subclipse.ui/META-INF/MANIFEST.MF b/org.tigris.subversion.subclipse.ui/META-INF/MANIFEST.MF
-index 10fea50..9b73b2e 100644
+index a0a5d08..dc6990f 100644
 --- a/org.tigris.subversion.subclipse.ui/META-INF/MANIFEST.MF
 +++ b/org.tigris.subversion.subclipse.ui/META-INF/MANIFEST.MF
-@@ -54,4 +54,6 @@ Export-Package: org.tigris.subversion.subclipse.ui,
+@@ -55,4 +55,6 @@ Export-Package: org.tigris.subversion.subclipse.ui,
   org.tigris.subversion.subclipse.ui.wizards.dialogs,
   org.tigris.subversion.subclipse.ui.wizards.generatediff,
   org.tigris.subversion.subclipse.ui.wizards.sharing
 +Import-Package: org.tigris.subversion.svnclientadapter,
 + org.tigris.subversion.svnclientadapter.utils
- Bundle-RequiredExecutionEnvironment: J2SE-1.4
--- 
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5

-- 
eclipse-subclipse packaging

More information about the pkg-java-commits mailing list