[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. eclipse-ppa/maverick-35-g512f1cf
Niels Thykier
nthykier-guest at alioth.debian.org
Sat Jun 26 11:24:18 UTC 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "eclipse - Powerful IDE written in java - Debian package.".
The branch, master has been updated
via 512f1cf5c810b9fbb9bc0fea614f473df93bd1d0 (commit)
via 06d81dcd7e162b4ae135fb1fb03c7ff92f35c8a2 (commit)
via 20925a8c8170eb31a2dce637c475869e3f68583e (commit)
via 19a2922fc65002d73e766543228b524eef971c9f (commit)
via 53d4b243be42f81f14c8d137014974e6d3efd719 (commit)
via d333391ae5d4cd349230f6d9259c14270ff421fd (commit)
from 07fac0cc94a2880420d99efeb68acd88e62b084d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 512f1cf5c810b9fbb9bc0fea614f473df93bd1d0
Author: Niels Thykier <niels at thykier.net>
Date: Sat Jun 26 13:20:18 2010 +0200
Removed Depends on JRE for libequinox-osgi-java.
Accepted patch from Yulia Novozhilova:
Added the Maven POMs for libequinox-osgi.java (LP: #598039)
Added missing recomends on libservlet2.5-java for libequinox-osgi-java.
Git-Dch: ignore
commit 06d81dcd7e162b4ae135fb1fb03c7ff92f35c8a2
Author: Adnan Hodzic <adnan at foolcontrol.org>
Date: Wed Jun 23 00:11:20 2010 +0200
updated my last changelog 4
commit 20925a8c8170eb31a2dce637c475869e3f68583e
Author: Adnan Hodzic <adnan at foolcontrol.org>
Date: Wed Jun 23 00:10:52 2010 +0200
updated my last changelog 3
commit 19a2922fc65002d73e766543228b524eef971c9f
Author: Adnan Hodzic <adnan at foolcontrol.org>
Date: Wed Jun 23 00:08:02 2010 +0200
updated my last changelog 2
commit 53d4b243be42f81f14c8d137014974e6d3efd719
Author: Adnan Hodzic <adnan at foolcontrol.org>
Date: Wed Jun 23 00:05:26 2010 +0200
updated my last changelog
commit d333391ae5d4cd349230f6d9259c14270ff421fd
Author: Adnan Hodzic <adnan at foolcontrol.org>
Date: Tue Jun 22 23:26:32 2010 +0200
added fix-bashism.patch to changelo
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 18 +++++++----
debian/control | 10 ++++--
debian/patches/sat4j-version.patch | 17 +++++++++++
debian/patches/series | 1 +
debian/poms/pom-equinox-osgi.services.xml | 31 ++++++++++++++++++++
debian/poms/pom-equinox-osgi.util.xml | 26 ++++++++++++++++
debian/poms/pom-equinox-osgi.xml | 22 ++++++++++++++
debian/rules | 11 +++++++
.../META-INF/MANIFEST.MF | 4 +-
9 files changed, 127 insertions(+), 13 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e5bffd6..1f4fa43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,22 +1,26 @@
-eclipse (3.5.2-3ubuntu1~ppa1~4.gbp4cf94f) UNRELEASED; urgency=low
-
- ** SNAPSHOT build @4cf94fd7288243bb9e4ca7765b3744515683ee65 **
+eclipse (3.5.2-4) UNRELEASED; urgency=low
[ Niels Thykier ]
* Added menu entry for the Debian menu.
* Moved a lot of arch-indep plugins into eclipse-platform-data.
- * Backported fix for poor tooltip colors with certain themes. (LP:
- #540332)
- * UNRELEASED
+ * Backported fix for poor tooltip colors with certain themes.
+ (Closes: #582302, LP: #540332)
* Backported fix for hover text visability problem.
* Corrected a format issue in debian/copyright.
* Removed depends on cvs for eclipse-plugin-cvs, it is not needed.
(LP: #592508)
+ * Removed Depends on JRE for libequinox-osgi-java.
+ * Added patch to use sat4j 2.2 instead of 2.1.
[ Adnan Hodzic ]
* Added debian/patches/fix-bashism.patch (Closes: #581099)
- -- Niels Thykier <niels at thykier.net> Sat, 05 Jun 2010 16:56:57 +0200
+ [ Yulia Novozhilova ]
+ * Added the Maven POMs for libequinox-osgi.java (LP: #598039)
+ * Added a Build-Depends dependency on maven-repo-helper and maven-ant-helper
+ * Added missing recommends on libservlet2.5-java for libequinox-osgi-java.
+
+ -- Niels Thykier <niels at thykier.net> Wed, 23 Jun 2010 18:49:10 +0200
eclipse (3.5.2-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index a4c9594..6d08ea3 100644
--- a/debian/control
+++ b/debian/control
@@ -36,8 +36,10 @@ Build-Depends: ant (>= 1.7.1),
libxt-dev,
libxtst-dev,
lsb-release,
+ maven-ant-helper,
+ maven-repo-helper,
pkg-config,
- sat4j (>= 2.1.1-3),
+ sat4j (>= 2.2),
unzip,
xulrunner-dev (>= 1.9.1.3-2),
zip
@@ -129,7 +131,7 @@ Depends: ant (>= 1.7.1),
libjsch-java (>= 0.1.37-3),
liblucene2-java (>= 2.9.1+ds1-5),
libservlet2.5-java (>= 6.0.20-8),
- sat4j (>= 2.1.1-3),
+ sat4j (>= 2.2),
${misc:Depends},
${perl:Depends},
${shlibs:Depends}
@@ -239,8 +241,8 @@ Description: Eclipse Rich Client Platform (RCP)
Package: libequinox-osgi-java
Architecture: all
Section: java
-Depends: default-jre | java5-runtime | java6-runtime,
- ${misc:Depends}
+Depends: ${misc:Depends}
+Recommends: libservlet2.5-java
Conflicts: eclipse-rcp (<< 3.5.1-0ubuntu3)
Replaces: eclipse-platform-gcj,
eclipse-rcp-gcj
diff --git a/debian/patches/sat4j-version.patch b/debian/patches/sat4j-version.patch
new file mode 100644
index 0000000..ac265dd
--- /dev/null
+++ b/debian/patches/sat4j-version.patch
@@ -0,0 +1,17 @@
+Description: Loosen the version requirements for sat4j.
+Author: Niels Thykier <niels at thykier.net>
+Forwarded: Not needed.
+
+diff --git a/eclipse/plugins/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF
+index e5918c6..a9e7496 100644
+--- a/eclipse/plugins/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF
++++ b/eclipse/plugins/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF
+@@ -36,6 +36,6 @@ Eclipse-LazyStart: true
+ Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
+ J2SE-1.4
+ Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.3.0,4.0.0)",
+- org.sat4j.core;bundle-version="2.1.0",
+- org.sat4j.pb;bundle-version="2.1.0",
++ org.sat4j.core;bundle-version="[2.1.0,2.3)",
++ org.sat4j.pb;bundle-version="[2.1.0,2.3)",
+ org.eclipse.core.jobs;bundle-version="3.3.0"
diff --git a/debian/patches/series b/debian/patches/series
index 3c6dd73..d3dd12a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -19,3 +19,4 @@ fix-tooltip-color.patch
bp-hover-visability.patch
fix-bashism.patch
build-arch.patch
+sat4j-version.patch
diff --git a/debian/poms/pom-equinox-osgi.services.xml b/debian/poms/pom-equinox-osgi.services.xml
new file mode 100644
index 0000000..35820e6
--- /dev/null
+++ b/debian/poms/pom-equinox-osgi.services.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.osgi</groupId>
+ <artifactId>org.eclipse.osgi.services</artifactId>
+ <version>3.2.0</version>
+ <packaging>jar</packaging>
+ <name>Equinox OSGi framework</name>
+ <description>
+ Eclipse Equinox OSGi framework, which can be used outside Eclipse.
+ </description>
+ <url>http://freemarker.org</url>
+ <scm>
+ <url>http://www.eclipse.org/projects/project_summary.php?projectid=rt.equinox</url>
+ <connection>scm:cvs::pserver:anonymous at dev.eclipse.org:/cvsroot/rt/org.eclipse.equinox</connection>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.osgi</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
+ <version>3.5.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ </dependency>
+ </dependencies>
+ </project>
\ No newline at end of file
diff --git a/debian/poms/pom-equinox-osgi.util.xml b/debian/poms/pom-equinox-osgi.util.xml
new file mode 100644
index 0000000..3732c95
--- /dev/null
+++ b/debian/poms/pom-equinox-osgi.util.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.osgi</groupId>
+ <artifactId>org.eclipse.osgi.util</artifactId>
+ <version>3.2.0</version>
+ <packaging>jar</packaging>
+ <name>Equinox OSGi framework</name>
+ <description>
+ Eclipse Equinox OSGi framework, which can be used outside Eclipse.
+ </description>
+ <url>http://eclipse.org</url>
+ <scm>
+ <url>http://www.eclipse.org/projects/project_summary.php?projectid=rt.equinox</url>
+ <connection>scm:cvs::pserver:anonymous at dev.eclipse.org:/cvsroot/rt/org.eclipse.equinox</connection>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.osgi</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
+ <version>3.5.2</version>
+ </dependency>
+ </dependencies>
+ </project>
diff --git a/debian/poms/pom-equinox-osgi.xml b/debian/poms/pom-equinox-osgi.xml
new file mode 100644
index 0000000..696aa72
--- /dev/null
+++ b/debian/poms/pom-equinox-osgi.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.osgi</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
+ <version>3.5.2</version>
+ <packaging>jar</packaging>
+ <name>Equinox OSGi framework</name>
+ <description>
+ Eclipse Equinox OSGi framework, which can be used outside Eclipse.
+ </description>
+ <url>http://eclipse.org</url>
+ <scm>
+ <url>http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.osgi/</url>
+ <connection>scm:cvs::pserver:anonymous at dev.eclipse.org:/cvsroot/rt/org.eclipse.equinox</connection>
+ </scm>
+ <dependencies>
+ <!-- no required dependencies -->
+ </dependencies>
+ </project>
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index a11c1c6..2ac4713 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,7 @@ export PATH:=$(CURDIR)/debian/extra/bin:$(PATH)
override_dh_auto_clean:
ant distclean
+ rm -fr debian/.mh/
override_dh_auto_install:
ant install -Dprefix=/usr -DdestDir=$(CURDIR)/debian/tmp
@@ -106,6 +107,8 @@ ifeq ($(ECLIPSE_BUILD_ARCH),)
ECLIPSE_BUILD_ARCH=$(DEB_HOST_ARCH_CPU)
endif
+POMS := debian/poms/pom-equinox-osgi.xml debian/poms/pom-equinox-osgi.services.xml debian/poms/pom-equinox-osgi.util.xml
+
override_dh_install:
# Turn all following commands into patches and send them to eclipse-build
# Remove some bad arguments that causes eclipse to fail
@@ -200,6 +203,8 @@ override_dh_install:
sed -e "s/@PDEBUILDVERSION@/$(PDEBUILDVERSION)/g" -e "s:@COPY_PLATFORM@:$(COPY_PLATFORM):g" < pdebuild/eclipse-pdebuild.sh > $(PDEBUILD_INSTALL)
chmod a+x $(PDEBUILD_INSTALL)
dh_install
+ # Fix some weird exec permission
+ chmod a-x debian/eclipse-rcp/usr/lib/eclipse/about_files/IJG_README
# mv arch-indep plugins from lib to share
[ ! -d debian/eclipse-platform-data ] || (cd debian/eclipse-platform-data/usr && find lib/ -type f -path '*lib/eclipse/plugins/*' | perl ../../../debian/extra/imagemv.pl)
$(if $(wildcard debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.net.linux.*.jar),dh_install -peclipse-platform debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.net.linux.*.jar /usr/lib/eclipse/plugins)
@@ -211,3 +216,9 @@ override_dh_install:
ln -s $$FILE ; \
ln -s $$FILE `basename $$FILE | sed 's/_.*$$//g'`.jar ; \
done
+ # Install poms and jars into Maven repo
+ for pom in $(POMS); do \
+ mh_installpom -v -plibequinox-osgi-java $$pom; \
+ SUFFIX=`basename $$pom .xml | sed 's/pom-equinox-//'`; \
+ mh_installjar -v -plibequinox-osgi-java $$pom debian/libequinox-osgi-java/usr/share/java/org.eclipse.$$SUFFIX.jar; \
+ done
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF
index e5918c6..a9e7496 100644
--- a/eclipse/plugins/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF
@@ -36,6 +36,6 @@ Eclipse-LazyStart: true
Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
J2SE-1.4
Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.3.0,4.0.0)",
- org.sat4j.core;bundle-version="2.1.0",
- org.sat4j.pb;bundle-version="2.1.0",
+ org.sat4j.core;bundle-version="[2.1.0,2.3)",
+ org.sat4j.pb;bundle-version="[2.1.0,2.3)",
org.eclipse.core.jobs;bundle-version="3.3.0"
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
More information about the pkg-java-commits
mailing list