[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:06 UTC 2012


The following commit has been merged in the master branch:
commit e4ebfb78450a60a8cdbcf05ac9fd338f3021a109
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Fri Jul 6 18:20:56 2012 +0200

    Use Require-Bundle with visibility:=reexport for svnclientadapter
    
    Changing to this from Import-Package allows to leave revision graph bundle manifest unchanged

diff --git a/debian/patches/use-distribution-svnclient.patch b/debian/patches/use-distribution-svnclient.patch
index 44c5f37..2fbb315 100644
--- a/debian/patches/use-distribution-svnclient.patch
+++ b/debian/patches/use-distribution-svnclient.patch
@@ -6,9 +6,8 @@ Subject: use-distribution-svnclient package
  org.tigris.subversion.clientadapter.feature/feature.xml  |   14 ++++++++++++++
  .../META-INF/MANIFEST.MF                                 |    5 ++---
  org.tigris.subversion.clientadapter/META-INF/MANIFEST.MF |    7 +++----
- .../META-INF/MANIFEST.MF                                 |    2 ++
- org.tigris.subversion.subclipse.ui/META-INF/MANIFEST.MF  |    2 ++
- 5 files changed, 23 insertions(+), 7 deletions(-)
+ .../META-INF/MANIFEST.MF                                 |    3 ++-
+ 4 files changed, 21 insertions(+), 8 deletions(-)
 
 diff --git a/org.tigris.subversion.clientadapter.feature/feature.xml b/org.tigris.subversion.clientadapter.feature/feature.xml
 index 2a46e02..a185acc 100644
@@ -66,24 +65,16 @@ index b1f33b4..6dd2cf8 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 3acff45..1d1ec57 100644
+index 3acff45..8c6cd24 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,
-  org.tigris.subversion.subclipse.core.status,
-  org.tigris.subversion.subclipse.core.sync,
-  org.tigris.subversion.subclipse.core.util
-+Import-Package: org.tigris.subversion.svnclientadapter,
-+ org.tigris.subversion.svnclientadapter.utils
- 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 a2ca028..30adf31 100644
---- a/org.tigris.subversion.subclipse.ui/META-INF/MANIFEST.MF
-+++ b/org.tigris.subversion.subclipse.ui/META-INF/MANIFEST.MF
-@@ -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.5
+@@ -10,7 +10,8 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="3.2.0",
+  org.eclipse.team.core;bundle-version="3.2.0",
+  org.eclipse.core.runtime;bundle-version="3.2.0",
+  org.eclipse.osgi,
+- org.tigris.subversion.clientadapter;bundle-version="[1.8.0,1.9.0)";visibility:=reexport
++ org.tigris.subversion.clientadapter;bundle-version="[1.8.0,1.9.0)";visibility:=reexport,
++ org.tigris.subversion.svnclientadapter;visibility:=reexport
+ Eclipse-LazyStart: true
+ Export-Package: org.tigris.subversion.subclipse.core,
+  org.tigris.subversion.subclipse.core.client,

-- 
eclipse-subclipse packaging



More information about the pkg-java-commits mailing list