[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. bebf9508dba649a69d8a80a1a80582f0d0b29ff8

[Niels Thykier]

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  bebf9508dba649a69d8a80a1a80582f0d0b29ff8 (commit)
       via  1b3c33b1129c296b4779e117b097a045edc40aec (commit)
      from  d18e99b78eaa5f49716535de815e9432eca561fb (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 bebf9508dba649a69d8a80a1a80582f0d0b29ff8
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Oct 10 11:50:00 2009 +0200

    Added exclude_pattern for grep to reduce errors.

commit 1b3c33b1129c296b4779e117b097a045edc40aec
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Oct 10 11:49:00 2009 +0200

    Removed some unused args in imagemv.sh.

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

Summary of changes:
 debian/exclude_patterns.txt                   |    4 ++++
 debian/extra/imagemv.sh                       |    4 ++--
 debian/{patterns.txt => extract_patterns.txt} |    0
 debian/rules                                  |    8 ++++----
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/debian/exclude_patterns.txt b/debian/exclude_patterns.txt
new file mode 100644
index 0000000..f5fb22d
--- /dev/null
+++ b/debian/exclude_patterns.txt
@@ -0,0 +1,4 @@
+*.png
+*.gif
+*.jpg
+*.bmp
diff --git a/debian/extra/imagemv.sh b/debian/extra/imagemv.sh
index b75dc18..99260dd 100755
--- a/debian/extra/imagemv.sh
+++ b/debian/extra/imagemv.sh
@@ -8,5 +8,5 @@ IMAGE_DIR=`dirname ${IMAGE_NAME}`
 
 mkdir -p "${DESTDIR}${IMAGE_DIR}"
 rm -f "${DESTDIR}${IMAGE_NAME}"
-mv -vf "${DESTDIR}${LINK_NAME}" "${DESTDIR}${IMAGE_NAME}"
-ln -sf "${IMAGE_NAME}" "${DESTDIR}${LINK_NAME}"
+mv "${DESTDIR}${LINK_NAME}" "${DESTDIR}${IMAGE_NAME}"
+ln -s "${IMAGE_NAME}" "${DESTDIR}${LINK_NAME}"
diff --git a/debian/patterns.txt b/debian/extract_patterns.txt
similarity index 100%
rename from debian/patterns.txt
rename to debian/extract_patterns.txt
diff --git a/debian/rules b/debian/rules
index 3db6222..df02a44 100755
--- a/debian/rules
+++ b/debian/rules
@@ -119,7 +119,7 @@ debian-install-stamp:
 			-metadataRepository file:$(DEBIAN_PACK_LIBDIR)/metadata \
 			-artifactRepository file:$(DEBIAN_PACK_LIBDIR)/metadata \
 			-application org.eclipse.equinox.initializer.configInitializer \
-			-fileInitializer $(CURDIR)/debian/patterns.txt
+			-fileInitializer $(CURDIR)/debian/extract_patterns.txt
 	# Copy SWT *.so files
 	mkdir -p $(DEB_DESTDIR)usr/lib/jni
 	cp $(SOURCE_DIR)/plugins/org.eclipse.swt.gtk.linux.$(ECLIPSE_BUILD_ARCH)/*.so $(DEB_DESTDIR)usr/lib/jni
@@ -128,11 +128,11 @@ debian-install-stamp:
 	mkdir -p $(DEB_DESTDIR)usr/lib/java
 	cp $(SOURCE_DIR)/plugins/org.eclipse.swt.gtk.linux.$(ECLIPSE_BUILD_ARCH)/swt.jar \
 		$(DEB_DESTDIR)usr/lib/java/swt-gtk-3.5.jar
-	# Die friend of the old ages.
 	rm -f debian/*/usr/lib/eclipse/configuration/org.eclipse.osgi/bundles/*/1/.cp/libswt-mozilla-gcc3-gtk-*.so
 	# Normalize the paths.
-	grep -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 -l -I -r debian_tmp debian/tmp/ | xargs sed -i s@$${TO_CORRECT}@@g
+	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
 	# wrapper script for setting LD_LIBRARY_PATH


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