[Git][java-team/felix-gogo-runtime][master] 11 commits: Import Debian changes 0.16.2-1.1

Andreas Tille (@tille) gitlab at salsa.debian.org
Wed Jan 22 09:45:47 GMT 2025



Andreas Tille pushed to branch master at Debian Java Maintainers / felix-gogo-runtime


Commits:
6cf036e6 by Holger Levsen at 2025-01-21T20:09:15+01:00
Import Debian changes 0.16.2-1.1

felix-gogo-runtime (0.16.2-1.1) unstable; urgency=medium
.
  * Non maintainer upload by the Reproducible Builds team.
  * No source change upload to rebuild on buildd with .buildinfo files.

- - - - -
fe671187 by Andreas Tille at 2025-01-21T20:18:25+01:00
Fix Homepage and source URL

- - - - -
108a73a9 by Andreas Tille at 2025-01-21T20:18:54+01:00
Remove redundant d/README.source

- - - - -
2998cbef by Andreas Tille at 2025-01-22T10:31:08+01:00
* debhelper-compat = 13
* Switch from cdbs to dh

- - - - -
24fa1a76 by Andreas Tille at 2025-01-22T10:31:33+01:00
Standards-Version: 4.7.0 (routine-update)

- - - - -
06cebbdb by Andreas Tille at 2025-01-22T10:37:14+01:00
Reorder sequence of d/control fields by cme (routine-update)

- - - - -
88423b67 by Andreas Tille at 2025-01-22T10:37:14+01:00
Secure URI in copyright format (routine-update)

- - - - -
2b4795d6 by Andreas Tille at 2025-01-22T10:37:14+01:00
Drop useless get-orig-source target (routine-update)

- - - - -
306e66ec by Andreas Tille at 2025-01-22T09:37:15+00:00
Trim trailing whitespace.

Changes-By: lintian-brush
Fixes: lintian: trailing-whitespace
See-also: https://lintian.debian.org/tags/trailing-whitespace.html

- - - - -
42a789bb by Andreas Tille at 2025-01-22T10:37:27+01:00
watch file standard 4 (routine-update)

- - - - -
4f559fb2 by Andreas Tille at 2025-01-22T10:39:36+01:00
routine-update: Ready to upload to unstable

- - - - -


13 changed files:

- − .gitignore
- − debian/README.source
- debian/changelog
- − debian/compat
- debian/control
- debian/copyright
- debian/libfelix-gogo-runtime-java.poms
- + debian/maven.cleanIgnoreRules
- + debian/maven.ignoreRules
- + debian/maven.publishedRules
- debian/maven.rules
- debian/rules
- debian/watch


Changes:

=====================================
.gitignore deleted
=====================================
@@ -1 +0,0 @@
-.pc


=====================================
debian/README.source deleted
=====================================
@@ -1,9 +0,0 @@
-Information about felix-gogo-runtime
-------------------------------
-
-This package was debianized using the mh_make command
-from the maven-debian-helper package.
-
-The build system uses Maven but prevents it from downloading
-anything from the Internet, making the build compliant with
-the Debian policy.


=====================================
debian/changelog
=====================================
@@ -1,3 +1,26 @@
+felix-gogo-runtime (0.16.2-2) unstable; urgency=medium
+
+  * Team upload.
+  * Fix Homepage and source URL
+  * Remove redundant d/README.source
+  * debhelper-compat = 13
+  * Switch from cdbs to dh
+  * Standards-Version: 4.7.0 (routine-update)
+  * Reorder sequence of d/control fields by cme (routine-update)
+  * Secure URI in copyright format (routine-update)
+  * Drop useless get-orig-source target (routine-update)
+  Trim trailing whitespace.
+  * watch file standard 4 (routine-update)
+
+ -- Andreas Tille <tille at debian.org>  Wed, 22 Jan 2025 10:37:27 +0100
+
+felix-gogo-runtime (0.16.2-1.1) unstable; urgency=medium
+
+  * Non maintainer upload by the Reproducible Builds team.
+  * No source change upload to rebuild on buildd with .buildinfo files.
+
+ -- Holger Levsen <holger at debian.org>  Mon, 28 Dec 2020 11:10:50 +0100
+
 felix-gogo-runtime (0.16.2-1) unstable; urgency=medium
 
   [ Markus Koschany ]


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-9


=====================================
debian/control
=====================================
@@ -1,9 +1,11 @@
 Source: felix-gogo-runtime
-Section: java
-Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper
+Section: java
+Priority: optional
+Build-Depends: debhelper-compat (= 13),
+               default-jdk,
+               maven-debian-helper
 Build-Depends-Indep: default-jdk-doc,
                      junit4,
                      libmaven-bundle-plugin-java,
@@ -13,14 +15,15 @@ Build-Depends-Indep: default-jdk-doc,
                      libosgi-core-java,
                      libosgi-core-java-doc,
                      libsurefire-java
