This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository ecj.
commit e9345f0ed426513ad18b9eba78ad2fd0876ee0d0 Author: Emmanuel Bourg <[email protected]> Date: Tue Mar 27 15:28:09 2018 +0200 Download the upstream tarball with uscan and preserve the upstream project structure (minus the tests) --- debian/README.source | 2 +- debian/changelog | 2 ++ debian/copyright | 6 ++++++ debian/rules | 35 +++-------------------------------- debian/watch | 2 +- 5 files changed, 13 insertions(+), 34 deletions(-) diff --git a/debian/README.source b/debian/README.source index 6f0a255..89ce1b3 100644 --- a/debian/README.source +++ b/debian/README.source @@ -18,5 +18,5 @@ Updating -------- 1. Find the version of the compiler and add an entry in debian/changelog -2. Update the TAG constant in debian/rules (with the version of the Eclipse Platform) +2. Update uversionmangle in debian/watch if necessary (4.x.y typically maps to 3.x+6.y) 3. Run ./debian/rules get-orig-source diff --git a/debian/changelog b/debian/changelog index 105f27c..01d05e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ ecj (3.11.2-1) UNRELEASED; urgency=medium * No longer build the -gcj packages (Closes: #892531) * Removed the Conflicts/Replaces fields referencing very old packages * Removed the build dependency on dpkg + * Download the upstream tarball with uscan and preserve the upstream project + structure (minus the tests) * Added debian/README.source documenting the upgrade process * Added myself to the uploaders * Moved the package to Git diff --git a/debian/copyright b/debian/copyright index 6c527e9..d264c0d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,12 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Eclipse Java Compiler Source: http://git.eclipse.org/c/jdt/eclipse.jdt.core.git/ +Files-Excluded: org.eclipse.jdt.apt.pluggable.tests/* + org.eclipse.jdt.apt.tests/* + org.eclipse.jdt.compiler.apt.tests/* + org.eclipse.jdt.compiler.tool.tests/* + org.eclipse.jdt.core.tests.* + org.eclipse.jdt.core/notes/* Files: * Copyright: 2000-2015, IBM Corporation and others diff --git a/debian/rules b/debian/rules index 3248678..c91470a 100755 --- a/debian/rules +++ b/debian/rules @@ -11,39 +11,10 @@ override_dh_auto_build: override_dh_auto_clean: -TAG = eclipse.jdt.core-R4_5_2 -DIR = ecj-$(VERSION) - -PACKAGE := ecj - get-orig-pom: mkdir -p debian/poms - wget -U NoSuchBrowser/1.0 -O debian/poms/$(PACKAGE).pom \ - https://repo1.maven.org/maven2/org/eclipse/jdt/core/compiler/$(PACKAGE)/$(VERSION)/$(PACKAGE)-$(VERSION).pom + wget -U NoSuchBrowser/1.0 -O debian/poms/ecj.pom \ + https://repo1.maven.org/maven2/org/eclipse/jdt/core/compiler/ecj/$(VERSION)/ecj-$(VERSION).pom get-orig-source: - rm -rf $(DIR) $(TAG).tar.gz $(TAG) - wget https://git.eclipse.org/c/jdt/eclipse.jdt.core.git/snapshot/$(TAG).tar.gz - tar xf $(TAG).tar.gz - mkdir -p $(DIR)/src/org.eclipse.jdt.core - cp -p $(TAG)/org.eclipse.jdt.core/scripts/about.html $(DIR)/src/org.eclipse.jdt.core/ - cp -p $(TAG)/org.eclipse.jdt.core/scripts/build.xml $(DIR)/src/org.eclipse.jdt.core/ - - tar -c -f - -C $(TAG)/org.eclipse.jdt.core/compiler org \ - | tar -x -f - -C $(DIR)/src/org.eclipse.jdt.core/ - - tar -c -f - -C $(TAG)/org.eclipse.jdt.core/antadapter org META-INF \ - | tar -x -f - -C $(DIR)/src/org.eclipse.jdt.core/ - - tar -c -f - -C $(TAG)/org.eclipse.jdt.core/batch org \ - | tar -x -f - -C $(DIR)/src/org.eclipse.jdt.core/ - - mkdir -p $(DIR)/src/org.eclipse.jdt.core/META-INF/services - printf 'org.eclipse.jdt.internal.compiler.tool.EclipseCompiler #Eclipse compiler' \ - > $(DIR)/src/org.eclipse.jdt.core/META-INF/services/javax.tools.JavaCompiler - - # Create the upstream tarball - tar -c -J -f ../ecj_$(VERSION).orig.tar.xz $(DIR) - - # Remove the temporary files - rm -rf $(DIR) $(TAG).tar.gz $(TAG) + uscan --download-current-version --rename diff --git a/debian/watch b/debian/watch index 347912e..53583fb 100644 --- a/debian/watch +++ b/debian/watch @@ -5,5 +5,5 @@ version=3 # The package caries the version of the compiler and the version of the platform # has to be hardcoded here to detect the new releases. # -opts="uversionmangle=s/_/./g,dversionmangle=s/.*/4.5.2/" \ +opts="uversionmangle=s/_/./g;s/^4\.9/3.15/;s/^4\.8/3.14/;s/^4\.7/3.13/;s/^4\.6/3.12/;s/^4\.5/3.11/;s/^4\.4/3.10/;s/^4\.3/3.9/;s/^4\.2/3.8/;s/^(\d+)\.(\d+)$/$1.$2.0/,repack,compression=xz" \ https://git.eclipse.org/c/jdt/eclipse.jdt.core.git/refs/ .*/eclipse.jdt.core-R([\d_]+).tar.gz -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ecj.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
