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

[Benjamin Drung]

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  81547d0d3d2a10d4d6ca0778f09b7639a74f18eb (commit)
      from  08b3309ff2893e5c7ed757760db2aa17d688bcab (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 81547d0d3d2a10d4d6ca0778f09b7639a74f18eb
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sat Jul 10 20:09:26 2010 +0200

    Combine extra licence removal.

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

Summary of changes:
 debian/rules |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/debian/rules b/debian/rules
index 1db0228..641c535 100755
--- a/debian/rules
+++ b/debian/rules
@@ -82,7 +82,14 @@ override_dh_install:
 	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
+	rm -f debian/tmp/usr/lib/eclipse/plugins/org.apache.ant_*/about_files/LICENSE.sax.txt \
+		debian/tmp/usr/lib/eclipse/epl-v10.html \
+		debian/tmp/usr/lib/eclipse/about_files/about_cairo.html \
+		debian/tmp/usr/lib/eclipse/about_files/lgpl-v21.txt \
+		debian/tmp/usr/lib/eclipse/about_files/mpl-v11.txt \
+		debian/tmp/usr/lib/eclipse/about_files/webkit-bsd.txt \
+		debian/tmp/usr/lib/eclipse/about_files/pixman-licenses.txt \
+		debian/tmp/usr/lib/eclipse/about_files/about_cairo.html
 	# wrapper script for setting MOZILLA_FIVE_HOME
 	rm -f debian/tmp/usr/bin/eclipse
 	sed 's|@XULRUNNER_PATH@|$(XULRUNNER_PATH)|' debian/extra/eclipse > debian/tmp/usr/bin/eclipse
@@ -105,14 +112,6 @@ override_dh_install:
 	) | sed -e's,^\(.*\),[ ! -e \1 ] \&\& ln -s $$eclipse/\1 \1,' >> $(COPY_PLATFORM_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)
-	# Remove license files
-	rm -f debian/tmp/usr/lib/eclipse/epl-v10.html \
-		debian/tmp/usr/lib/eclipse/about_files/about_cairo.html \
-		debian/tmp/usr/lib/eclipse/about_files/lgpl-v21.txt \
-		debian/tmp/usr/lib/eclipse/about_files/mpl-v11.txt \
-		debian/tmp/usr/lib/eclipse/about_files/webkit-bsd.txt \
-		debian/tmp/usr/lib/eclipse/about_files/pixman-licenses.txt \
-		debian/tmp/usr/lib/eclipse/about_files/about_cairo.html
 	dh_install --list-missing
 	# Fix some weird exec permission
 	chmod a-x debian/eclipse-rcp/usr/lib/eclipse/about_files/IJG_README


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