The following commit has been merged in the master branch:
commit f9b0e2a32a5110bc15e1a2a56692ad62abe23673
Author: Jakub Adam <jakub.a...@ktknet.cz>
Date:   Mon Apr 30 20:56:21 2012 +0200

    Refresh d/patches

diff --git a/debian/patches/debian-orbit-deps.patch 
b/debian/patches/debian-orbit-deps.patch
index 72e6251..61b7d5d 100644
--- a/debian/patches/debian-orbit-deps.patch
+++ b/debian/patches/debian-orbit-deps.patch
@@ -22,15 +22,15 @@ Subject: debian-orbit-deps
  .../META-INF/MANIFEST.MF                           |   36 +++---
  .../META-INF/MANIFEST.MF                           |    5 +-
  .../META-INF/MANIFEST.MF                           |    3 +-
- .../org.eclipse.mylyn.monitor-feature/feature.xml  |    7 +
+ .../org.eclipse.mylyn.monitor-feature/feature.xml  |    7 ++
  .../org.eclipse.mylyn.context-feature/feature.xml  |    4 +-
- .../org.eclipse.mylyn.wikitext-feature/feature.xml |    7 +
- .../org.eclipse.mylyn.trac-feature/feature.xml     |    7 +
- .../META-INF/MANIFEST.MF                           |    3 +-
- 14 files changed, 213 insertions(+), 49 deletions(-)
+ .../org.eclipse.mylyn.wikitext-feature/feature.xml |    7 ++
+ .../org.eclipse.mylyn.trac-feature/feature.xml     |    7 ++
+ .../META-INF/MANIFEST.MF                           |    7 +-
+ 14 files changed, 215 insertions(+), 51 deletions(-)
 
 diff --git 
a/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson-feature/feature.xml 
b/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson-feature/feature.xml
-index 2e5cfc9..5d3553c 100644
+index d2431eb..566ef93 100644
 --- a/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson-feature/feature.xml
 +++ b/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson-feature/feature.xml
 @@ -29,17 +29,28 @@
@@ -86,7 +86,7 @@ index 2e5cfc9..5d3553c 100644
 +
  </feature>
 diff --git 
a/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.core/META-INF/MANIFEST.MF 
b/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.core/META-INF/MANIFEST.MF
-index 75603c5..e8a6ef3 100644
+index 4d1d66a..ebc1750 100644
 --- 
a/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.core/META-INF/MANIFEST.MF
 +++ 
b/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.core/META-INF/MANIFEST.MF
 @@ -10,7 +10,7 @@ Require-Bundle: 
org.eclipse.core.runtime;bundle-version="3.5.0",
@@ -102,7 +102,7 @@ index 75603c5..e8a6ef3 100644
   org.eclipse.mylyn.internal.hudson.core.client;x-internal:=true,
   org.eclipse.mylyn.internal.hudson.model;x-internal:=true
  Bundle-Activator: org.eclipse.mylyn.internal.hudson.core.HudsonCorePlugin
--Import-Package: com.google.gson;version="1.6.0",
+-Import-Package: com.google.gson;version="[1.6.0,2.0.0)",
 - javax.activation,
 - javax.xml.stream;version="1.0.1",
 - org.apache.http;version="4.1.4",
@@ -125,7 +125,7 @@ index 75603c5..e8a6ef3 100644
 + org.apache.http.protocol,
 + org.apache.http.util
 diff --git 
a/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons-feature/feature.xml 
b/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons-feature/feature.xml
-index 2a7ec31..c1d760f 100644
+index ebc0f07..d96cef7 100644
 --- a/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons-feature/feature.xml
 +++ b/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons-feature/feature.xml
 @@ -29,6 +29,104 @@
@@ -260,7 +260,7 @@ index 2a7ec31..c1d760f 100644
 +
  </feature>
 diff --git 
a/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.identity-feature/feature.xml
 
b/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.identity-feature/feature.xml
-index de334ca..d74e080 100644
+index ce42cf4..e0d2bc8 100644
 --- 
a/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.identity-feature/feature.xml
 +++ 
b/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.identity-feature/feature.xml
 @@ -29,7 +29,7 @@
@@ -273,7 +273,7 @@ index de334ca..d74e080 100644
           install-size="0"
           version="0.0.0"
 diff --git 
a/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.notifications-feature/feature.xml
 
b/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.notifications-feature/feature.xml
-index 54cee6a..54e89b4 100644
+index 205b07b..1ad60b0 100644
 --- 
a/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.notifications-feature/feature.xml
 +++ 
b/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.notifications-feature/feature.xml
 @@ -39,12 +39,12 @@
@@ -292,7 +292,7 @@ index 54cee6a..54e89b4 100644
     <plugin
           id="org.eclipse.mylyn.commons.notifications.core"
 diff --git 
a/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.repositories-feature/feature.xml
 
b/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.repositories-feature/feature.xml
-index 23a00cd..cb5879e 100644
+index 64d173c..9835f94 100644
 --- 
a/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.repositories-feature/feature.xml
 +++ 
b/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.repositories-feature/feature.xml
 @@ -32,19 +32,19 @@
@@ -320,7 +320,7 @@ index 23a00cd..cb5879e 100644
     <plugin
           id="org.eclipse.mylyn.commons.repositories.core"
 diff --git 
a/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.repositories.http.core/META-INF/MANIFEST.MF
 
b/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.repositories.http.core/META-INF/MANIFEST.MF
-index 2893642..4d7fc68 100644
+index c1fd1d7..2656b4c 100644
 --- 
a/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.repositories.http.core/META-INF/MANIFEST.MF
 +++ 
b/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.repositories.http.core/META-INF/MANIFEST.MF
 @@ -15,21 +15,21 @@ Export-Package: 