-Standards-Version: 3.9.6
-Vcs-Git: git://anonscm.debian.org/pkg-java/felix-gogo-runtime.git
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/felix-gogo-runtime.git
-Homepage: http://felix.apache.org/site/apache-felix-gogo.html
+Standards-Version: 4.7.0
+Vcs-Browser: https://salsa.debian.org/java-team/felix-gogo-runtime
+Vcs-Git: https://salsa.debian.org/java-team/felix-gogo-runtime.git
+Homepage: https://felix.apache.org/documentation/subprojects/apache-felix-gogo.html
 
 Package: libfelix-gogo-runtime-java
 Architecture: all
-Depends: ${maven:Depends}, ${misc:Depends}
+Depends: ${maven:Depends},
+         ${misc:Depends}
 Recommends: ${maven:OptionalDepends}
 Suggests: libfelix-gogo-runtime-java-doc
 Description: Apache Felix Gogo Runtime bundle
@@ -33,7 +36,8 @@ Description: Apache Felix Gogo Runtime bundle
 Package: libfelix-gogo-runtime-java-doc
 Architecture: all
 Section: doc
-Depends: ${maven:DocDepends}, ${misc:Depends}
+Depends: ${maven:DocDepends},
+         ${misc:Depends}
 Recommends: ${maven:DocOptionalDepends}
 Suggests: libfelix-gogo-runtime-java
 Description: Documentation for Apache Felix Gogo Runtime bundle


=====================================
debian/copyright
=====================================
@@ -1,6 +1,6 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Apache Felix Gogo Runtime
-Source: http://felix.apache.org/site/apache-felix-gogo.html
+Source: https://github.com/apache/felix-dev/tree/master/gogo/runtime
 
 Files: *
 Copyright: 2011-2014, Apache Software Foundation


=====================================
debian/libfelix-gogo-runtime-java.poms
=====================================
@@ -3,8 +3,8 @@
 # <path to pom file> [option]*
 # where option can be:
 #   --ignore: ignore this POM and its artifact if any
-#   --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.
+#   --ignore-pom: don't install the POM. To use on POM files that are created
+#     temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
 #   --no-parent: remove the <parent> tag from the POM
 #   --package=<package>: an alternative package to use when installing this POM
 #      and its artifact
@@ -13,14 +13,16 @@
 #   --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
+#      it will be installed when using the command mh_install. [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.
+#   --dest-jar=<path>: the destination for the real jar.
+#     It will be installed with mh_install. [mh_install]
 #   --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+#   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+#     Empty by default. [mh_install]
 #
 pom.xml --no-parent --has-package-version --java-lib


=====================================
debian/maven.cleanIgnoreRules
=====================================
@@ -0,0 +1 @@
+


=====================================
debian/maven.ignoreRules
=====================================
@@ -0,0 +1 @@
+


=====================================
debian/maven.publishedRules
=====================================
@@ -0,0 +1,2 @@
+
+org.apache.felix org.apache.felix.gogo.runtime bundle s/.*/debian/ * *


=====================================
debian/maven.rules
=====================================
@@ -1,20 +1,3 @@
-# Maven rules - transform Maven dependencies and plugins
-# Format of this file is:
-# [group] [artifact] [type] [version] [classifier] [scope]
-# where each element can be either
-# - the exact string, for example org.apache for the group, or 3.1
-#   for the version. In this case, the element is simply matched
-#   and left as it is
-# - * (the star character, alone). In this case, anything will
-#   match and be left as it is. For example, using * on the
-#  position of the artifact field will match any artifact id
-# - a regular expression of the form s/match/replace/
-#   in this case, elements that match are transformed using
-#   the regex rule.
-# All elements much match before a rule can be applied
-# Example rule: match jar with groupid= junit, artifactid= junit
-# and version starting with 3., replacing the version with 3.x
-#   junit junit jar s/3\\..*/3.x/
 
 junit junit jar s/.*/4.x/ * *
 junit junit jar s/4\..*/4.x/ * *


=====================================
debian/rules
=====================================
@@ -1,9 +1,13 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
+PKG=libfelix-gogo-runtime-java
+DOCDIR=$(CURDIR)/debian/$(PKG)-doc/usr/share/doc/$(PKG)
 
 JAVA_HOME := /usr/lib/jvm/default-java
 
-get-orig-source:
-	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename --no-symlink
+%:
+	dh $@
+
+override_dh_installdocs:
+	dh_installdocs
+	rm -rf $(DOCDIR)/api/apidocs # no idea why doc is duplicated


=====================================
debian/watch
=====================================
@@ -1,4 +1,4 @@
-version=3
+version=4
 opts="uversionmangle=s/-(alpha|beta)-/~$1/" \
   https://svn.apache.org/repos/asf/felix/releases/ \
   org.apache.felix.gogo.runtime-(\d.*)/ debian debian/orig-tar.sh



View it on GitLab: https://salsa.debian.org/java-team/felix-gogo-runtime/-/compare/5fc5d139e18d67c5d7c3ace952718e25fa793dab...4f559fb201d1accdb0b7eff6c8a3e235c67618f0

-- 
View it on GitLab: https://salsa.debian.org/java-team/felix-gogo-runtime/-/compare/5fc5d139e18d67c5d7c3ace952718e25fa793dab...4f559fb201d1accdb0b7eff6c8a3e235c67618f0
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/20250122/0458af72/attachment.htm>


More information about the pkg-java-commits mailing list