[eclipse-mylyn] 04/04: Refreshed d/patches/debian-orbit-deps.patch

Jakub Adam xhaakon-guest at alioth.debian.org
Wed Oct 2 17:57:21 UTC 2013


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

xhaakon-guest pushed a commit to branch master
in repository eclipse-mylyn.

commit d58f4c68cb769efeeb5ce70f566c2ac4641129f8
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Wed Oct 2 18:53:08 2013 +0200

    Refreshed d/patches/debian-orbit-deps.patch
---
 debian/changelog                       |    1 +
 debian/patches/debian-orbit-deps.patch |   52 ++++++++++++++++----------------
 2 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b1829b3..66295ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 eclipse-mylyn (3.9.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Refreshed d/patches/debian-orbit-deps.patch.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Wed, 02 Oct 2013 18:46:08 +0200
 
diff --git a/debian/patches/debian-orbit-deps.patch b/debian/patches/debian-orbit-deps.patch
index b099f6c..b16cb44 100644
--- a/debian/patches/debian-orbit-deps.patch
+++ b/debian/patches/debian-orbit-deps.patch
@@ -13,21 +13,21 @@ Subject: debian-orbit-deps
  * remove versions from Import-Package directives so that distribution jars in
    /usr/share/java can be used
 ---
- .../org.eclipse.mylyn.hudson-feature/feature.xml   |   23 ++++-
- .../META-INF/MANIFEST.MF                           |   22 ++--
- .../org.eclipse.mylyn.commons-feature/feature.xml  |  105 ++++++++++++++++++++
- .../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.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                           |    7 +-
+ .../org.eclipse.mylyn.hudson-feature/feature.xml   |  23 ++++-
+ .../META-INF/MANIFEST.MF                           |  22 +++--
+ .../org.eclipse.mylyn.commons-feature/feature.xml  | 105 +++++++++++++++++++++
+ .../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.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                           |   7 +-
  11 files changed, 187 insertions(+), 39 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 a38c772..f396171 100644
+index 1243d87..edf7c72 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,13 +29,18 @@
@@ -36,8 +36,8 @@ index a38c772..f396171 100644
     <requires>
 -      <import plugin="com.google.gson" version="2.1.0" match="compatible"/>
 -      
-       <import feature="org.eclipse.mylyn.builds" version="1.1.0" match="compatible"/>
-       <import feature="org.eclipse.mylyn.commons.repositories.http" version="1.1.0" match="compatible"/>
+       <import feature="org.eclipse.mylyn.builds" version="1.1.1" match="compatible"/>
+       <import feature="org.eclipse.mylyn.commons.repositories.http" version="1.1.1" match="compatible"/>
     </requires>
  
     <plugin
@@ -71,7 +71,7 @@ index a38c772..f396171 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 6358559..bdd2e16 100644
+index eb158f1..788a77d 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
 @@ -18,13 +18,15 @@ Export-Package: org.eclipse.mylyn.hudson.core;x-friends:="org.eclipse.mylyn.huds
@@ -101,7 +101,7 @@ index 6358559..bdd2e16 100644
 + javax.xml.bind,
 + javax.xml.bind.annotation
 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 4119219..97106be 100644
+index 1bce113..4c6fe3e 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,90 @@
@@ -222,7 +222,7 @@ index 4119219..97106be 100644
 +
  </feature>
 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 20f2333..3784455 100644
+index ffc0b6a..bd7e749 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
@@ -266,11 +266,11 @@ index 20f2333..3784455 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 cdad483..7c3eb7a 100644
+index 327de9d..9cb6713 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,7 @@ Bundle-SymbolicName: org.eclipse.mylyn.commons.soap;singleton:=true
- Bundle-Version: 3.9.0.qualifier
+ Bundle-Version: 3.9.1.qualifier
  Bundle-Vendor: %Bundle-Vendor
  Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 -Require-Bundle: javax.xml.rpc;bundle-version="1.1.0",
@@ -288,7 +288,7 @@ index cdad483..7c3eb7a 100644
  Bundle-Localization: plugin
  Eclipse-RegisterBuddy: org.apache.axis
 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 ce07b02..f208644 100644
+index fb5b278..c2719f3 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
@@ -302,7 +302,7 @@ index ce07b02..f208644 100644
  Export-Package: org.eclipse.mylyn.internal.commons.xmlrpc;x-internal:=true
  Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 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 5cbb3bb..c9aaf9b 100644
+index d1b42b0..24997af 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 @@
@@ -320,11 +320,11 @@ index 5cbb3bb..c9aaf9b 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 cf203f5..91af78e 100644
+index ca6d260..edf64f6 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.9.0" match="equivalent"/>
+       <import feature="org.eclipse.mylyn_feature" version="3.9.1" match="equivalent"/>
     </requires>
  
 -   <plugin
@@ -339,7 +339,7 @@ index cf203f5..91af78e 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 6a1d867..d5848b7 100644
+index 969e990..95ff3a9 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
 @@ -138,4 +138,11 @@
@@ -355,7 +355,7 @@ index 6a1d867..d5848b7 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 35bb25b..d990e53 100644
+index 901a687..e26e573 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 @@
@@ -371,7 +371,7 @@ index 35bb25b..d990e53 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 3847b7d..1a4aa09 100644
+index 1de1efd..9186a97 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,

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



More information about the pkg-java-commits mailing list