[Git][java-team/libcommons-lang-java][master] 7 commits: Standards-Version updated to 4.4.0

Emmanuel Bourg gitlab at salsa.debian.org
Fri Sep 13 09:12:18 BST 2019



Emmanuel Bourg pushed to branch master at Debian Java Maintainers / libcommons-lang-java


Commits:
945e85ca by Emmanuel Bourg at 2019-09-13T08:02:53Z
Standards-Version updated to 4.4.0

- - - - -
467ba8ca by Emmanuel Bourg at 2019-09-13T08:03:03Z
Use salsa.debian.org Vcs-* URLs

- - - - -
6fd1f5f8 by Emmanuel Bourg at 2019-09-13T08:05:45Z
No longer parse the changelog in debian/rules

- - - - -
dc186a14 by Emmanuel Bourg at 2019-09-13T08:07:10Z
No longer install the javadoc jar in the doc package

- - - - -
a5d555f9 by Emmanuel Bourg at 2019-09-13T08:08:58Z
Removed the unused empty patch

- - - - -
bfd5fad9 by Emmanuel Bourg at 2019-09-13T08:10:08Z
Use a secure URI in debian/watch

- - - - -
83646860 by Emmanuel Bourg at 2019-09-13T08:10:20Z
Upload to unstable

- - - - -


6 changed files:

- debian/changelog
- debian/control
- − debian/libcommons-lang-java-doc.poms
- − debian/patches/01-build-wit-eclipse-compiler.patch
- debian/rules
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+libcommons-lang-java (2.6-9) unstable; urgency=medium
+
+  * No longer install the javadoc jar in the doc package
+  * No longer parse the changelog in debian/rules
+  * Standards-Version updated to 4.4.0
+  * Use salsa.debian.org Vcs-* URLs
+  * Use a secure URI in debian/watch
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 13 Sep 2019 10:10:13 +0200
+
 libcommons-lang-java (2.6-8) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -12,9 +12,9 @@ Build-Depends:
  junit (>= 3.8.1),
  libcommons-parent-java (>= 12),
  maven-repo-helper (>= 1.7)
-Standards-Version: 4.1.3
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/libcommons-lang-java.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libcommons-lang-java.git
+Standards-Version: 4.4.0
+Vcs-Git: https://salsa.debian.org/java-team/libcommons-lang-java.git
+Vcs-Browser: https://salsa.debian.org/java-team/libcommons-lang-java
 Homepage: http://commons.apache.org/lang/
 
 Package: libcommons-lang-java


=====================================
debian/libcommons-lang-java-doc.poms deleted
=====================================
@@ -1,26 +0,0 @@
-# List of POM files for the package
-# Format of this file is:
-# <path to pom file> [option]*
-# where option can be:
-#   --ignore: ignore this POM or
-#   --no-parent: remove the <parent> tag from the POM
-#   --package=<package>: an alternative package to use when installing this POM
-#      and its artifact
-#   --has-package-version: to indicate that the original version of the POM is the same as the upstream part
-#      of the version for the package.
-#   --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
-#      during a clean operation with mh_cleanpom or mh_installpom
-#   --artifact=<path>: path to the build artifact associated with this POM,
-#      it will be installed when using the command mh_install
-#   --java-lib: install the jar into /usr/share/java to comply with Debian
-#      packaging guidelines
-#   --usj-name=<name>: name to use when installing the library in /usr/share/java
-#   --usj-version=<version>: version to use when installing the library in /usr/share/java
-#   --no-usj-versionless: don't install the versionless link in /usr/share/java
-#   --dest-jar=<path>: the destination for the real jar
-#   it will be installed with mh_install.
-#   --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
-#   --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created
-#     temporarily for certain artifacts such as Javadoc jars.
-#
-pom.xml --ignore-pom --has-package-version --artifact=target/commons-lang-*-javadoc.jar --classifier=javadoc


=====================================
debian/patches/01-build-wit-eclipse-compiler.patch deleted
=====================================


=====================================
debian/rules
=====================================
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 
-DEB_SOURCE_PACKAGE   := $(shell dpkg-parsechangelog | grep '^Source:' | cut -f 2 -d ' ')
-DEB_UPSTREAM_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ' | cut -d: -f2- | sed 's/-[^-]*$$//')
+include /usr/share/dpkg/pkg-info.mk
 
 export JAVA_HOME=/usr/lib/jvm/default-java
 export CLASSPATH=$(shell for jar in `cat debian/build-classpath`; do if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; done)
@@ -11,10 +10,6 @@ export CLASSPATH=$(shell for jar in `cat debian/build-classpath`; do if [ -f "$$
 
 override_dh_auto_build:
 	ANT_ARGS="-Dbasedir=$(realpath .) -Dcompile.excludes='**/enum/*' -Djavadoc.excludepackagenames='org/apache/commons/lang/enum/*' -Djdk.javadoc=file:///usr/share/doc/default-jdk-doc/api/ jar javadoc javadoc-jar" dh_auto_build
-	cat debian/commons-lang.bnd | sed s/VERSION/$(DEB_UPSTREAM_VERSION)/ > debian/.commons-lang-versioned.bnd
+	cat debian/commons-lang.bnd | sed s/VERSION/$(DEB_VERSION_UPSTREAM)/ > debian/.commons-lang-versioned.bnd
 	echo debian/.commons-lang-versioned.bnd >> debian/.mh_clean
-	bnd wrap --properties debian/.commons-lang-versioned.bnd --output target/commons-lang.bnd.jar target/commons-lang-$(DEB_UPSTREAM_VERSION).jar
-
-get-orig-source:
-	-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
-
+	bnd wrap --properties debian/.commons-lang-versioned.bnd --output target/commons-lang.bnd.jar target/commons-lang-$(DEB_VERSION_UPSTREAM).jar


=====================================
debian/watch
=====================================
@@ -1,2 +1,2 @@
-version=2
-http://www.apache.org/dist/commons/lang/source/commons-lang-(.*)-src\.tar\.gz debian uupdate
+version=4
+https://www.apache.org/dist/commons/lang/source/commons-lang-(.*)-src\.tar\.gz debian uupdate



View it on GitLab: https://salsa.debian.org/java-team/libcommons-lang-java/compare/30dce5dc09cb56caf3abb4a387cb1ee9b6ba200c...83646860d607c52866891459f36efdd0a9903b46

-- 
View it on GitLab: https://salsa.debian.org/java-team/libcommons-lang-java/compare/30dce5dc09cb56caf3abb4a387cb1ee9b6ba200c...83646860d607c52866891459f36efdd0a9903b46
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/20190913/f2202587/attachment.html>


More information about the pkg-java-commits mailing list