[med-svn] [Git][med-team/libcolt-free-java][master] Catch more files with broken encoding

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / libcolt-free-java


Commits:
1eee5ca0 by Andreas Tille at 2018-03-18T08:11:30+01:00
Catch more files with broken encoding

- - - - -


2 changed files:

- debian/patches/fix_invalid_encoding.patch
- debian/rules


Changes:

=====================================
debian/patches/fix_invalid_encoding.patch
=====================================
--- a/debian/patches/fix_invalid_encoding.patch
+++ b/debian/patches/fix_invalid_encoding.patch
@@ -1,4 +1,6 @@
 Description: Replace invalid encoding of copyright symbol which makes build fail in Java 9
+   May be this can be done also in d/rules by sed expression instead of a patch.
+   There is an example for those files that are not catched by this patch
 Bug-Debian: https://bugs.debian.org/893303
 Author: Andreas Tille <tille at debian.org>
 Last-Update: Sun, 18 Mar 2018 07:25:07 +0100


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -15,6 +15,11 @@ override_dh_auto_build:
 	#Make this directory on build because GIT won't let you commit an empty
 	#directory
 	mkdir -p lib
+	# Fix broken encodings that were not catched in fix_invalid_encoding.patch
+	for utf16 in `find . -name "*.java" -exec file \{\} \; | grep "ISO-8859 text" | sed 's/: .*//'` ; do \
+		echo "Fixing ISO-8859 encoding of $$utf16" ; \
+		sed -i '/^Copyright/{;N;s/Copyright.*1999 CERN - European Organization for Nuclear Research/Copyright (c) 1999 CERN - European Organization for Nuclear Research/;}' $$utf16; \
+	done
 	ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 build
 
 override_dh_installdocs:



View it on GitLab: https://salsa.debian.org/med-team/libcolt-free-java/commit/1eee5ca0cee40e885e36b1d184c23e869a4fc3da

---
View it on GitLab: https://salsa.debian.org/med-team/libcolt-free-java/commit/1eee5ca0cee40e885e36b1d184c23e869a4fc3da
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/debian-med-commit/attachments/20180318/d7859b3d/attachment.html>