[Git][java-team/maven-debian-helper][master] 2 commits: Use salsa.debian.org Vcs-* URLs

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / maven-debian-helper


Commits:
646e3913 by Emmanuel Bourg at 2018-06-26T15:10:10+02:00
Use salsa.debian.org Vcs-* URLs

- - - - -
bb4755e1 by Emmanuel Bourg at 2018-06-26T15:13:51+02:00
Reverted to default-jdk as build dependency for the generated packages (this ensures that /usr/share/doc/default-jdk/api/ exists)

- - - - -


4 changed files:

- debian/changelog
- debian/control
- maven-packager-utils/src/main/resources/control.ant.vm
- maven-packager-utils/src/main/resources/control.vm


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
 maven-debian-helper (2.3~exp2) UNRELEASED; urgency=medium
 
   * Team upload.
-  * Generate packages depending on default-jdk-headless instead of default-jdk
   * No longer support generating CDBS based packages
   * Standards-Version updated to 4.1.4
   * The generated control file now specifies Standards-Version: 4.1.4
   * No longer generate the get-orig-source target in debian/rules
+  * Use salsa.debian.org Vcs-* URLs
 
  -- Emmanuel Bourg <ebourg at apache.org>  Tue, 27 Mar 2018 11:46:29 +0200
 


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -20,8 +20,8 @@ Build-Depends:
  maven-ant-helper,
  maven-repo-helper (>= 1.9)
 Standards-Version: 4.1.4
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/maven-debian-helper.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/maven-debian-helper.git
+Vcs-Git: https://salsa.debian.org/java-team/maven-debian-helper.git
+Vcs-Browser: https://salsa.debian.org/java-team/maven-debian-helper
 Homepage: https://wiki.debian.org/Java/MavenBuilder
 
 Package: maven-debian-helper


=====================================
maven-packager-utils/src/main/resources/control.ant.vm
=====================================
--- a/maven-packager-utils/src/main/resources/control.ant.vm
+++ b/maven-packager-utils/src/main/resources/control.ant.vm
@@ -18,7 +18,7 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: ${packager} <${packagerEmail}>
-Build-Depends: debhelper (>= 11), default-jdk-headless, maven-repo-helper (>= 1.9)#if ($project.packaging != "pom" || $project.modules.size() > 0), ant-optional, maven-ant-helper (>= 7.6)#end$space
+Build-Depends: debhelper (>= 11), default-jdk, maven-repo-helper (>= 1.9)#if ($project.packaging != "pom" || $project.modules.size() > 0), ant-optional, maven-ant-helper (>= 7.6)#end$space
 #if(!$buildDependencies.isEmpty())
 Build-Depends-Indep:#printDependencies($buildDependencies)$space
 #end


=====================================
maven-packager-utils/src/main/resources/control.vm
=====================================
--- a/maven-packager-utils/src/main/resources/control.vm
+++ b/maven-packager-utils/src/main/resources/control.vm
@@ -18,7 +18,7 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: ${packager} <${packagerEmail}>
-Build-Depends: debhelper (>= 11), default-jdk-headless, maven-debian-helper (>= 2.1)
+Build-Depends: debhelper (>= 11), default-jdk, maven-debian-helper (>= 2.1)
 #if(!$buildDependencies.isEmpty())
 Build-Depends-Indep:#printDependencies($buildDependencies)$space
 #end



View it on GitLab: https://salsa.debian.org/java-team/maven-debian-helper/compare/c8d7c15927bd14a934078d38d8bfc5fe3293d791...bb4755e1b57dc07eb7ecc6754cbe306d448b1b07

-- 
View it on GitLab: https://salsa.debian.org/java-team/maven-debian-helper/compare/c8d7c15927bd14a934078d38d8bfc5fe3293d791...bb4755e1b57dc07eb7ecc6754cbe306d448b1b07
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20180626/58cef178/attachment.html>