[Pkg-electronics-commits] [pcb] 05/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 24ee5b844c7e95a99bde77b99cf3bb24c3ea4aec
Author: Bdale Garbee <bdale at gag.com>
Date:   Tue Sep 5 15:43:37 2017 -0600

    patch conflicts with new upstream version
---
 debian/patches/drop_check_global_included.patch | 21 ---------------------
 debian/patches/series                           |  1 -
 2 files changed, 22 deletions(-)

diff --git a/debian/patches/drop_check_global_included.patch b/debian/patches/drop_check_global_included.patch
deleted file mode 100644
index b2c4d48..0000000
--- a/debian/patches/drop_check_global_included.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Drop the #if check for the declaration of hid_get_extents()
-Author: Michael Bienia <geser at ubuntu.com>
-Bug: https://bugs.launchpad.net/pcb/+bug/1002964
-Forwarded: https://bugs.launchpad.net/pcb/+bug/1002964/+attachment/3158021/+files/drop_check_global_included.patch
-Index: pcb-20110918/src/hid/hidint.h
-===================================================================
---- pcb-20110918.orig/src/hid/hidint.h	2011-05-20 06:36:57.000000000 +0200
-+++ pcb-20110918/src/hid/hidint.h	2012-05-20 16:03:09.000000000 +0200
-@@ -64,12 +64,8 @@
- /* Returns a filename base that can be used to output the layer.  */
- const char *layer_type_to_file_name (int idx, int style);
- 
--#ifdef __GLOBAL_INCLUDED__
--
- /* Convenience function that calls the expose callback for the item,
-    and returns the extents of what was drawn.  */
- BoxType *hid_get_extents (void *item);
- 
--#endif
--
- void derive_default_filename(const char *pcbfile, HID_Attribute *filename_attrib, const char *suffix, char **memory);
diff --git a/debian/patches/series b/debian/patches/series
index baa74bd..ad9ed8f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-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