Merge branch 'release/debian/1.1.1-1'debian/1.1.1-1

2 files changed, 30 insertions, 3 deletions

diff --git a/tools/NEWS.template.jinja b/tools/NEWS.template.jinja
new file mode 100644
index 0000000..afb5c11
--- /dev/null
+++ b/tools/NEWS.template.jinja
@@ -0,0 +1,30 @@
+{% for section, _ in sections|dictsort(by='key') %}
+{% set underline = "-" %}
+{% if section %}
+----- {{section}}
+
+{% endif %}
+{% if sections[section] %}
+{% for category, val in definitions|dictsort if category in sections[section]%}
+
+### {{ definitions[category]['name'] }}
+
+{% for text, values in sections[section][category]|dictsort(by='value') %}
+- {{ text }}
+{% endfor %}
+
+{% if sections[section][category]|length == 0 %}
+
+No significant changes.
+
+
+{% else %}
+{% endif %}
+{% endfor %}
+{% else %}
+
+No significant changes.
+
+
+{% endif %}
+{% endfor %}
diff --git a/tools/epson2usb.pl b/tools/epson2usb.pl
index 6d542d7..b1e63dd 100755
--- a/tools/epson2usb.pl
+++ b/tools/epson2usb.pl
@@ -42,11 +42,8 @@ use warnings;
 		next unless $m->{'usbid'} =~ /"0x04b8"\s+"(0x[[:xdigit:]]+)"/;
 
 		my $id = $1;
-
 #		print $id, "\n";
 
-		$id =~ s/0x0/0x/;
-
 		$m->{'model'} =~ s/;.+$//;
 		$m->{'model'} =~ s/\"//g;
 		$m->{'model'} =~ s/\s+$//;