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

[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 has been updated
       via  44eee3ad7517c621de14459972090fddf0f1bb79 (commit)
       via  2d1a11574187381242b9fa5d5de409b027290e49 (commit)
      from  7a3c93d34575095837a3383c6f4dac13d83620bb (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 44eee3ad7517c621de14459972090fddf0f1bb79
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sat Oct 17 13:23:15 2009 +0200

    The Debian upstream version differs from the real upstream version.

commit 2d1a11574187381242b9fa5d5de409b027290e49
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sat Oct 17 13:22:22 2009 +0200

    Create reletive links with imagemv.

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

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

diff --git a/debian/extra/imagemv.sh b/debian/extra/imagemv.sh
index 99260dd..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 "${DESTDIR}${LINK_NAME}" "${DESTDIR}${IMAGE_NAME}"
-ln -s "${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 e2b6e7b..f90d6dd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -89,13 +89,14 @@ PROFILE_ID := PlatformProfile
 common-install-impl:: debian-install-stamp
 
 LAUNCHERVERSION = $(shell ls $(DEBIAN_PACK_LIBDIR)/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//')
+UPSTREAM_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed "s/+repack.*$//")
 
 ## This target does not work yet.
 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 \
@@ -108,7 +109,7 @@ debian-install-stamp:
 			-artifactRepository file:$(DEBIAN_PACK_LIBDIR)/metadata/ \
 			-source $(DEBIAN_PACK_LIBDIR) \
 			-root "Eclipse Platform" \
-			-rootVersion $(DEB_UPSTREAM_VERSION) \
+			-rootVersion $(UPSTREAM_VERSION) \
 			-flavor tooling \
 			-publishArtifacts \
 			-data $(CURDIR)/workspace \


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