[Pkg-electronics-commits] [pcb] 04/15: patch conflicts with new upstream version

[Bdale Garbee]

This is an automated email from the git hooks/post-receive script.

bdale pushed a commit to branch master
in repository pcb.

commit d3a9b3b9010fa9a58a0eebed35243e67c85c8231
Author: Bdale Garbee <bdale at gag.com>
Date:   Tue Sep 5 15:42:40 2017 -0600

    patch conflicts with new upstream version
---
 debian/patches/disable_hid_png3_test.diff | 16 ----------------
 debian/patches/series                     |  1 -
 2 files changed, 17 deletions(-)

diff --git a/debian/patches/disable_hid_png3_test.diff b/debian/patches/disable_hid_png3_test.diff
deleted file mode 100644
index 6d9ab82..0000000
--- a/debian/patches/disable_hid_png3_test.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Disable hid_png3 test
- According to upstream, the problem is in the hid_png3 test
-Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
-Forwarded: not-needed
-Bug: https://bugs.launchpad.net/bugs/860037
-Bug-Debian: http://bugs.debian.org/642923
---- a/tests/tests.list
-+++ b/tests/tests.list
-@@ -176,6 +176,6 @@
- #
- hid_png1 | gerber_oneline.pcb | png | | | png:gerber_oneline.png
- hid_png2 | gerber_oneline.pcb | png | --outfile myfile.png | | png:myfile.png
--hid_png3 | gerber_oneline.pcb | png | --dpi 600 | | png:gerber_oneline.png
-+###hid_png3 | gerber_oneline.pcb | png | --dpi 600 | | png:gerber_oneline.png
- #
- 
diff --git a/debian/patches/series b/debian/patches/series
index bfa3bf6..baa74bd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-disable_hid_png3_test.diff
 drop_check_global_included.patch
 desktop-file-main-category.diff
 hid_png.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-electronics/pcb.git