The following commit has been merged in the master branch:
commit 27d450fc198ab5d82aa0f2f9957466018dab99e6
Author: Jakub Adam <jakub.a...@ktknet.cz>
Date: Sat Nov 5 11:17:07 2011 +0100
Updated packaging files for new upstream release
diff --git a/debian/changelog b/debian/changelog
index a472869..26b4e33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+eclipse-mylyn (3.6.2-1) UNRELEASED; urgency=low
+
+ * New upstream release
+
+ -- Jakub Adam <jakub.a...@ktknet.cz> Mon, 17 Oct 2011 22:49:01 +0200
+
eclipse-mylyn (3.2.1-1) UNRELEASED; urgency=low
* Initial release.
diff --git a/debian/control b/debian/control
index 5275d23..97312d9 100644
--- a/debian/control
+++ b/debian/control
@@ -5,80 +5,136 @@ Maintainer: Debian Java Maintainers
<pkg-java-maintain...@lists.alioth.debian.or
Uploaders: Niels Thykier <ni...@thykier.net>,
Benjamin Drung <bdr...@ubuntu.com>,
Adrian Perez <adrianperez....@gmail.com>
-Build-Depends: debhelper (>= 7),
+Build-Depends: debhelper (>= 8~),
default-jdk,
- eclipse-pde (>= 3.5.2),
- eclipse-platform (>= 3.5.2),
+ eclipse-jdt (>= 3.7~exp),
+ eclipse-pde (>= 3.7~exp),
+ eclipse-egit,
+ libaxis-java (>= 1.4-16),
+ libcommons-lang-java,
+ libjaxp1.3-java (>= 1.3.05-2),
+ libjdom1-java (>= 1.1.2+dfsg-2),
+ librome-java (>= 1.0-3),
+ libws-commons-util-java,
+ libxmlrpc3-client-java (>= 3.1.3-4),
+ libxmlrpc3-common-java (>= 3.1.3-4),
javahelper (>= 0.31),
- libcommons-codec-java (>= 1.4-2),
- libcommons-httpclient-java (>= 3.1-9),
- libcommons-lang-java (>= 2.4-2),
- libcommons-logging-java (>= 1.1.1-6),
unzip,
zip
-Build-Conflicts: eclipse-cdt
-Standards-Version: 3.8.3
+Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/git/pkg-java/eclipse-mylyn.git
Vcs-Browser: http://git.debian.org/?p=pkg-java/eclipse-mylyn.git
Homepage: http://www.eclipse.org/mylyn
Package: eclipse-mylyn
Architecture: all
-Depends: eclipse-platform (>= 3.5.1),
- eclipse-plugin-cvs (>= 3.5.1),
+Depends: eclipse-platform (>= 3.7~exp),
${misc:Depends},
${orbit:Depends}
-Description: Task support for Eclipse
+Description: Task-Focused Interface for Eclipse
+ Mylyn is a Task-Focused Interface for Eclipse that reduces information
overload
+ and makes multi-tasking easy. It does this by making tasks a first class part
+ of Eclipse, and integrating rich and offline editing for repositories such as
+ Bugzilla, Trac, and JIRA.
+ .
+ Once your tasks are integrated, Mylyn monitors your work activity to identify
+ information relevant to the task-at-hand, and uses this task context to focus
+ the Eclipse UI on the interesting information, hide the uninteresting, and
+ automatically find what's related. This puts the information you need to get
+ work done at your fingertips and improves productivity by reducing searching,
+ scrolling, and navigation. By making task context explicit Mylyn also
+ facilitates multitasking, planning, reusing past efforts, and sharing
+ expertise.
+
+Package: eclipse-mylyn-context-cdt
+Architecture: all
+Depends: eclipse-mylyn (= ${source:Version}),
+ eclipse-cdt (>= 8.0.0),
+ ${misc:Depends},
+ ${orbit:Depends}
+Description: Mylyn context integration for Eclipse CDT
+ Mylyn context provides usage monitoring, degree-of-interested modeling and the
+ task-focused user extensions implementation for the Eclipse UI, which
re-aligns
+ the user experience around tasks and provides features such as workspace
+ focusing and one-click multitasking.
+ .
+ This package provides Mylyn context integration for Eclipse C/C++ Development
+ Tools.
+
+Package: eclipse-mylyn-context-jdt
+Architecture: all
+Depends: eclipse-mylyn (= ${source:Version}),
+ eclipse-jdt (>= 3.7~exp),
+ ${misc:Depends},
+ ${orbit:Depends}
+Description: Task support for Eclipse JDT
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 Task-Focused UI extensions for JDT. Provides focusing of Java
+ element views and editors.
-Package: eclipse-mylyn-jdt
+Package: eclipse-mylyn-context-pde
Architecture: all
-Depends: eclipse-platform (>= 3.5.1),
- eclipse-jdt (>= 3.5.1),
- ${misc:Depends}
-Description: Task support for Eclipse JDT
+Depends: eclipse-platform (>= 3.7~exp),
+ eclipse-pde (>= 3.7~exp),
+ eclipse-mylyn-context-jdt (= ${source:Version}),
+ ${misc:Depends},
+ ${orbit:Depends}
+Description: Task support for Eclipse PDE
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 Task-Focused UI extensions for JDT. Provides focusing of Java
- element views and editors.
+ Mylyn Task-Focused UI extensions for PDE.
-Package: eclipse-mylyn-pde
+Package: eclipse-mylyn-versions-cvs
Architecture: all
-Depends: eclipse-platform (>= 3.5.1),
- eclipse-pde (>= 3.5.1),
- eclipse-mylyn-jdt (= ${source:Version}),
- ${misc:Depends}
-Description: Task support for Eclipse PDE
+Depends: eclipse-mylyn (= ${source:Version}),
+ ${misc:Depends},
+ ${orbit:Depends}
+Description: Mylyn version control integration for CVS
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 Task-Focused UI extensions for PDE, Ant, Team Support and 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-tasks-trac
+Architecture: all
+Depends: eclipse-mylyn (= ${source:Version}),
+ ${misc:Depends}
+Description: Mylyn Trac Connector
+ 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.
+ .
+ Trac client integrated with Eclipse and Mylyn; can be used standalone.
-#Package: eclipse-mylyn-trac
-#Architecture: all
-#Depends: eclipse-mylyn (= ${source:Version}),
-# ${misc:Depends}
-#Description: Mylyn Trac Connector
-# 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.
-# .
-# Trac client integrated with Eclipse and Mylyn; can be used standalone.
-#
#Package: eclipse-mylyn-webtasks
#Architecture: all
#Depends: eclipse-mylyn (= ${source:Version}),
@@ -92,17 +148,17 @@ Description: Task support for Eclipse PDE
# .
# Provides Task List integration for several web-based issue trackers
# and templates for example projects.
-#
-#Package: eclipse-mylyn-wikitext
-#Architecture: all
-#Depends: eclipse-mylyn (= ${source:Version}),
-# ${misc:Depends}
-#Description: Mylyn WikiText
-# 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.
-# .
-# Enables parsing and display of lightweight markup (wiki text). Extends
-# the Mylyn task editor to create a markup-aware editor.
+
+Package: eclipse-mylyn-wikitext
+Architecture: all
+Depends: eclipse-mylyn (= ${source:Version}),
+ ${misc:Depends}
+Description: Mylyn WikiText
+ 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.
+ .
+ Enables parsing and display of lightweight markup (wiki text). Extends
+ the Mylyn task editor to create a markup-aware editor.
diff --git a/debian/eclipse-mylyn-context-cdt.eh-install
b/debian/eclipse-mylyn-context-cdt.eh-install
new file mode 100644
index 0000000..db41f4f
--- /dev/null
+++ b/debian/eclipse-mylyn-context-cdt.eh-install
@@ -0,0 +1 @@
+org.eclipse.cdt.mylyn
diff --git a/debian/eclipse-mylyn-jdt.eh-install
b/debian/eclipse-mylyn-context-jdt.eh-install
similarity index 100%
rename from debian/eclipse-mylyn-jdt.eh-install
rename to debian/eclipse-mylyn-context-jdt.eh-install
diff --git a/debian/eclipse-mylyn-pde.eh-install
b/debian/eclipse-mylyn-context-pde.eh-install
similarity index 100%
rename from debian/eclipse-mylyn-pde.eh-install
rename to debian/eclipse-mylyn-context-pde.eh-install
diff --git a/debian/eclipse-mylyn-tasks-trac.eh-install
b/debian/eclipse-mylyn-tasks-trac.eh-install
new file mode 100644
index 0000000..b037793
--- /dev/null
+++ b/debian/eclipse-mylyn-tasks-trac.eh-install
@@ -0,0 +1 @@
+org.eclipse.mylyn.trac_feature
diff --git a/debian/eclipse-mylyn-versions-cvs.eh-install
b/debian/eclipse-mylyn-versions-cvs.eh-install
new file mode 100644
index 0000000..5798766
--- /dev/null
+++ b/debian/eclipse-mylyn-versions-cvs.eh-install
@@ -0,0 +1 @@
+org.eclipse.mylyn.cvs
diff --git a/debian/eclipse-mylyn-versions-git.eh-install
b/debian/eclipse-mylyn-versions-git.eh-install
new file mode 100644
index 0000000..0dff655
--- /dev/null
+++ b/debian/eclipse-mylyn-versions-git.eh-install
@@ -0,0 +1 @@
+org.eclipse.mylyn.git
diff --git a/debian/eclipse-mylyn-wikitext.eh-install
b/debian/eclipse-mylyn-wikitext.eh-install
new file mode 100644
index 0000000..96da127
--- /dev/null
+++ b/debian/eclipse-mylyn-wikitext.eh-install
@@ -0,0 +1 @@
+org.eclipse.mylyn.wikitext_feature
diff --git a/debian/eclipse-mylyn.eh-install b/debian/eclipse-mylyn.eh-install
index 47d3d2c..a251ea3 100644
--- a/debian/eclipse-mylyn.eh-install
+++ b/debian/eclipse-mylyn.eh-install
@@ -1,5 +1,5 @@
+org.eclipse.mylyn.commons
org.eclipse.mylyn_feature
-org.eclipse.mylyn.bugzilla_feature
org.eclipse.mylyn.context_feature
+org.eclipse.mylyn.versions
org.eclipse.mylyn.team_feature
-org.eclipse.mylyn.ide_feature
diff --git a/debian/eclipse.environment b/debian/eclipse.environment
new file mode 100644
index 0000000..6f0e669
--- /dev/null
+++ b/debian/eclipse.environment
@@ -0,0 +1,5 @@
+org.eclipse.mylyn.commons/org.eclipse.mylyn*
+org.eclipse.mylyn.context/org.eclipse.mylyn*
+org.eclipse.mylyn.docs/org.eclipse.mylyn*
+org.eclipse.mylyn.tasks/org.eclipse.mylyn*
+org.eclipse.mylyn.versions/org.eclipse.mylyn*
diff --git a/debian/eclipse.features b/debian/eclipse.features
index 4f9285d..060ae75 100644
--- a/debian/eclipse.features
+++ b/debian/eclipse.features
@@ -1,11 +1,12 @@
+org.eclipse.mylyn.commons
org.eclipse.mylyn_feature
org.eclipse.mylyn.context_feature
+org.eclipse.mylyn.versions
org.eclipse.mylyn.team_feature
-org.eclipse.mylyn.bugzilla_feature
-#org.eclipse.mylyn.trac_feature
-org.eclipse.mylyn.ide_feature
-org.eclipse.mylyn.java_feature
+org.eclipse.cdt.mylyn cdt
+org.eclipse.mylyn.java_feature jdt
org.eclipse.mylyn.pde_feature
-#org.eclipse.mylyn.web.tasks_feature
-#org.eclipse.mylyn.wikitext_feature
-#org.eclipse.cdt.mylyn
+org.eclipse.mylyn.cvs
+org.eclipse.mylyn.git egit jgit
+org.eclipse.mylyn.trac_feature
+org.eclipse.mylyn.wikitext_feature
diff --git a/debian/eclipse.orbitdeps b/debian/eclipse.orbitdeps
index 340b036..8e5f95c 100644
--- a/debian/eclipse.orbitdeps
+++ b/debian/eclipse.orbitdeps
@@ -1,4 +1,9 @@
-commons-codec
-commons-httpclient
+axis
+axis-saaj
commons-lang
-commons-logging
+jdom1
+rome
+ws-commons-util
+xml-apis
+xmlrpc-common-3.1
+xmlrpc-client-3.1
diff --git a/debian/rules b/debian/rules
index 6e9662c..54f1bf7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,6 @@
#!/usr/bin/make -f
export JAVA_HOME:=/usr/lib/jvm/default-java
-JVM_ARGS := -DJ2SE_1.5=$(JAVA_HOME)/java/jre/lib/rt.jar
-QUALIFIER:=v20100222-0100-e3x
-BUILD_OPTIONS := -DjavacTarget=1.5 -DjavacSource=1.5
-DforceContextQualifier=$(QUALIFIER) -DmylynQualifier=$(QUALIFIER)
-
-override_jh_compilefeatures:
- rm -fr debian/.eclipse-build/*tests* debian/.eclipse-build/*web*
debian/.eclipse-build/*trac* debian/.eclipse-build/*wiki*
- sed -i 's|bundle-version="2.3.0"|bundle-version="[2.3.0,3.0.0)"|g'
debian/.eclipse-build/org.eclipse.mylyn.commons.net/META-INF/MANIFEST.MF
-# find debian/.eclipse-build/ -name feature.xml | \
-# while read f; do \
-# sed -i "s/qualifier/$(QUALIFIIER)/g" $$f ; \
-# done
- jh_compilefeatures --build-opts '$(BUILD_OPTIONS)' --jvm-args
'$(JVM_ARGS)'
%:
dh $@ --with eclipse-helper
--
eclipse-mylyn - Plug-in for eclipse - Debian package.
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
