[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. debian/3.5.2-9-6-g2f5f7b8

Tue May 10 16:24:41 UTC 2011

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  2f5f7b8a4e4427bc152385662a78f9a8c2dc8abd (commit)
      from  89903042da3838e25f6a69f8bf5136271c36890f (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 2f5f7b8a4e4427bc152385662a78f9a8c2dc8abd
Author: Niels Thykier <niels at thykier.net>
Date:   Sat May 7 22:09:12 2011 +0200

    Release into unstable

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

Summary of changes:
 debian/changelog                                  |    8 +++++-
 debian/control                                    |    2 +-
 debian/eclipse-cvs.lintian-overrides              |    2 +
 debian/eclipse-jdt.lintian-overrides              |    2 +
 debian/eclipse-pde.lintian-overrides              |    2 +
 debian/eclipse-platform-data.lintian-overrides    |    1 +
 debian/eclipse-platform.lintian-overrides         |    2 +
 debian/eclipse-plugins-cvs.lintian-overrides      |    2 +
 debian/eclipse-rcp.lintian-overrides              |    2 +
 debian/patches/bp-pdebuild-fixes.patch            |   25 +++++++++++++++++++++
 debian/patches/series                             |    1 +
 patches/eclipse-pde.build-add-package-build.patch |    4 +-
 12 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 42e7eac..45ff6f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-eclipse (3.5.2-10) UNRELEASED; urgency=low
+eclipse (3.5.2-10) unstable; urgency=low
 
   [ Benjamin Drung ]
   * debian/extra/eclipse: Actually, don't export UBUNTU_MENUPROXY=0 here
@@ -9,8 +9,12 @@ eclipse (3.5.2-10) UNRELEASED; urgency=low
   * Bump ant and lucene2 (Build-)Depends. (Closes: #624213)
   * Backported patch from upstream to improve the ant 1.8.2 support in
     eclipse.
+  * Added lintian-overrides for codeless-jar and jar-no-in-usr-share,
+    as they are mostly false-positives.
+  * Backported a fix to the pdebuild script from eclipse-build.
+  * Bumped Standards-Version to 3.9.2 - no changes required.
 
- -- Benjamin Drung <bdrung at debian.org>  Sat, 26 Mar 2011 19:28:21 +0100
+ -- Niels Thykier <niels at thykier.net>  Sat, 07 May 2011 22:08:35 +0200
 
 eclipse (3.5.2-9) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index cd8472d..24708fb 100644
--- a/debian/control
+++ b/debian/control
@@ -44,7 +44,7 @@ Build-Depends: ant (>= 1.8.2),
                unzip,
                xulrunner-dev (>= 1.9.1.3-2),
                zip
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 DM-Upload-Allowed: yes
 Vcs-Git: git://git.debian.org/git/pkg-java/eclipse.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/eclipse.git
diff --git a/debian/eclipse-cvs.lintian-overrides b/debian/eclipse-cvs.lintian-overrides
new file mode 100644
index 0000000..f5463eb
--- /dev/null
+++ b/debian/eclipse-cvs.lintian-overrides
@@ -0,0 +1,2 @@
+jar-not-in-usr-share
+codeless-jar
diff --git a/debian/eclipse-jdt.lintian-overrides b/debian/eclipse-jdt.lintian-overrides
new file mode 100644
index 0000000..f5463eb
--- /dev/null
+++ b/debian/eclipse-jdt.lintian-overrides
@@ -0,0 +1,2 @@
+jar-not-in-usr-share
+codeless-jar
diff --git a/debian/eclipse-pde.lintian-overrides b/debian/eclipse-pde.lintian-overrides
new file mode 100644
index 0000000..f5463eb
--- /dev/null
+++ b/debian/eclipse-pde.lintian-overrides
@@ -0,0 +1,2 @@
+jar-not-in-usr-share
+codeless-jar
diff --git a/debian/eclipse-platform-data.lintian-overrides b/debian/eclipse-platform-data.lintian-overrides
new file mode 100644
index 0000000..8d0a4a3
--- /dev/null
+++ b/debian/eclipse-platform-data.lintian-overrides
@@ -0,0 +1 @@
+codeless-jar usr/share/eclipse/plugins/org.eclipse.core.boot_*.jar
diff --git a/debian/eclipse-platform.lintian-overrides b/debian/eclipse-platform.lintian-overrides
new file mode 100644
index 0000000..f5463eb
--- /dev/null
+++ b/debian/eclipse-platform.lintian-overrides
@@ -0,0 +1,2 @@
+jar-not-in-usr-share
+codeless-jar
diff --git a/debian/eclipse-plugins-cvs.lintian-overrides b/debian/eclipse-plugins-cvs.lintian-overrides
new file mode 100644
index 0000000..f5463eb
--- /dev/null
+++ b/debian/eclipse-plugins-cvs.lintian-overrides
@@ -0,0 +1,2 @@
+jar-not-in-usr-share
+codeless-jar
diff --git a/debian/eclipse-rcp.lintian-overrides b/debian/eclipse-rcp.lintian-overrides
new file mode 100644
index 0000000..f5463eb
--- /dev/null
+++ b/debian/eclipse-rcp.lintian-overrides
@@ -0,0 +1,2 @@
+jar-not-in-usr-share
+codeless-jar
diff --git a/debian/patches/bp-pdebuild-fixes.patch b/debian/patches/bp-pdebuild-fixes.patch
new file mode 100644
index 0000000..9d09998
--- /dev/null
+++ b/debian/patches/bp-pdebuild-fixes.patch
@@ -0,0 +1,25 @@
+Description: Backported fix for a poor comparison in pdebuild
+Origin: upstream
+
+diff --git a/patches/eclipse-pde.build-add-package-build.patch b/patches/eclipse-pde.build-add-package-build.patch
+index d141306..9565aa9 100644
+--- a/patches/eclipse-pde.build-add-package-build.patch
++++ b/patches/eclipse-pde.build-add-package-build.patch
+@@ -66,7 +66,7 @@ diff -N templates/package-build/prepare-build-dir.sh
+ +    fi
+ +
+ +    if [ "x$ERROR" != "xyes" ]; then
+-+      if [ $TESTING != true -o `echo $PROJECTNAME | grep "org.eclipse"` ]; then
+++      if [ $TESTING != true ] || echo $PROJECTNAME | grep "org.eclipse" >/dev/null 2>&1 ; then
+ +        echo "  making symlink: $BUILDDIR/features/$PROJECTNAME -> $PROJECTDIR"
+ +        ln -sfT "$PROJECTDIR" $BUILDDIR/features/"$PROJECTNAME"
+ +      fi
+@@ -100,7 +100,7 @@ diff -N templates/package-build/prepare-build-dir.sh
+ +    fi
+ +
+ +    if [ "x$ERROR" != "xyes" ]; then
+-+      if [ $TESTING != true -o `echo $PROJECTNAME | grep "org.eclipse"` ]; then
+++      if [ $TESTING != true ] || echo $PROJECTNAME | grep "org.eclipse" >/dev/null 2>&1 ; then
+ +        echo "  making symlink: $BUILDDIR/plugins/$PROJECTNAME -> $dir"
+ +        ln -sfT "$dir" $BUILDDIR/plugins/"$PROJECTNAME"
+ +      fi
diff --git a/debian/patches/series b/debian/patches/series
index 28a0bc2..8439669 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -27,3 +27,4 @@ bp-osgi-allow-illegal-os-qualifier.patch
 bp-eclipse-help-webapps-xss-BZ661901.patch
 bp-build-with-ant-1.8.2.patch
 bp-ant-1.8.2-support.patch
+bp-pdebuild-fixes.patch
diff --git a/patches/eclipse-pde.build-add-package-build.patch b/patches/eclipse-pde.build-add-package-build.patch
index d141306..9565aa9 100644
--- a/patches/eclipse-pde.build-add-package-build.patch
+++ b/patches/eclipse-pde.build-add-package-build.patch
@@ -66,7 +66,7 @@ diff -N templates/package-build/prepare-build-dir.sh
 +    fi
 +
 +    if [ "x$ERROR" != "xyes" ]; then
-+      if [ $TESTING != true -o `echo $PROJECTNAME | grep "org.eclipse"` ]; then
++      if [ $TESTING != true ] || echo $PROJECTNAME | grep "org.eclipse" >/dev/null 2>&1 ; then
 +        echo "  making symlink: $BUILDDIR/features/$PROJECTNAME -> $PROJECTDIR"
 +        ln -sfT "$PROJECTDIR" $BUILDDIR/features/"$PROJECTNAME"
 +      fi
@@ -100,7 +100,7 @@ diff -N templates/package-build/prepare-build-dir.sh
 +    fi
 +
 +    if [ "x$ERROR" != "xyes" ]; then
-+      if [ $TESTING != true -o `echo $PROJECTNAME | grep "org.eclipse"` ]; then
++      if [ $TESTING != true ] || echo $PROJECTNAME | grep "org.eclipse" >/dev/null 2>&1 ; then
 +        echo "  making symlink: $BUILDDIR/plugins/$PROJECTNAME -> $dir"
 +        ln -sfT "$dir" $BUILDDIR/plugins/"$PROJECTNAME"
 +      fi


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

