[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.6, updated. eclipse-ppa/maverick-121-g586c801

Sun Jul 11 00:14:44 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-3.6 has been updated
       via  586c801e016ce811d07fa5bb840d98228029cf82 (commit)
       via  b6644ea41047883fb4c3e53f4cdd159d3356da69 (commit)
      from  81547d0d3d2a10d4d6ca0778f09b7639a74f18eb (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 586c801e016ce811d07fa5bb840d98228029cf82
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sun Jul 11 02:14:22 2010 +0200

    Forward a bunch of patches upstream.

commit b6644ea41047883fb4c3e53f4cdd159d3356da69
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sun Jul 11 01:40:18 2010 +0200

    Move destDir removal from debian/rules into build.xml.

-----------------------------------------------------------------------

Summary of changes:
 debian/exclude_patterns.txt                        |    4 ---
 debian/patches/compile-IPluginDescriptor.patch     |    2 +-
 debian/patches/compile-jarinjarloader.patch        |    2 +-
 debian/patches/fix-bashism.patch                   |    1 +
 ...nerate-metadata-and-extract-swt-libraries.patch |    1 +
 debian/patches/osgi-services-symlink-javax.patch   |    2 +-
 debian/patches/remove-unnecessary-files.patch      |    1 +
 debian/patches/series                              |    1 +
 debian/patches/strip-destDir.patch                 |   25 ++++++++++++++++++++
 debian/rules                                       |    4 ---
 10 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/debian/exclude_patterns.txt b/debian/exclude_patterns.txt
deleted file mode 100644
index f5fb22d..0000000
--- a/debian/exclude_patterns.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-*.png
-*.gif
-*.jpg
-*.bmp
diff --git a/debian/patches/compile-IPluginDescriptor.patch b/debian/patches/compile-IPluginDescriptor.patch
index e8c3488..0ae3961 100644
--- a/debian/patches/compile-IPluginDescriptor.patch
+++ b/debian/patches/compile-IPluginDescriptor.patch
@@ -1,6 +1,6 @@
 Description: Compiles IPluginDescriptor from source.
 From: Niels Thykier <niels at thykier.net>
-Forwarded: no
+Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=319478
 
 --- a/build.xml
 +++ b/build.xml
diff --git a/debian/patches/compile-jarinjarloader.patch b/debian/patches/compile-jarinjarloader.patch
index 4314d8f..9a168ad 100644
--- a/debian/patches/compile-jarinjarloader.patch
+++ b/debian/patches/compile-jarinjarloader.patch
@@ -1,6 +1,6 @@
 Description: Regenerates the jar-in-jar-loader.zip file from source.
 From: Niels Thykier <niels at thykier.net>
-Forwarded: no
+Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=319476
 
 --- a/build.xml
 +++ b/build.xml
diff --git a/debian/patches/fix-bashism.patch b/debian/patches/fix-bashism.patch
index 81ed776..32f6ab9 100644
--- a/debian/patches/fix-bashism.patch
+++ b/debian/patches/fix-bashism.patch
@@ -1,5 +1,6 @@
 From: Adnan Hodzic <adnan at foolcontrol.org>
 Subject: Fix bashisms in Eclipse (in /bin/sh scripts)
+Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=319474
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=581099
 Last-Update: 2010-06-18
 
diff --git a/debian/patches/generate-metadata-and-extract-swt-libraries.patch b/debian/patches/generate-metadata-and-extract-swt-libraries.patch
index 0f98646..0a57a6d 100644
--- a/debian/patches/generate-metadata-and-extract-swt-libraries.patch
+++ b/debian/patches/generate-metadata-and-extract-swt-libraries.patch
@@ -1,6 +1,7 @@
 Description: Generate metadata and extract the swt libraries
  This patch moved the calls from debian/rules into the build.xml file.
 From: Benjamin Drung <bdrung at ubuntu.com>
+Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=319473
 
 --- a/build.xml
 +++ b/build.xml
diff --git a/debian/patches/osgi-services-symlink-javax.patch b/debian/patches/osgi-services-symlink-javax.patch
index 65767c9..d55de68 100644
--- a/debian/patches/osgi-services-symlink-javax.patch
+++ b/debian/patches/osgi-services-symlink-javax.patch
@@ -1,6 +1,6 @@
 Description: Add javax to org.eclipse.osgi.services
 From: Benjamin Drung <bdrung at ubuntu.com>
-Forwarded: No
+Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=304710
 
 --- a/build.xml
 +++ b/build.xml
diff --git a/debian/patches/remove-unnecessary-files.patch b/debian/patches/remove-unnecessary-files.patch
index ccf1ba5..6cb8618 100644
--- a/debian/patches/remove-unnecessary-files.patch
+++ b/debian/patches/remove-unnecessary-files.patch
@@ -1,5 +1,6 @@
 Description: Remove unnecessary configuration data and metadata
 From: Benjamin Drung <bdrung at ubuntu.com>
+Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=319473
 
 --- a/build.xml
 +++ b/build.xml
diff --git a/debian/patches/series b/debian/patches/series
index d125375..5847c1b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@ symlink-system-files.patch
 disable-logging.patch
 generate-metadata-and-extract-swt-libraries.patch
 remove-unnecessary-files.patch
+strip-destDir.patch
diff --git a/debian/patches/strip-destDir.patch b/debian/patches/strip-destDir.patch
new file mode 100644
index 0000000..73f72c8
--- /dev/null
+++ b/debian/patches/strip-destDir.patch
@@ -0,0 +1,25 @@
+Description: Strip ${destDir} from path
+From: Benjamin Drung <bdrung at ubuntu.com>
+Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=319473
+
+--- a/build.xml
++++ b/build.xml
+@@ -917,6 +917,18 @@
+ 		<delete dir="${destDir}/${prefix}/${libDir}/eclipse/metadata/binary" />
+ 		<delete dir="${destDir}/${prefix}/${libDir}/eclipse/metadata/features" />
+ 		<delete dir="${destDir}/${prefix}/${libDir}/eclipse/metadata/plugins" />
++		<!-- Strip ${destDir} from path -->
++		<apply executable="sed" failonerror="true" verbose="true">
++			<arg value="-i" />
++			<arg value="s@${destDir}@@g" />
++			<srcfile />
++			<fileset dir="${destDir}/${prefix}/${libDir}/eclipse">
++				<include name="metadata/content.xml" />
++				<include name="p2/org.eclipse.equinox.p2.engine/.settings/org.eclipse.equinox.p2.metadata.repository.prefs" />
++				<include name="p2/org.eclipse.equinox.p2.engine/.settings/org.eclipse.equinox.p2.artifact.repository.prefs" />
++				<include name="eclipse.ini" />
++			</fileset>
++		</apply>
+ 		<!-- Move config file to /etc -->
+ 		<mkdir dir="${destDir}/etc" />
+ 		<move file="${destDir}${prefix}/${libDir}/eclipse/eclipse.ini" tofile="${destDir}/etc/eclipse.ini" />
diff --git a/debian/rules b/debian/rules
index 641c535..82a103c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -77,10 +77,6 @@ override_dh_install:
 	# Turn all following commands into patches and send them to eclipse-build
 	# move images from /usr/lib to /usr/share
 	cd debian/tmp/usr && find lib/ -type f \( -name '*.bmp' -o -name '*.gif' -o -name '*.jpg' -o -name '*.png' \) | perl ../../../debian/extra/imagemv.pl
-	# Normalize the paths.
-	grep --exclude-from=debian/exclude_patterns.txt -l -I -r debian/tmp debian/tmp/ | xargs sed -i s@$(CURDIR)/debian/tmp@@g
-	TO_CORRECT=`echo $(CURDIR)/debian/tmp | sed s@/@_ at g` ; grep --exclude-from=debian/exclude_patterns.txt \
-	        -l -I -r debian_tmp debian/tmp/ | xargs sed -i s@$${TO_CORRECT}@@g
 	# remove extra licence file
 	rm -f debian/tmp/usr/lib/eclipse/plugins/org.apache.ant_*/about_files/LICENSE.sax.txt \
 		debian/tmp/usr/lib/eclipse/epl-v10.html \


hooks/post-receive
-- 
eclipse - Powerful IDE written in java - Debian package.

