[Pkg-electronics-commits] [SCM] Packaging for Pcb branch, master, updated. debian/20110918-5-2-g6f053e2

[أحمد المحمو =?UTF-8?Q?=D8=AF=D9=8A=20?=(Ahmed El-Mahmoudy)]

The following commit has been merged in the master branch:
commit bf3ce90fce02bb9474f7432698afc361dd6646aa
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date:   Tue May 22 17:37:12 2012 +0200

    Imported patch from Ubuntu and forwarded it upstream:
    debian/patches/drop_check_global_included.patch:
    Drop the #if check for the declaration of hid_get_extents().

diff --git a/debian/changelog b/debian/changelog
index 52ad504..5629c03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+pcb (20110918-6) unstable; urgency=low
+
+  * Imported patch from Ubuntu and forwarded it upstream:
+    debian/patches/drop_check_global_included.patch:
+    Drop the #if check for the declaration of hid_get_extents().
+
+ -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>  Tue, 22 May 2012 17:25:48 +0200
+
 pcb (20110918-5) unstable; urgency=low
 
   * Added 0001-Fixed-command-line-batch-output-for-some-exporters.patch from
diff --git a/debian/patches/drop_check_global_included.patch b/debian/patches/drop_check_global_included.patch
new file mode 100644
index 0000000..b2c4d48
--- /dev/null
+++ b/debian/patches/drop_check_global_included.patch
@@ -0,0 +1,21 @@
+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 97d93f9..883b416 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ pcbtest_paths.diff
 default_GtkFileChooser_cwd.diff
 disable_hid_png3_test.diff
 0001-Fixed-command-line-batch-output-for-some-exporters.patch
+drop_check_global_included.patch

-- 
Packaging for Pcb