[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. debian/3.8.0_rc4-1-5-g5bf66e3
Jakub Adam
jakub.adam at ktknet.cz
Sun Oct 7 21:56:55 UTC 2012
The following commit has been merged in the master branch:
commit 5bf66e3ae5eb395c47477f04b96d6e717de12776
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Sun Oct 7 17:42:09 2012 +0200
Don't let patches delete files
Works around dpkg bug #683547.
diff --git a/debian/changelog b/debian/changelog
index fa39d2c..064257b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ eclipse (3.8.0~rc4-2) UNRELEASED; urgency=low
* Update extended description of eclipse-platform-data (Closes: #679423).
* Fix libgnomeproxy compilation with glib >= 2.32 (Closes: #679328).
* Expose org.eclipse.jface and its dependencies in /usr/share/java.
+ * Don't let patches delete files.
+ - Works around dpkg bug #683547.
+ - Affected patches are use-deb-build-compiler-flags.patch and
+ find-tomcat-libs.patch.
-- Jakub Adam <jakub.adam at ktknet.cz> Sat, 30 Jun 2012 21:07:01 +0200
diff --git a/debian/patches/find-tomcat-libs.patch b/debian/patches/find-tomcat-libs.patch
index da613bd..fceb053 100644
--- a/debian/patches/find-tomcat-libs.patch
+++ b/debian/patches/find-tomcat-libs.patch
@@ -3,15 +3,13 @@ Date: Thu, 15 Mar 2012 21:02:03 +0100
Subject: find-tomcat-libs
---
- dependencies/dependencies.properties | 15 ++++++-----
- .../META-INF/MANIFEST.MF | 12 +++++++++
+ dependencies/dependencies.properties | 15 ++++++------
+ .../META-INF/MANIFEST.MF | 12 ++++++++++
.../META-INF/MANIFEST.MF | 25 ++++++++++++++++++++
- .../META-INF/MANIFEST.MF | 12 ---------
patches/eclipse-equinox-jsp-jasper.patch | 2 +-
- 5 files changed, 46 insertions(+), 20 deletions(-)
+ 4 files changed, 46 insertions(+), 8 deletions(-)
create mode 100644 dependencyManifests/org.apache.tomcat.api_7.0.21.jar/META-INF/MANIFEST.MF
create mode 100644 dependencyManifests/org.apache.tomcat.util_7.0.26.jar/META-INF/MANIFEST.MF
- delete mode 100644 dependencyManifests/org.apache.tomcat_7.0.21.jar/META-INF/MANIFEST.MF
diff --git a/dependencies/dependencies.properties b/dependencies/dependencies.properties
index 96a827f..b7f5ce0 100644
@@ -95,24 +93,6 @@ index 0000000..3adac60
+Specification-Version: 7.0
+
+
-diff --git a/dependencyManifests/org.apache.tomcat_7.0.21.jar/META-INF/MANIFEST.MF b/dependencyManifests/org.apache.tomcat_7.0.21.jar/META-INF/MANIFEST.MF
-deleted file mode 100644
-index 3522c72..0000000
---- a/dependencyManifests/org.apache.tomcat_7.0.21.jar/META-INF/MANIFEST.MF
-+++ /dev/null
-@@ -1,12 +0,0 @@
--Manifest-Version: 1.0
--Export-Package: org.apache.tomcat;version="7.0.21"
--Bundle-Vendor: %bundleProvider
--Bundle-ClassPath: .
--Bundle-Version: 7.0.21
--Bundle-Name: %bundleName
--Bundle-Localization: plugin
--Bundle-ManifestVersion: 2
--Bundle-SymbolicName: org.apache.tomcat
--Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J
-- 2SE-1.3
--
diff --git a/patches/eclipse-equinox-jsp-jasper.patch b/patches/eclipse-equinox-jsp-jasper.patch
index ed0a96e..a9db712 100644
--- a/patches/eclipse-equinox-jsp-jasper.patch
diff --git a/debian/patches/use-deb-build-compiler-flags.patch b/debian/patches/use-deb-build-compiler-flags.patch
index 1c5a409..e1c83e7 100644
--- a/debian/patches/use-deb-build-compiler-flags.patch
+++ b/debian/patches/use-deb-build-compiler-flags.patch
@@ -3,16 +3,14 @@ Date: Thu, 7 Jun 2012 21:58:11 +0200
Subject: use-deb-build-compiler-flags
---
- build.xml | 2 +-
- .../library/gtk/make_linux.mak | 6 +--
- .../natives/unix/linux/Makefile | 6 +--
- .../natives/unix/linux/makefile | 8 ++--
- .../natives/unix/linux/x86_64/makefile | 48 --------------------
- 5 files changed, 11 insertions(+), 59 deletions(-)
- delete mode 100644 eclipse/plugins/org.eclipse.core.net/natives/unix/linux/x86_64/makefile
+ build.xml | 2 +-
+ .../org.eclipse.equinox.executable/library/gtk/make_linux.mak | 6 +++---
+ .../org.eclipse.core.filesystem/natives/unix/linux/Makefile | 6 +++---
+ .../plugins/org.eclipse.core.net/natives/unix/linux/makefile | 8 ++++----
+ 4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/build.xml b/build.xml
-index c62b934..da09fbf 100644
+index e511148..1d65b7b 100644
--- a/build.xml
+++ b/build.xml
@@ -352,7 +352,7 @@
@@ -87,58 +85,3 @@ index 0aa0cbe..6f78532 100644
all: link
-diff --git a/eclipse/plugins/org.eclipse.core.net/natives/unix/linux/x86_64/makefile b/eclipse/plugins/org.eclipse.core.net/natives/unix/linux/x86_64/makefile
-deleted file mode 100644
-index 407f9c5..0000000
---- a/eclipse/plugins/org.eclipse.core.net/natives/unix/linux/x86_64/makefile
-+++ /dev/null
-@@ -1,48 +0,0 @@
--#**********************************************************************
--# Copyright (c) 2008, 2010 Oakland Software Incorporated and others.
--# All rights reserved. This program and the accompanying materials
--# are made available under the terms of the Eclipse Public License v1.0
--# which accompanies this distribution, and is available at
--# http://www.eclipse.org/legal/epl-v10.html
--#
--# Contributors:
--# Oakland Software Incorporated - initial submission
--# IBM Corporation - refactoring, bug 245849
--# Tristan Tarrant - x86_64 support, bug 273072
--#
--#**********************************************************************
--#
--# makefile for libgnomeproxy-1.0.0.so
--
--GNOMEPROXY.C = ../../gnomeproxy.c
--GNOMEPROXY.O = gnomeproxy.o
--LIB_NAME = gnomeproxy.so
--LIB_NAME_FULL = libgnomeproxy-1.0.0.so
--
--OS_TYPE =
--JDK_INCLUDE = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OS_TYPE}
--INCLUDE = `pkg-config --cflags gconf-2.0`
--COMPILER_FLAGS= -O0 -fPIC -g3 -Wall -c -fmessage-length=0 -m64
--
--LIBS := `pkg-config --libs gconf-2.0`
--LINKER_FLAGS= -m64
--
--all: link
--
--compile:
-- @echo "Building file: $(GNOMEPROXY.O)"
-- @echo "Invoking: GCC C Compiler"
-- gcc $(INCLUDE) $(JDK_INCLUDE) $(COMPILER_FLAGS) -o $(GNOMEPROXY.O) $(GNOMEPROXY.C)
-- @echo "Finished building: $(GNOMEPROXY.O)"
-- @echo " "
--
--link: compile
-- @echo "Building target: $(LIB_NAME_FULL)"
-- @echo "Invoking: GCC C Linker"
-- gcc $(LINKER_FLAGS) -shared -Wl,-soname,$(LIB_NAME) -o $(LIB_NAME_FULL) $(LIBS) $(GNOMEPROXY.O) -lc
-- @echo "Finished building target: $(LIB_NAME_FULL)"
-- @echo " "
--
--clean:
-- -$(RM) $(GNOMEPROXY.O) $(LIB_NAME_FULL)
-- - at echo " "
-\ No newline at end of file
--
eclipse - Powerful IDE written in java - Debian package.
More information about the pkg-java-commits
mailing list