[SCM] eclipse-mylyn - Plug-in for eclipse - Debian package. branch, master, updated. debian/3.8.1-2-5-ge212e4e

Jakub Adam jakub.adam at ktknet.cz
Sun Nov 25 14:05:54 UTC 2012


The following commit has been merged in the master branch:
commit e212e4e7499c0353bb9f4e9cfeb6a75963573fdd
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sun Nov 25 13:54:37 2012 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 9d705cd..f268be9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 eclipse-mylyn (3.8.2-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Refreshed d/patches/debian-orbit-deps.patch.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Sun, 25 Nov 2012 13:47:33 +0100
 
diff --git a/debian/patches/debian-orbit-deps.patch b/debian/patches/debian-orbit-deps.patch
index 7eb9ebd..696e077 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, 215 insertions(+), 50 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 88d6522..40318b5 100644
+index fea3621..60d6331 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,29 @@
@@ -86,7 +86,7 @@ index 88d6522..40318b5 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 b0ac814..d61ef09 100644
+index 6aa0582..30939a5 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",
@@ -125,7 +125,7 @@ index b0ac814..d61ef09 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 9d78322..c2d7c29 100644
+index b051cf3..f439c10 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 9d78322..c2d7c29 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 8207671..6adc3e2 100644
+index 54229e6..ea2da07 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 8207671..6adc3e2 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 5d37593..d328399 100644
+index ca98535..bdd493a 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 5d37593..d328399 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 38855dd..e6b620d 100644
+index 1924c14..e7013bf 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 38855dd..e6b620d 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 b6fcf84..6c157f0 100644
+index ded6b39..c432f1c 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 b6fcf84..6c157f0 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 0381537..1704e0f 100644
+index 7a3d542..c7be0be 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.8.1.qualifier
+ Bundle-Version: 3.8.2.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 0381537..1704e0f 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 e8bebf6..f89c64b 100644
+index 1d7ecd8..53b7597 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 e8bebf6..f89c64b 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 8358c78..0656997 100644
+index 88bc352..8c4b4bd 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 8358c78..0656997 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 2b5f63c..3d55bf8 100644
+index e29ba3d..3d21991 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.1" match="equivalent"/>
+       <import feature="org.eclipse.mylyn_feature" version="3.8.2" match="equivalent"/>
     </requires>
  
 -   <plugin
@@ -431,7 +431,7 @@ index 2b5f63c..3d55bf8 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 0ca515a..6faac08 100644
+index d5c4aa6..68264ee 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 0ca515a..6faac08 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 9c35a1c..aaf669e 100644
+index 4029f49..9baecdd 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 9c35a1c..aaf669e 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 f185b9e..fe7502e 100644
+index 8ba3ac2..b82479c 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