[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 25c059c4aa91017bcc3f75b4cae0234fb7195cbc
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Fri Jul 6 17:10:50 2012 +0200

    Update d/patches for new release

diff --git a/debian/patches/disable-usage-tracking-tool.patch b/debian/patches/disable-usage-tracking-tool.patch
index 909b5d0..55c3e01 100644
--- a/debian/patches/disable-usage-tracking-tool.patch
+++ b/debian/patches/disable-usage-tracking-tool.patch
@@ -3,14 +3,14 @@ Date: Thu, 6 Oct 2011 20:19:34 +0200
 Subject: disable-usage-tracking-tool
 
 ---
- .../feature.xml                                    |    8 --------
- 1 files changed, 0 insertions(+), 8 deletions(-)
+ org.tigris.subversion.subclipse.feature/feature.xml |    8 --------
+ 1 file changed, 8 deletions(-)
 
 diff --git a/org.tigris.subversion.subclipse.feature/feature.xml b/org.tigris.subversion.subclipse.feature/feature.xml
-index 6f57aef..8c53321 100644
+index 5e2c844..e387884 100644
 --- a/org.tigris.subversion.subclipse.feature/feature.xml
 +++ b/org.tigris.subversion.subclipse.feature/feature.xml
-@@ -62,12 +62,4 @@
+@@ -63,12 +63,4 @@
           install-size="0"
           version="0.0.0"
           unpack="false"/>
@@ -23,4 +23,3 @@ index 6f57aef..8c53321 100644
 -         unpack="false"/>
 -
  </feature>
--- 
diff --git a/debian/patches/series b/debian/patches/series
index b07622c..10df0e4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 use-distribution-svnclient.patch
-use-distribution-javahl.patch
 disable-usage-tracking-tool.patch
diff --git a/debian/patches/use-distribution-javahl.patch b/debian/patches/use-distribution-javahl.patch
deleted file mode 100644
index 37980e8..0000000
--- a/debian/patches/use-distribution-javahl.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From: Jakub Adam <jakub.adam at ktknet.cz>
-Date: Tue, 4 Oct 2011 23:30:53 +0200
-Subject: use-distribution-javahl
-
----
- 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 7eb6b78..e4f8e75 100644
---- a/org.tigris.subversion.clientadapter.feature/feature.xml
-+++ b/org.tigris.subversion.clientadapter.feature/feature.xml
-@@ -28,7 +28,7 @@
-    </requires>
- 
-    <plugin
--         id="org.tigris.subversion.clientadapter"
-+         id="org.tigris.subversion.javahl"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-@@ -41,4 +41,11 @@
-          version="0.0.0"
-          unpack="false"/>
- 
-+   <plugin
-+         id="org.tigris.subversion.clientadapter"
-+         download-size="0"
-+         install-size="0"
-+         version="0.0.0"
-+         unpack="false"/>
-+
- </feature>
-diff --git a/org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF b/org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF
-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,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.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.clientadapter,
-- org.tigris.subversion.svnclientadapter,
-- org.tigris.subversion.svnclientadapter.javahl
- Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/debian/patches/use-distribution-svnclient.patch b/debian/patches/use-distribution-svnclient.patch
index 1c0536e..44c5f37 100644
--- a/debian/patches/use-distribution-svnclient.patch
+++ b/debian/patches/use-distribution-svnclient.patch
@@ -3,18 +3,18 @@ Date: Tue, 4 Oct 2011 23:33:13 +0200
 Subject: use-distribution-svnclient package
 
 ---
- 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(-)
+ 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(-)
 
 diff --git a/org.tigris.subversion.clientadapter.feature/feature.xml b/org.tigris.subversion.clientadapter.feature/feature.xml
-index 2a46e02..7eb6b78 100644
+index 2a46e02..a185acc 100644
 --- a/org.tigris.subversion.clientadapter.feature/feature.xml
 +++ b/org.tigris.subversion.clientadapter.feature/feature.xml
-@@ -34,4 +34,11 @@
+@@ -34,4 +34,18 @@
           version="0.0.0"
           unpack="false"/>
  
@@ -25,6 +25,13 @@ index 2a46e02..7eb6b78 100644
 +         version="0.0.0"
 +         unpack="false"/>
 +
++   <plugin
++         id="org.apache.subversion.javahl"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         unpack="false"/>
++
  </feature>
 diff --git a/org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF b/org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF
 index ed49560..be8a795 100644
@@ -59,7 +66,7 @@ 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 efcbd8e..bff2ef5 100644
+index 3acff45..1d1ec57 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,
@@ -70,7 +77,7 @@ index efcbd8e..bff2ef5 100644
 + 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 a0a5d08..dc6990f 100644
+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,

-- 
eclipse-subclipse packaging

More information about the pkg-java-commits mailing list