Emmanuel Bourg pushed to branch master at Debian Java Maintainers / eclipse-jgit
Commits: bcbb9c65 by Emmanuel Bourg at 2018-10-17T09:55:06Z Standards-Version updated to 4.2.1 - - - - - d63971f5 by Emmanuel Bourg at 2018-10-17T10:11:28Z Fixed the compatibility with args4j 2.32 (Closes: #878800) - - - - - 93463675 by Emmanuel Bourg at 2018-10-17T10:11:41Z Upload to unstable - - - - - 4 changed files: - debian/changelog - debian/control - + debian/patches/args4j-2.32-compatibility.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +jgit (3.7.1-6) unstable; urgency=medium + + * Team upload. + * Fixed the compatibility with args4j 2.32 (Closes: #878800) + * Standards-Version updated to 4.2.1 + + -- Emmanuel Bourg <[email protected]> Wed, 17 Oct 2018 12:11:32 +0200 + jgit (3.7.1-5) unstable; urgency=medium * Team upload. ===================================== debian/control ===================================== @@ -21,7 +21,7 @@ Build-Depends: debhelper (>= 11~), libslf4j-java (>= 1.7.12-2), libxz-java, maven-debian-helper -Standards-Version: 4.2.0 +Standards-Version: 4.2.1 Vcs-Git: https://salsa.debian.org/java-team/eclipse-jgit.git Vcs-Browser: https://salsa.debian.org/java-team/eclipse-jgit Homepage: http://www.eclipse.org/jgit/ ===================================== debian/patches/args4j-2.32-compatibility.patch ===================================== @@ -0,0 +1,65 @@ +Description: Fixes the compatibility with args4j 2.32 +Origin: backport, https://github.com/eclipse/jgit/commit/a0558b70 +--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java ++++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java +@@ -76,22 +76,22 @@ + int timeout = -1; + + @Option(name = "--enable", metaVar = "metaVar_service", usage = "usage_enableTheServiceInAllRepositories") +- final List<String> enable = new ArrayList<String>(); ++ List<String> enable = new ArrayList<String>(); + + @Option(name = "--disable", metaVar = "metaVar_service", usage = "usage_disableTheServiceInAllRepositories") +- final List<String> disable = new ArrayList<String>(); ++ List<String> disable = new ArrayList<String>(); + + @Option(name = "--allow-override", metaVar = "metaVar_service", usage = "usage_configureTheServiceInDaemonServicename") +- final List<String> canOverride = new ArrayList<String>(); ++ List<String> canOverride = new ArrayList<String>(); + + @Option(name = "--forbid-override", metaVar = "metaVar_service", usage = "usage_configureTheServiceInDaemonServicename") +- final List<String> forbidOverride = new ArrayList<String>(); ++ List<String> forbidOverride = new ArrayList<String>(); + + @Option(name = "--export-all", usage = "usage_exportWithoutGitDaemonExportOk") + boolean exportAll; + + @Argument(required = true, metaVar = "metaVar_directory", usage = "usage_directoriesToExport") +- final List<File> directory = new ArrayList<File>(); ++ List<File> directory = new ArrayList<File>(); + + @Override + protected boolean requiresRepository() { +--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/DiffTree.java ++++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/DiffTree.java +@@ -67,7 +67,7 @@ + } + + @Argument(index = 1, metaVar = "metaVar_treeish", required = true) +- private final List<AbstractTreeIterator> trees = new ArrayList<AbstractTreeIterator>(); ++ private List<AbstractTreeIterator> trees = new ArrayList<AbstractTreeIterator>(); + + @Option(name = "--", metaVar = "metaVar_path", handler = PathTreeFilterHandler.class) + private TreeFilter pathFilter = TreeFilter.ALL; +--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MergeBase.java ++++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MergeBase.java +@@ -63,7 +63,7 @@ + } + + @Argument(index = 1, metaVar = "metaVar_commitish", required = true) +- private final List<RevCommit> commits = new ArrayList<RevCommit>(); ++ private List<RevCommit> commits = new ArrayList<RevCommit>(); + + @Override + protected void run() throws Exception { +--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Push.java ++++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Push.java +@@ -77,7 +77,7 @@ + private String remote = Constants.DEFAULT_REMOTE_NAME; + + @Argument(index = 1, metaVar = "metaVar_refspec") +- private final List<RefSpec> refSpecs = new ArrayList<RefSpec>(); ++ private List<RefSpec> refSpecs = new ArrayList<RefSpec>(); + + @Option(name = "--all") + private boolean all; ===================================== debian/patches/series ===================================== @@ -2,3 +2,4 @@ debian-custom-build.patch ftbfs-args4j-2.0.30-fix.patch unversioned-orbit-dependencies.patch fix-jgit-pgm-test-dependencies.patch +args4j-2.32-compatibility.patch View it on GitLab: https://salsa.debian.org/java-team/eclipse-jgit/compare/609ea8c723cba1584f75cef8dc8378e9206cd4bd...934636756daee2f790703c66f8e939cc31fc21dc -- View it on GitLab: https://salsa.debian.org/java-team/eclipse-jgit/compare/609ea8c723cba1584f75cef8dc8378e9206cd4bd...934636756daee2f790703c66f8e939cc31fc21dc You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
