[SCM] eclipse - Powerful IDE written in java - Debian package. branch, ubuntu, updated. 779e5f8284b419ac712e7d867b805b39dd6349e0

[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, ubuntu has been updated
       via  779e5f8284b419ac712e7d867b805b39dd6349e0 (commit)
      from  6a5c84f3fd5506f6451ce65beb39a337b8bcd9e0 (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 779e5f8284b419ac712e7d867b805b39dd6349e0
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sat Oct 17 14:42:52 2009 +0200

    Create reletive links with imagemv.

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

Summary of changes:
 debian/extra/imagemv.sh |   20 +++++++++++---------
 debian/rules            |    2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/debian/extra/imagemv.sh b/debian/extra/imagemv.sh
index b75dc18..4a831b9 100755
--- a/debian/extra/imagemv.sh
+++ b/debian/extra/imagemv.sh
@@ -1,12 +1,14 @@
 #!/bin/sh
 set -e
 
-DESTDIR=debian/tmp
-LINK_NAME=`echo $1 | sed "s@${DESTDIR}@@g"`
-IMAGE_NAME=`echo ${LINK_NAME} | sed "s@/usr/lib/@/usr/share/@g"`
-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}"
+# You must be in the destDir/prefix directory!
+
+LINK_NAME=$(echo $1 | sed "s@^./@@")
+
+IMAGE_NAME=$(echo ${LINK_NAME} | sed "s at lib/@share/@g")
+IMAGE_DIR=$(dirname ${IMAGE_NAME})
+LINK_DEST=$(dirname ${LINK_NAME} | sed "s|[^/]*|..|g")/${IMAGE_NAME}
+
+mkdir -p "${IMAGE_DIR}"
+mv "${LINK_NAME}" "${IMAGE_NAME}"
+ln -sf "${LINK_DEST}" "${LINK_NAME}"
diff --git a/debian/rules b/debian/rules
index 06808c7..30198be 100755
--- a/debian/rules
+++ b/debian/rules
@@ -95,7 +95,7 @@ debian-install-stamp:
 	@echo "*** debian-install-stamp ***"
 	dh_testdir
 	# move images from /usr/lib to /usr/share
-	find debian/tmp/usr/lib/ -type f \( -name '*.bmp' -o -name '*.gif' -o -name '*.jpg' -o -name '*.png' \) -exec sh debian/extra/imagemv.sh '{}' \;
+	cd debian/tmp/usr && find lib/ -type f \( -name '*.bmp' -o -name '*.gif' -o -name '*.jpg' -o -name '*.png' \) -exec sh ../../../debian/extra/imagemv.sh '{}' \;
 	rm -fr $(DEBIAN_PACK_LIBDIR)/p2/
 	# Generate metadata and extract the swt libraries.
 	cd $(DEB_DESTDIR) && java \


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