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

[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  23b5e183376b7334c16770ee1d4c0e9ba567eb42 (commit)
       via  3fe019d7829a09a0808d46351b58449849950c54 (commit)
      from  fa87ec200a685740519ede7d3c388350800c2088 (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 23b5e183376b7334c16770ee1d4c0e9ba567eb42
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Fri Feb 26 17:46:42 2010 +0100

    Create system-jars.patch for missing bits.

commit 3fe019d7829a09a0808d46351b58449849950c54
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Fri Feb 26 17:42:16 2010 +0100

    Refresh create-source-tarballs script.

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

Summary of changes:
 debian/extra/create-source-tarballs |   10 ++++++++--
 debian/patches/series               |    1 +
 debian/patches/system-jars.patch    |   22 ++++++++++++++++++++++
 dependencies.properties             |    6 +++---
 4 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/debian/extra/create-source-tarballs b/debian/extra/create-source-tarballs
index 3585851..ccd9382 100755
--- a/debian/extra/create-source-tarballs
+++ b/debian/extra/create-source-tarballs
@@ -1,10 +1,14 @@
 #!/bin/sh
 set -e
 
-git co master
+CURRENT_BRANCH=$(git branch -a | grep "^*" | sed "s/\* //")
+
+if test "$CURRENT_BRANCH" != master; then
+	git checkout master
+fi
 VERSION=$(dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ' | sed 's/-[^-]*$//')
 
-git co upstream
+git checkout upstream
 
 if test ! -f ../eclipse_${VERSION}.orig.tar.gz; then
 	tar -c . --exclude-vcs --exclude ./eclipse --transform="s@^. at eclipse-build@" | gzip -cn9 > ../eclipse_${VERSION}.orig.tar.gz
@@ -13,3 +17,5 @@ fi
 if test ! -f ../eclipse_${VERSION}.orig-eclipse.tar.bz2; then
 	tar -ca -f ../eclipse_${VERSION}.orig-eclipse.tar.bz2 eclipse --transform="s/^eclipse/eclipse-${VERSION}/"
 fi
+
+git checkout $CURRENT_BRANCH
diff --git a/debian/patches/series b/debian/patches/series
index 9c7202a..ff592e0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ lucene.patch
 eclipse-manpage.patch
 pdebuild-script.patch
 pdebuild-path-copy-platform.patch
+system-jars.patch
diff --git a/debian/patches/system-jars.patch b/debian/patches/system-jars.patch
new file mode 100644
index 0000000..6fdea06
--- /dev/null
+++ b/debian/patches/system-jars.patch
@@ -0,0 +1,22 @@
+Description: Add Debians search location
+Author: Benjamin Drung <bdrung at ubuntu.com>
+Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=280688
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/453036
+
+Index: eclipse-build/dependencies.properties
+===================================================================
+--- eclipse-build/dependencies.properties	(Revision 24287)
++++ eclipse-build/dependencies.properties	(Arbeitskopie)
+@@ -10,8 +10,8 @@
+ org.apache.lucene_1.9.1.v20080530-1600.jar=/usr/share/java/lucene.jar:/usr/share/java/lucene-core.jar
+ org.apache.lucene.analysis_1.9.1.v20080530-1600.jar=/usr/share/java/lucene-contrib/lucene-analyzers.jar:/usr/share/java/lucene-analyzers.jar
+ org.hamcrest.core_1.1.0.v20090501071000.jar=/usr/share/java/hamcrest/core.jar:/usr/share/java/hamcrest-core.jar
+-org.mortbay.jetty.server_6.1.15.v200905151201.jar=/usr/share/java/jetty/jetty-6.1.20.jar:/usr/share/java/jetty/jetty.jar
+-org.mortbay.jetty.util_6.1.15.v200905182336.jar=/usr/share/java/jetty/jetty-util-6.1.20.jar:/usr/share/java/jetty/jetty-util.jar
++org.mortbay.jetty.server_6.1.15.v200905151201.jar=/usr/share/java/jetty/jetty-6.1.20.jar:/usr/share/java/jetty/jetty.jar:/usr/share/java/jetty.jar
++org.mortbay.jetty.util_6.1.15.v200905182336.jar=/usr/share/java/jetty/jetty-util-6.1.20.jar:/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty-util.jar
+ org.objectweb.asm_3.1.0.v200803061910.jar=/usr/share/java/objectweb-asm/asm-all.jar:/usr/share/java/asm3-all.jar
+ org.sat4j.core_2.1.1.v20090825.jar=/usr/share/java/org.sat4j.core.jar:/usr/share/sat4j/org.sat4j.core.jar
+-org.sat4j.pb_2.1.1.v20090825.jar=/usr/share/java/org.sat4j.pb.jar:/usr/share/sat4j/org.sat4j.pb.jar
+\ No newline at end of file
++org.sat4j.pb_2.1.1.v20090825.jar=/usr/share/java/org.sat4j.pb.jar:/usr/share/sat4j/org.sat4j.pb.jar
diff --git a/dependencies.properties b/dependencies.properties
index 0a61a75..dcfe9a7 100644
--- a/dependencies.properties
+++ b/dependencies.properties
@@ -10,8 +10,8 @@ org.apache.jasper_5.5.17.v200903231320.jar=/usr/share/eclipse/plugins/org.apache
 org.apache.lucene_1.9.1.v20080530-1600.jar=/usr/share/java/lucene.jar:/usr/share/java/lucene-core.jar
 org.apache.lucene.analysis_1.9.1.v20080530-1600.jar=/usr/share/java/lucene-contrib/lucene-analyzers.jar:/usr/share/java/lucene-analyzers.jar
 org.hamcrest.core_1.1.0.v20090501071000.jar=/usr/share/java/hamcrest/core.jar:/usr/share/java/hamcrest-core.jar
-org.mortbay.jetty.server_6.1.15.v200905151201.jar=/usr/share/java/jetty/jetty-6.1.20.jar:/usr/share/java/jetty/jetty.jar
-org.mortbay.jetty.util_6.1.15.v200905182336.jar=/usr/share/java/jetty/jetty-util-6.1.20.jar:/usr/share/java/jetty/jetty-util.jar
+org.mortbay.jetty.server_6.1.15.v200905151201.jar=/usr/share/java/jetty/jetty-6.1.20.jar:/usr/share/java/jetty/jetty.jar:/usr/share/java/jetty.jar
+org.mortbay.jetty.util_6.1.15.v200905182336.jar=/usr/share/java/jetty/jetty-util-6.1.20.jar:/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty-util.jar
 org.objectweb.asm_3.1.0.v200803061910.jar=/usr/share/java/objectweb-asm/asm-all.jar:/usr/share/java/asm3-all.jar
 org.sat4j.core_2.1.1.v20090825.jar=/usr/share/java/org.sat4j.core.jar:/usr/share/sat4j/org.sat4j.core.jar
-org.sat4j.pb_2.1.1.v20090825.jar=/usr/share/java/org.sat4j.pb.jar:/usr/share/sat4j/org.sat4j.pb.jar
\ No newline at end of file
+org.sat4j.pb_2.1.1.v20090825.jar=/usr/share/java/org.sat4j.pb.jar:/usr/share/sat4j/org.sat4j.pb.jar


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