[Git][java-team/libpdfbox-java][master] 4 commits: debian/control: move javahelper from Build-Depends-Indep to Build-Depends.

gregor herrmann (@gregoa) gitlab at salsa.debian.org
Sun Oct 2 14:13:20 BST 2022



gregor herrmann pushed to branch master at Debian Java Maintainers / libpdfbox-java


Commits:
ce122d9f by gregor herrmann at 2022-10-02T14:56:48+02:00
debian/control: move javahelper from Build-Depends-Indep to Build-Depends.

It is used during clean via the javahelper debhelper addon.

- - - - -
249db705 by gregor herrmann at 2022-10-02T14:58:50+02:00
debian/rules: use version of aglfn

instead of lcdf-typetools.

This change was missing in 40c228a.

- - - - -
ed1084b3 by gregor herrmann at 2022-10-02T14:59:45+02:00
debian/rules: rename override_dh_auto_{configure,build} to -indep.

We are not building any architecture dependent packages.

- - - - -
131d4f48 by gregor herrmann at 2022-10-02T15:13:10+02:00
update changelog

Gbp-Dch: Ignore

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,6 +1,13 @@
 libpdfbox-java (1:1.8.16-3) UNRELEASED; urgency=medium
 
   * Remove myself from Uploaders.
+  * debian/control: move javahelper from Build-Depends-Indep to Build-
+    Depends.
+    It is used during clean via the javahelper debhelper addon.
+  * debian/rules: use version of aglfn instead of lcdf-typetools.
+    This change was missing in 40c228a.
+  * debian/rules: rename override_dh_auto_{configure,build} to -indep.
+    We are not building any architecture dependent packages.
 
  -- gregor herrmann <gregoa at debian.org>  Fri, 20 Aug 2021 03:34:58 +0200
 


=====================================
debian/control
=====================================
@@ -5,11 +5,11 @@ Uploaders: tony mancill <tmancill at debian.org>,
 Section: java
 Priority: optional
 Build-Depends: debhelper (>= 11),
+               javahelper,
                maven-debian-helper
 Build-Depends-Indep: aglfn,
                      default-jdk,
                      htmldoc-common,
-                     javahelper,
                      junit4,
                      libbcmail-java (>= 1.47),
                      libbcpkix-java,


=====================================
debian/rules
=====================================
@@ -1,19 +1,19 @@
 #!/usr/bin/make -f
 
 htmldoc-common_source := $(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W htmldoc-common)
-lcdf-typetools_source := $(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W lcdf-typetools)
+aglfn_source          := $(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W aglfn)
 poppler-data_source   := $(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W poppler-data)
 
 %:
 	dh $@ --buildsystem=maven --with javahelper
 
-override_dh_auto_configure:
+override_dh_auto_configure-indep:
 	# replace what we delete in repacking. never used ...
 	mkdir -p pdfbox/src/main/resources/org/apache/pdfbox/resources/cmap/
 	find /usr/share/poppler/cMap -type f -print0 | xargs -r0 cp -n -t pdfbox/src/main/resources/org/apache/pdfbox/resources/cmap/
 	dh_auto_configure
 
-override_dh_auto_build:
+override_dh_auto_build-indep:
 	# work around downloading adobe file
 	mkdir -p pdfbox/target/classes/org/apache/pdfbox/resources/cmap
 	cp pdfbox/src/main/resources/org/apache/pdfbox/resources/cmap/* pdfbox/target/classes/org/apache/pdfbox/resources/cmap/
@@ -28,4 +28,4 @@ override_dh_installchangelogs:
 	dh_installchangelogs $(CURDIR)/RELEASE-NOTES.txt
 
 override_dh_gencontrol:
-	dh_gencontrol -- "-Vmisc:Built-Using=$(htmldoc-common_source)$(lcdf-typetools_source)$(poppler-data_source)"
+	dh_gencontrol -- "-Vmisc:Built-Using=$(htmldoc-common_source)$(aglfn_source)$(poppler-data_source)"



View it on GitLab: https://salsa.debian.org/java-team/libpdfbox-java/-/compare/dedab99b3ae7d506e74f9aa5246fbaaf0fb3807f...131d4f484b1f95b8b414a8fad390ffaf01e8940b

-- 
View it on GitLab: https://salsa.debian.org/java-team/libpdfbox-java/-/compare/dedab99b3ae7d506e74f9aa5246fbaaf0fb3807f...131d4f484b1f95b8b414a8fad390ffaf01e8940b
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/20221002/b28feba8/attachment.htm>


More information about the pkg-java-commits mailing list