org.eclipse.mylyn.commons.repositories.http.core;x-internal:=tru
@@ -364,11 +364,11 @@ index 2893642..4d7fc68 100644
 + org.apache.http.impl.conn.tsccm,
 + org.apache.http.impl.client
 diff --git 
a/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.soap/META-INF/MANIFEST.MF 
b/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.soap/META-INF/MANIFEST.MF
-index f98d36d..53cb21b 100644
+index caca849..985cfea 100644
 --- 
a/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.soap/META-INF/MANIFEST.MF
 +++ 
b/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.soap/META-INF/MANIFEST.MF
 @@ -5,9 +5,8 @@ Bundle-SymbolicName: 
org.eclipse.mylyn.commons.soap;singleton:=true
- Bundle-Version: 3.7.0.qualifier
+ Bundle-Version: 3.7.1.qualifier
  Bundle-Vendor: %Bundle-Vendor
  Bundle-RequiredExecutionEnvironment: J2SE-1.5
 -Require-Bundle: javax.xml.rpc;bundle-version="1.1.0",
@@ -380,7 +380,7 @@ index f98d36d..53cb21b 100644
   org.eclipse.core.runtime,
   org.eclipse.core.net,
 diff --git 
a/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.xmlrpc/META-INF/MANIFEST.MF
 
b/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.xmlrpc/META-INF/MANIFEST.MF
-index e157ff1..b39d2e0 100644
+index 589779d..59f0a82 100644
 --- 
a/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.xmlrpc/META-INF/MANIFEST.MF
 +++ 
b/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.xmlrpc/META-INF/MANIFEST.MF
 @@ -7,7 +7,8 @@ Bundle-Vendor: %Bundle-Vendor
@@ -394,7 +394,7 @@ index e157ff1..b39d2e0 100644
  Export-Package: org.eclipse.mylyn.internal.commons.xmlrpc;x-internal:=true
  Bundle-RequiredExecutionEnvironment: J2SE-1.5
 diff --git 
a/org.eclipse.mylyn.commons/org.eclipse.mylyn.monitor-feature/feature.xml 
b/org.eclipse.mylyn.commons/org.eclipse.mylyn.monitor-feature/feature.xml
-index 981f1cd..e74d0bb 100644
+index ca8d437..02d36bf 100644
 --- a/org.eclipse.mylyn.commons/org.eclipse.mylyn.monitor-feature/feature.xml
 +++ b/org.eclipse.mylyn.commons/org.eclipse.mylyn.monitor-feature/feature.xml
 @@ -29,6 +29,13 @@
@@ -412,11 +412,11 @@ index 981f1cd..e74d0bb 100644
           download-size="0"
           install-size="0"
 diff --git 
a/org.eclipse.mylyn.context/org.eclipse.mylyn.context-feature/feature.xml 
b/org.eclipse.mylyn.context/org.eclipse.mylyn.context-feature/feature.xml
-index 138dee6..3b4d4ce 100644
+index 26fff8d..fed3253 100644
 --- a/org.eclipse.mylyn.context/org.eclipse.mylyn.context-feature/feature.xml
 +++ b/org.eclipse.mylyn.context/org.eclipse.mylyn.context-feature/feature.xml
 @@ -32,12 +32,12 @@
-       <import feature="org.eclipse.mylyn_feature" version="3.7.0" 
match="equivalent"/>
+       <import feature="org.eclipse.mylyn_feature" version="3.7.1" 
match="equivalent"/>
     </requires>
  
 -   <plugin
@@ -431,7 +431,7 @@ index 138dee6..3b4d4ce 100644
     <plugin
           id="org.eclipse.mylyn.context.ui"
 diff --git 
a/org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext-feature/feature.xml 
b/org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext-feature/feature.xml
-index 67d0f2c..be556be 100644
+index 1696bb2..877a926 100644
 --- a/org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext-feature/feature.xml
 +++ b/org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext-feature/feature.xml
 @@ -131,4 +131,11 @@
@@ -447,7 +447,7 @@ index 67d0f2c..be556be 100644
 +
  </feature>
 diff --git 
a/org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac-feature/feature.xml 
b/org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac-feature/feature.xml
-index 9f3196f..425cf40 100644
+index 8ab918a..8aa6e72 100644
 --- a/org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac-feature/feature.xml
 +++ b/org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac-feature/feature.xml
 @@ -46,4 +46,11 @@
@@ -463,7 +463,7 @@ index 9f3196f..425cf40 100644
 +
  </feature>
 diff --git 
a/org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF 
b/org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF
-index 74bf3c3..4ccac3b 100644
+index 8486193..d4490b3 100644
 --- a/org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF
 +++ b/org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF
 @@ -9,7 +9,8 @@ Require-Bundle: org.eclipse.core.runtime,
@@ -476,3 +476,11 @@ index 74bf3c3..4ccac3b 100644
  Bundle-ActivationPolicy: lazy
  Export-Package: 
org.eclipse.mylyn.internal.trac.core;x-friends:="org.eclipse.mylyn.trac.ui",
   
org.eclipse.mylyn.internal.trac.core.client;x-friends:="org.eclipse.mylyn.trac.ui",
+@@ -18,5 +19,5 @@ Export-Package: 
org.eclipse.mylyn.internal.trac.core;x-friends:="org.eclipse.myl
+ Bundle-Activator: org.eclipse.mylyn.internal.trac.core.TracCorePlugin
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Bundle-Localization: plugin
+-Import-Package: com.google.gson;version="[1.6.0,2.0.0)",
+- com.google.gson.reflect;version="[1.6.0,2.0.0)"
++Import-Package: com.google.gson,
++ com.google.gson.reflect

-- 
eclipse-mylyn - Plug-in for eclipse - Debian package.

_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to