[SCM] eclipse-mylyn - Plug-in for eclipse - Debian package. branch, master, updated. debian/3.8.2-2-6-g628a69d

Jakub Adam jakub.adam at ktknet.cz
Thu Mar 28 14:07:47 UTC 2013


The following commit has been merged in the master branch:
commit 628a69d96c725c8e1363e0321dbce209c5e69c39
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Thu Mar 28 09:02:49 2013 +0100

    Refreshed d/patches/debian-orbit-deps.patch

diff --git a/debian/changelog b/debian/changelog
index e0182c6..13f1ca4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ eclipse-mylyn (3.8.3-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Use xz compression for orig tarball.
+  * Refreshed d/patches/debian-orbit-deps.patch.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Thu, 28 Mar 2013 08:55:32 +0100
 
diff --git a/debian/patches/debian-orbit-deps.patch b/debian/patches/debian-orbit-deps.patch
index d18d404..392e3af 100644
--- a/debian/patches/debian-orbit-deps.patch
+++ b/debian/patches/debian-orbit-deps.patch
@@ -30,7 +30,7 @@ Subject: debian-orbit-deps
  14 files changed, 187 insertions(+), 53 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 fea3621..30afcb3 100644
+index 16ff09e..ac13918 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,20 @@
@@ -78,7 +78,7 @@ index fea3621..30afcb3 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 6aa0582..46ecebb 100644
+index 7f52bcb..c20e8c6 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,25 +10,23 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",
@@ -120,7 +120,7 @@ index 6aa0582..46ecebb 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 b051cf3..cc86ba0 100644
+index 075da08..1c97a05 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,83 @@
@@ -234,7 +234,7 @@ index b051cf3..cc86ba0 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 54229e6..ea2da07 100644
+index 18fe019..3bb4a7c 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 @@
@@ -247,7 +247,7 @@ index 54229e6..ea2da07 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 ca98535..bdd493a 100644
+index 87a2627..e539e2d 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 @@
@@ -266,7 +266,7 @@ index ca98535..bdd493a 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 1924c14..e7013bf 100644
+index 4d35bd5..846a9da 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 @@
@@ -294,7 +294,7 @@ index 1924c14..e7013bf 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 ded6b39..c432f1c 100644
+index db4fc02..43e78b7 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
@@ -338,12 +338,12 @@ index ded6b39..c432f1c 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 7a3d542..3947f7d 100644
+index 66179c2..81bb559 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
 @@ -4,10 +4,7 @@ Bundle-Name: %Bundle-Name
  Bundle-SymbolicName: org.eclipse.mylyn.commons.soap;singleton:=true
- Bundle-Version: 3.8.2.qualifier
+ Bundle-Version: 3.8.3.qualifier
  Bundle-Vendor: %Bundle-Vendor
 -Bundle-RequiredExecutionEnvironment: J2SE-1.5
 -Require-Bundle: javax.xml.rpc;bundle-version="1.1.0",
@@ -361,7 +361,7 @@ index 7a3d542..3947f7d 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 1d7ecd8..53b7597 100644
+index 79b5ec8..d6b3d7c 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
@@ -375,7 +375,7 @@ index 1d7ecd8..53b7597 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 88bc352..8c4b4bd 100644
+index b6d6b6b..d9eceaa 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 @@
@@ -393,11 +393,11 @@ index 88bc352..8c4b4bd 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 e29ba3d..3d21991 100644
+index 96c331e..7529fa9 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.8.2" match="equivalent"/>
+       <import feature="org.eclipse.mylyn_feature" version="3.8.3" match="equivalent"/>
     </requires>
  
 -   <plugin
@@ -412,7 +412,7 @@ index e29ba3d..3d21991 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 d5c4aa6..68264ee 100644
+index 8915627..3a3b163 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 @@
@@ -428,7 +428,7 @@ index d5c4aa6..68264ee 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 4029f49..9baecdd 100644
+index 2feebdc..bc6cc80 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 @@
@@ -444,7 +444,7 @@ index 4029f49..9baecdd 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 8ba3ac2..b82479c 100644
+index 62422d2..687414a 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,

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



More information about the pkg-java-commits mailing list