[med-svn] [Git][med-team/pixelmed][master] 4 commits: Ignoring iconv failure when converting encoding of some .properties files, in Greek among others

[Pierre Gruet (@pgt)]

Pierre Gruet pushed to branch master at Debian Med / pixelmed


Commits:
d5c5c45b by Pierre Gruet at 2025-02-23T21:20:44+01:00
Ignoring iconv failure when converting encoding of some .properties files, in Greek among others

- - - - -
4eb83afc by Pierre Gruet at 2025-02-23T22:14:50+01:00
Stopping building the javadoc

- - - - -
b384e770 by Pierre Gruet at 2025-02-23T22:15:11+01:00
Omitting html files with possible privacy breaches

- - - - -
e6e5d66e by Pierre Gruet at 2025-02-23T22:16:28+01:00
Upload to unstable

- - - - -


9 changed files:

- debian/changelog
- debian/control
- − debian/libpixelmed-java-doc.doc-base
- − debian/libpixelmed-java-doc.docs
- − debian/libpixelmed-java-doc.javadoc
- − debian/libpixelmed-java-doc.lintian-overrides
- debian/patches/native2ascii.patch
- debian/pixelmed-www.install
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,11 +1,16 @@
-pixelmed (20250211+dfsg-1) UNRELEASED; urgency=medium
+pixelmed (20250211+dfsg-1) unstable; urgency=medium
 
   * New upstream version
     Closes: #1084318
   * cme fix dpkg-control
   * Remove target which depends on files available in developers home
 
- -- Andreas Tille <tille at debian.org>  Sun, 16 Feb 2025 18:24:24 +0100
+  [ Pierre Gruet ]
+  * Ignoring iconv failure when converting encoding of some .properties files, in Greek among others
+  * Stopping building the javadoc
+  * Omitting html files with possible privacy breaches
+
+ -- Andreas Tille <tille at debian.org>  Sun, 23 Feb 2025 22:17:24 +0100
 
 pixelmed (20220618+dfsg-3) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -29,7 +29,6 @@ Section: java
 Depends: ${java:Depends},
          ${misc:Depends}
 Recommends: libpixelmed-imageio-java
-Suggests: libpixelmed-java-doc
 Conflicts: pixelmed-java
 Replaces: pixelmed-java
 Description: DICOM implementation containing Image Viewer and a ECG Viewer
@@ -38,20 +37,6 @@ Description: DICOM implementation containing Image Viewer and a ECG Viewer
  DICOM objects, support for display of directories, images, reports and
  spectra, and DICOM object validation.
 
-Package: libpixelmed-java-doc
-Architecture: all
-Section: doc
-Depends: doc-base,
-         ${misc:Depends}
-Suggests: libpixelmed-java
-Description: DICOM implementation containing Image Viewer and a ECG Viewer - doc
- This is a stand-alone DICOM toolkit that implements code for reading
- and creating DICOM data, DICOM network and file support, a database of
- DICOM objects, support for display of directories, images, reports and
- spectra, and DICOM object validation.
- .
- This is the documentation package for libpixelmed-java
-
 Package: pixelmed-apps
 Architecture: all
 Section: utils


=====================================
debian/libpixelmed-java-doc.doc-base deleted
=====================================
@@ -1,9 +0,0 @@
-Document: libpixelmed-java-doc
-Title: API JavaDoc for pixelmed-java
-Author: David Clunie
-Abstract: This the API JavaDoc for pixelmed-java
-Section: Programming/Java
-
-Format: HTML
-Index: /usr/share/doc/libpixelmed-java/index.html
-Files: /usr/share/doc/libpixelmed-java/*.html


=====================================
debian/libpixelmed-java-doc.docs deleted
=====================================
@@ -1 +0,0 @@
-docs/javadoc/*


=====================================
debian/libpixelmed-java-doc.javadoc deleted
=====================================
@@ -1 +0,0 @@
-com.pixelmed


=====================================
debian/libpixelmed-java-doc.lintian-overrides deleted
=====================================
@@ -1,4 +0,0 @@
-# It would be too complicated to remove the javascript that is included in
-# javadocs, see the discussion on Debian Java mailing list starting at 
-# https://lists.debian.org/debian-java/2018/06/msg00020.html.
-embedded-javascript-library usr/share/doc/libpixelmed-java/jquery/*


=====================================
debian/patches/native2ascii.patch
=====================================
@@ -8,13 +8,14 @@ Last-Update: 2020-07-31
 
 --- a/Makefile.common.mk
 +++ b/Makefile.common.mk
-@@ -92,7 +92,8 @@ JAVACOPTIONS = -O ${JAVACTARGETOPTIONS}
+@@ -92,7 +92,9 @@
  		-sourcepath ${PATHTOROOT} $<
  
  .utf-8_properties.properties:
 -	native2ascii -encoding UTF8 $< >$@
 +	# native2ascii -encoding UTF8 $< >$@
-+	iconv -c -f UTF8 -t ascii//TRANSLIT $< >$@
++	# if iconv fails (as is typical with _el), ignore failure. The file won't be useful.
++	iconv -c -f UTF8 -t ascii//TRANSLIT $< >$@ || true
  
  clean:
  	rm -f *~ *.class core *.bak test.*


=====================================
debian/pixelmed-www.install
=====================================
@@ -1,3 +1,5 @@
 debian/pixelmed etc/apache2/sites-available
-webstart/*.html usr/share/pixelmed
 webstart/images usr/share/pixelmed
+webstart/DicomCleanerUsage.html
+webstart/DicomImageViewerUsage.html
+webstart/DoseUtilityUsage.html


=====================================
debian/rules
=====================================
@@ -10,7 +10,6 @@ include /usr/share/dpkg/default.mk
 
 override_dh_auto_build:
 	$(MAKE) JAVAVERSIONTARGET=8 all
-	$(MAKE) javadoc
 
 # See #568897
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))



View it on GitLab: https://salsa.debian.org/med-team/pixelmed/-/compare/8443bd5414376e0ca19de471b9714da37f9b5a23...e6e5d66ea5393a68d3373921f024d06fdb399f46

-- 
View it on GitLab: https://salsa.debian.org/med-team/pixelmed/-/compare/8443bd5414376e0ca19de471b9714da37f9b5a23...e6e5d66ea5393a68d3373921f024d06fdb399f46
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/debian-med-commit/attachments/20250223/32f4b93a/attachment-0001.htm>