[SCM] eclipse-mylyn - Plug-in for eclipse - Debian package. branch, master, updated. debian/3.8.1-1-1-g2304403

[Jakub Adam]

The following commit has been merged in the master branch:
commit 2304403d9533fc6086b008591f857c7e3b95a46e
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Tue Oct 2 20:37:00 2012 +0200

    Avoid circular build dependency with eclipse-egit

diff --git a/debian/changelog b/debian/changelog
index bbbd041..e3db125 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+eclipse-mylyn (3.8.1-2) UNRELEASED; urgency=low
+
+  * Don't build eclipse-mylyn-versions-git binary package. This avoids
+    circular build dependency between eclipse-mylyn and eclipse-egit.
+    Package eclipse-mylyn-versions-git alone doesn't provide any end
+    user functionality and currently there aren't any packages
+    depending on it.
+
+ -- Jakub Adam <jakub.adam at ktknet.cz>  Tue, 02 Oct 2012 20:32:32 +0200
+
 eclipse-mylyn (3.8.1-1) experimental; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 3ec2416..1982c6c 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,6 @@ Build-Depends: debhelper (>= 8~),
                eclipse-jdt (>= 3.7~exp),
                eclipse-pde (>= 3.7~exp),
                eclipse-cdt,
-               eclipse-egit,
                libaxis-java (>= 1.4-16),
                libcommons-discovery-java (>= 0.5-2),
                libcommons-lang-java,
@@ -117,20 +116,20 @@ Description: Mylyn version control integration for CVS
  .
  Mylyn version control integration for CVS.
 
-Package: eclipse-mylyn-versions-git
-Architecture: all
-Depends: eclipse-mylyn (= ${source:Version}),
-         eclipse-egit,
-         ${misc:Depends},
-         ${orbit:Depends}
-Description: Mylyn version control integration for git
- Mylyn integrates task support into Eclipse. It supports offline editing
- for certain task repositories and monitors work activity to hide
- information that is not relevant to the current task. Also included is
- the Mylyn Focused UI for reducing information overload when working with
- tasks and the Bugzilla task connector.
- .
- Mylyn version control integration for git.
+#Package: eclipse-mylyn-versions-git
+#Architecture: all
+#Depends: eclipse-mylyn (= ${source:Version}),
+#         eclipse-egit,
+#         ${misc:Depends},
+#         ${orbit:Depends}
+#Description: Mylyn version control integration for git
+# Mylyn integrates task support into Eclipse. It supports offline editing
+# for certain task repositories and monitors work activity to hide
+# information that is not relevant to the current task. Also included is
+# the Mylyn Focused UI for reducing information overload when working with
+# tasks and the Bugzilla task connector.
+# .
+# Mylyn version control integration for git.
 
 Package: eclipse-mylyn-tasks-bugzilla
 Architecture: all
diff --git a/debian/eclipse-mylyn-versions-git.eh-install b/debian/eclipse-mylyn-versions-git.eh-install
deleted file mode 100644
index 0dff655..0000000
--- a/debian/eclipse-mylyn-versions-git.eh-install
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.mylyn.git
diff --git a/debian/eclipse.features b/debian/eclipse.features
index 1216229..c748b85 100644
--- a/debian/eclipse.features
+++ b/debian/eclipse.features
@@ -13,7 +13,7 @@ org.eclipse.cdt.mylyn cdt
 org.eclipse.mylyn.java_feature jdt
 org.eclipse.mylyn.pde_feature
 org.eclipse.mylyn.cvs
-org.eclipse.mylyn.git egit jgit
+#org.eclipse.mylyn.git egit jgit
 org.eclipse.mylyn.bugzilla_feature
 org.eclipse.mylyn.trac_feature
 org.eclipse.mylyn.wikitext_feature

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