[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#823393: kdbg: mixed encoding in changelog



Source: kdbg
Version: 2.5.5-1
Severity: wishlist
Tags: patch
User: reproducible-builds@lists.alioth.debian.org
Usertags: environment
X-Debbugs-Cc: reproducible-builds@lists.alioth.debian.org

Dear Maintainer,

The ChangeLog-pre-2.2.0 has mixed latin1/UTF-8 encoding. With some
locales, the grep call used to process it uses binary mode, returning
"Binary file matches" instead of the filtered content.

Please find a patch that fixes those issues, allowing reproducible build
[1,2].

Regards,
Alexis Bienvenüe.

 [1] https://wiki.debian.org/ReproducibleBuilds
 [2] https://tests.reproducible-builds.org/rb-pkg/unstable/amd64/kdbg.html



diff -Nru kdbg-2.5.5/debian/changelog kdbg-2.5.5/debian/changelog
--- kdbg-2.5.5/debian/changelog	2016-04-19 06:23:14.000000000 +0200
+++ kdbg-2.5.5/debian/changelog	2016-05-04 10:05:13.000000000 +0200
@@ -1,3 +1,9 @@
+kdbg (2.5.5-1.0~reproducible1) UNRELEASED; urgency=medium
+
+  * Fix changelog encoding.
+
+ -- Alexis Bienvenüe <pado@passoire.fr>  Wed, 04 May 2016 09:31:26 +0200
+
 kdbg (2.5.5-1) unstable; urgency=medium
 
   * QA upload.
diff -Nru kdbg-2.5.5/debian/patches/11_fix_changelog_encoding.patch kdbg-2.5.5/debian/patches/11_fix_changelog_encoding.patch
--- kdbg-2.5.5/debian/patches/11_fix_changelog_encoding.patch	1970-01-01 01:00:00.000000000 +0100
+++ kdbg-2.5.5/debian/patches/11_fix_changelog_encoding.patch	2016-05-04 10:07:18.000000000 +0200
@@ -0,0 +1,26 @@
+Description: Fix changelog encoding
+ Set ChangeLog-pre-2.2.0 encoding to UTF-8 (it was mixed latin1/UTF-8)
+Author: Alexis Bienvenüe <pado@passoire.fr>
+
+Index: kdbg-2.5.5/ChangeLog-pre-2.2.0
+===================================================================
+--- kdbg-2.5.5.orig/ChangeLog-pre-2.2.0
++++ kdbg-2.5.5/ChangeLog-pre-2.2.0
+@@ -287,7 +287,7 @@ Version 1.1.1
+ 	command (required if you are debugging remote devices), the
+ 	terminal emulation needed for the program.
+ 
+-Verison 1.1.0
++Version 1.1.0
+ 
+ 	Use docking windows thanks to Judin Max <novaprint@mtu-net.ru>.
+ 
+@@ -299,7 +299,7 @@ Verison 1.1.0
+ 	Berndt Josef Wulf <wulf@ping.net.au>.
+ 
+ 	There's now a Swedish translation thanks to
+-	Örjan Lindbergh <orjan.lindbergh@telia.com>.
++	Ã?rjan Lindbergh <orjan.lindbergh@telia.com>.
+ 
+ Version 1.0.2
+ 
diff -Nru kdbg-2.5.5/debian/patches/series kdbg-2.5.5/debian/patches/series
--- kdbg-2.5.5/debian/patches/series	2016-03-16 23:32:05.000000000 +0100
+++ kdbg-2.5.5/debian/patches/series	2016-05-04 10:01:56.000000000 +0200
@@ -1 +1,2 @@
 10_fix_check_include_files.patch
+11_fix_changelog_encoding.patch
diff -Nru kdbg-2.5.5/debian/rules kdbg-2.5.5/debian/rules
--- kdbg-2.5.5/debian/rules	2016-04-10 05:23:26.000000000 +0200
+++ kdbg-2.5.5/debian/rules	2016-05-04 09:30:22.000000000 +0200
@@ -8,5 +8,5 @@
 
 override_dh_installchangelogs:
 	cat $$(ls ReleaseNotes-* | sort -Vr) ChangeLog-pre-2.2.0 | \
-	   egrep -v '(KDbg Release Notes for|====)' > debian/upstream.changes
+	   egrep -av '(KDbg Release Notes for|====)' > debian/upstream.changes
 	dh_installchangelogs debian/upstream.changes

Reply to: