[SCM] UNNAMED PROJECT branch, master, updated. upstream/1.1.0-14-g9ac95fc

[Jakub Adam]

The following commit has been merged in the master branch:
commit cb046a40a68a28768ff33fe02d7047d097175b3a
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Thu Sep 29 21:29:31 2011 +0200

    Removed override_jh_setupenvironment from debian/rules as it is not needed
    with new upstream sources

diff --git a/debian/rules b/debian/rules
index 23416cb..24e9f72 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,18 +4,10 @@
 #       scripts and don't work otherwise.
 BUILD_OPTIONS := -DjavacTarget=1.5 -DjavacSource=1.5 -DforceContextQualifier=v20101002
 
-BUILD_DIR := $(CURDIR)/debian/.eclipse-build
 export JAVA_HOME := /usr/lib/jvm/default-java
 
 %:
 	dh $@ --with eclipse-helper
 
-override_jh_setupenvironment:
-	jh_setupenvironment
-	# Remove the UTF-8 BOM from some java files, since javac chokes on them.
-	sed -i '1 s/^\xEF\xBB\xBF//' \
-		"$(BUILD_DIR)/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/BranchSelectionDialog.java" \
-		"$(BUILD_DIR)/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/GitCloneWizard.java"
-
 override_jh_compilefeatures:
 	jh_compilefeatures --build-opts '$(BUILD_OPTIONS)'

-- 
UNNAMED PROJECT