[SCM] eclipse-cdt - Plug-in for eclipse to handle C/C++ - Debian package. branch, master, updated. upstream/8.0.0-60-g577385c

[Jakub Adam]

The following commit has been merged in the master branch:
commit 474eeeb5819b951d4f18db2813cd9bb34df532d1
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Fri Sep 30 18:30:44 2011 +0200

    Install features and plugins to /usr/share/eclipse/dropins

diff --git a/debian/imagemv.pl b/debian/imagemv.pl
deleted file mode 100755
index 0138393..0000000
--- a/debian/imagemv.pl
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use warnings;
-
-my $dryrun = defined($ARGV[0]) && $ARGV[0] eq '--dry-run';
-
-while( my $image = <STDIN> ){
-    my $des;
-    my $desdir;
-    my $relpath;
-    my $linktarget;
-    chomp($image);
-    if( -l $image ){
-	# already a link - not touching
-	next;
-    }
-    if( ! -e $image ){
-	choke("Cannot \"mv + ln\" $image: it does not exists.");
-    }
-    # Remove the leading ./ (from find output).
-    $image =~ s@^./@@o;
-    $des = $image;
-    $des =~ s at lib/@share/@o;
-    if($des =~ m at eclipse/features/@o){
-	# They have some names that changes based on arch/build/something.
-	# So we will just remove that so the link is always correct.
-	# e.g. 
-	#   org.eclipse.help_1.1.1.R35x_v20090811-7e7eFAnFEx2XZoYwvOe8duD
-	# becomes
-	#   org.eclipse.help_1.1.1.R35x_v20090811
-	$des =~ s@(_v\d{8})-[^/]++@$1 at o;
-    }
-    $desdir = $des;
-    # Remove the last part (the name of the file)
-    $desdir =~ s@[^/]++$@@o;
-    $relpath = $desdir;
-    # Replace path parts with ".."
-    $relpath =~ s@[^/]++ at ..@go;
-    # concat with the original target and we have
-    # the relative link - There is no / in between
-    # because $relpath already contains it.
-    $linktarget = "$relpath$des";
-    if($dryrun){
-	print "mkdir -p \"$desdir\" && mv -f \"$image\" \"$des\" && ln -s \"$linktarget\" \"$image\"\n";
-    } else {
-	system("mkdir -p \"$desdir\" && mv -f \"$image\" \"$des\" && ln -s \"$linktarget\" \"$image\"") == 0
-	    or choke("Could not complete link of $image.");
-    }
-}
-
-sub choke{
-    my $msg = shift;
-    print STDERR "$msg\n";
-    exit(1);
-}
diff --git a/debian/rules b/debian/rules
index a6eb324..44a7a35 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,9 +49,10 @@ override_dh_install:
 
 override_jh_installeclipse:
 	jh_installeclipse
-	rm -fr debian/eclipse-cdt/usr/lib/eclipse/dropins/cdt/eclipse/plugins/org.eclipse.cdt.platform.source_*/src/org.eclipse.cdt.ui_*/about_files/
-	cd debian/eclipse-cdt/usr && \
-		find lib/ -type f \( -name '*.bmp' -o -name '*.gif' -o -name '*.jpg' -o -name '*.png' \) | perl ../../../debian/imagemv.pl
+	mkdir -p debian/eclipse-cdt/usr/share/eclipse/dropins
+	mv debian/eclipse-cdt/usr/lib/eclipse/dropins/cdt debian/eclipse-cdt/usr/share/eclipse/dropins
+	rm -rf debian/eclipse-cdt/usr/lib/eclipse
+	rm -f debian/eclipse-cdt/usr/share/eclipse/dropins/cdt/eclipse/plugins/org.eclipse.cdt.launch.remote.source*.jar
 
 get-orig-source:
 	debian/fetch-cdt.sh

-- 
eclipse-cdt - Plug-in for eclipse to handle C/C++ - Debian package.