[SCM] eclipse-mylyn - Plug-in for eclipse - Debian package. branch, master, updated. debian/3.8.3-1-6-g1497410

Jakub Adam jakub.adam at ktknet.cz
Sun May 12 10:09:07 UTC 2013


The following commit has been merged in the master branch:
commit 14974107f3ce67f11caef18a2042e5b9117cae03
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sun May 12 11:52:27 2013 +0200

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

diff --git a/debian/changelog b/debian/changelog
index d82253a..8ff0421 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 eclipse-mylyn (3.8.4-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Refreshed d/patches/debian-orbit-deps.patch.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Sun, 12 May 2013 11:45:43 +0200
 
diff --git a/debian/patches/debian-orbit-deps.patch b/debian/patches/debian-orbit-deps.patch
index 392e3af..6ab23e2 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 16ff09e..ac13918 100644
+index 18a4f1a..5231267 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 16ff09e..ac13918 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 7f52bcb..c20e8c6 100644
+index a22d579..0276ff5 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 7f52bcb..c20e8c6 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 075da08..1c97a05 100644
+index 36e2394..c13c7d2 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 075da08..1c97a05 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 18fe019..3bb4a7c 100644
+index 07e6349..41a5ff0 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 18fe019..3bb4a7c 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 87a2627..e539e2d 100644
+index 2686d9a..de0dbde 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 87a2627..e539e2d 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 4d35bd5..846a9da 100644
+index 55a1f9b..91af748 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 4d35bd5..846a9da 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 db4fc02..43e78b7 100644
+index 0d265cb..0b3d13e 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 db4fc02..43e78b7 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 66179c2..81bb559 100644
+index 1c45a91..8d9af5a 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.3.qualifier
+ Bundle-Version: 3.8.4.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 66179c2..81bb559 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 79b5ec8..d6b3d7c 100644
+index dc54e53..6c1b475 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 79b5ec8..d6b3d7c 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 b6d6b6b..d9eceaa 100644
+index 5d122e7..00815e4 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 b6d6b6b..d9eceaa 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 96c331e..7529fa9 100644
+index 544a7bc..efbf30b 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.3" match="equivalent"/>
+       <import feature="org.eclipse.mylyn_feature" version="3.8.4" match="equivalent"/>
     </requires>
  
 -   <plugin
@@ -412,7 +412,7 @@ index 96c331e..7529fa9 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 8915627..3a3b163 100644
+index c8cb1c4..54b5c0f 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 8915627..3a3b163 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 2feebdc..bc6cc80 100644
+index 6b0582f..b8dc2c6 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 2feebdc..bc6cc80 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 62422d2..687414a 100644
+index 7e2f59a..12c352d 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