[SCM] eclipse-mylyn - Plug-in for eclipse - Debian package. branch, master, updated. upstream/3.6.5+dfsg1-54-g4b34bff

2012-03-07 Thread Jakub Adam
The following commit has been merged in the master branch:
commit d80249a3cd9de7ea6fb48b9989223a7cc1c891f2
Author: Jakub Adam 
Date:   Wed Mar 7 17:15:00 2012 +0100

d/get-orig-source: Compress upstream tarball with bzip2

diff --git a/debian/get-orig-source b/debian/get-orig-source
index feb1fa8..0836efe 100755
--- a/debian/get-orig-source
+++ b/debian/get-orig-source
@@ -60,7 +60,7 @@ cd ../../../../..
 
 mv org.eclipse.mylyn.all $NAME-$VERSION
 
-echo "Creating tarball '${NAME}_$VERSION.orig.tar.gz'..."
-tar -czf ../${NAME}_$VERSION.orig.tar.gz $NAME-$VERSION
+echo "Creating tarball '${NAME}_$VERSION.orig.tar.bz2'..."
+tar -cjf ../${NAME}_$VERSION.orig.tar.bz2 $NAME-$VERSION
 
 rm -rf ${NAME}-${VERSION}

-- 
eclipse-mylyn - Plug-in for eclipse - Debian package.

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits


[SCM] eclipse-mylyn - Plug-in for eclipse - Debian package. branch, master, updated. upstream/3.6.5+dfsg1-54-g4b34bff

2012-03-07 Thread Jakub Adam
The following commit has been merged in the master branch:
commit 4b34bff0c4ded297e8585938d47085e6aca5164c
Author: Jakub Adam 
Date:   Wed Mar 7 17:34:37 2012 +0100

Updated version

diff --git a/debian/changelog b/debian/changelog
index 4aa912f..430620d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-eclipse-mylyn (3.6.5-1) UNRELEASED; urgency=low
+eclipse-mylyn (3.6.5+dfsg1-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #581422).
 
- -- Jakub Adam   Sun, 26 Feb 2012 10:53:56 +0100
+ -- Jakub Adam   Wed, 07 Mar 2012 17:33:00 +0100
diff --git a/debian/get-orig-source b/debian/get-orig-source
index 0836efe..e7e040d 100755
--- a/debian/get-orig-source
+++ b/debian/get-orig-source
@@ -3,6 +3,7 @@ set -e
 
 NAME=eclipse-mylyn
 VERSION=3.6.5
+DEB_VERSION=${VERSION}+dfsg1
 
 MYLYN_GIT_WEB=http://git.eclipse.org/c/mylyn/
 
@@ -60,7 +61,7 @@ cd ../../../../..
 
 mv org.eclipse.mylyn.all $NAME-$VERSION
 
-echo "Creating tarball '${NAME}_$VERSION.orig.tar.bz2'..."
-tar -cjf ../${NAME}_$VERSION.orig.tar.bz2 $NAME-$VERSION
+echo "Creating tarball '${NAME}_${DEB_VERSION}.orig.tar.bz2'..."
+tar -cjf ../${NAME}_${DEB_VERSION}.orig.tar.bz2 $NAME-$VERSION
 
 rm -rf ${NAME}-${VERSION}

-- 
eclipse-mylyn - Plug-in for eclipse - Debian package.

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits


[SCM] eclipse-mylyn - Plug-in for eclipse - Debian package. branch, master, updated. upstream/3.6.5+dfsg1-54-g4b34bff

2012-03-07 Thread Jakub Adam
The following commit has been merged in the master branch:
commit 253018fb774c6d97360c83db623f6628dd4786f4
Author: Jakub Adam 
Date:   Wed Mar 7 17:05:24 2012 +0100

d/get-orig-source: Leave changed *.zip archives uncompressed

diff --git a/debian/README.Debian-source b/debian/README.Debian-source
index 6406f96..c53040a 100644
--- a/debian/README.Debian-source
+++ b/debian/README.Debian-source
@@ -4,6 +4,8 @@ These zip archives were affected:
  
./org.eclipse.mylyn.context/org.eclipse.mylyn.context.tests/testdata/projects/project1.zip
  
./org.eclipse.mylyn.context/org.eclipse.mylyn.context.tests/testdata/projects/project2.zip
 
-Zips contain Eclipse projects, if you want to run the tests in 
org.eclipse.mylyn.context.tests,
-the archives should be unpacked, projects recompiled and compressed again. 
Directory structure
-of *.class files should be located in bin/ folder inside the archive.
+Contents of these archives are stored uncompressed in directories project1 and 
project2
+respectively. If you want to run the tests in org.eclipse.mylyn.context.tests, 
each project
+should be recompiled and compressed with zip to restore the original archive. 
Directory
+structure of *.class files should be located in bin/ folder inside the archive 
and the
+directory containing bin/ and src/ should be the root of the zip directory 
tree.
diff --git a/debian/get-orig-source b/debian/get-orig-source
index 392b06d..feb1fa8 100755
--- a/debian/get-orig-source
+++ b/debian/get-orig-source
@@ -47,7 +47,16 @@ rm -f 
org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.tests/testdata/org.eclip
 rm -rf org.eclipse.mylyn.commons/org.eclipse.mylyn.discovery.ui/lib-e3.*
 rm -rf org.eclipse.mylyn.docs/org.eclipse.mylyn.htmltext/ckeditor
 
-cd ..
+# Remove precompiled classes and CVS data from test archives, keep them 
uncompressed
+# for easier handling in version control.
+cd org.eclipse.mylyn.context/org.eclipse.mylyn.context.tests/testdata/projects
+mkdir project1 project2
+unzip project1.zip -d project1
+unzip project2.zip -d project2
+rm -rf project1/bin project2/bin project1.zip project2.zip
+find -type d -name CVS | xargs rm -r
+find -type f -name .cvsignore -delete
+cd ../../../../..
 
 mv org.eclipse.mylyn.all $NAME-$VERSION
 

-- 
eclipse-mylyn - Plug-in for eclipse - Debian package.

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits


[SCM] eclipse-mylyn - Plug-in for eclipse - Debian package. branch, master, updated. upstream/3.6.5+dfsg1-54-g4b34bff

2012-03-07 Thread Jakub Adam
The following commit has been merged in the master branch:
commit 0b1a992f6946c6bbeb666f4ce2637a0110677571
Merge: d80249a3cd9de7ea6fb48b9989223a7cc1c891f2 
b5047a5c7167a033db560ae167f1109204d46283
Author: Jakub Adam 
Date:   Wed Mar 7 17:32:01 2012 +0100

Merge tag 'upstream/3.6.5+dfsg1'

Upstream version 3.6.5 (keep changed archives uncompressed)


-- 
eclipse-mylyn - Plug-in for eclipse - Debian package.

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits