[Pkg-electronics-commits] [SCM] Packaging for Pcb branch, master, updated. debian/20100929-2-21-g2087bcf

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

The following commit has been merged in the master branch:
commit 4884297c3e3c3c54f161cdd8c5d09e892ad0b786
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date:   Wed Sep 21 11:19:50 2011 +0200

    Added  .pc/fix_pan_action.diff/src/hid/gtk/gtkhid-main.c to POTFILES.skip to avoid an FTBFS when running make check

diff --git a/debian/patches/fix_pan_action.diff b/debian/patches/fix_pan_action.diff
index a9f9804..6ffed42 100644
--- a/debian/patches/fix_pan_action.diff
+++ b/debian/patches/fix_pan_action.diff
@@ -11,13 +11,9 @@ Author: Peter Clifton <pcjc2 at cam.ac.uk> [Mon, 19 Sep 2011 10:16:49 +0000 (11:16
 Bug: https://launchpad.net/bugs/699307
 Bug-Debian: http://bugs.debian.org/562641
 
-diff --git a/src/hid/gtk/gtkhid-main.c b/src/hid/gtk/gtkhid-main.c
-
-index 9b239e1..a83ee2e 100644 (file)
-
 --- a/src/hid/gtk/gtkhid-main.c
 +++ b/src/hid/gtk/gtkhid-main.c
-@@ -2030,7 +2030,7 @@ HID_Action ghid_main_action_list[] = {
+@@ -2030,7 +2030,7 @@
    {"LayerGroupsChanged", 0, LayerGroupsChanged},
    {"LibraryChanged", 0, LibraryChanged},
    {"Load", 0, Load},
@@ -26,3 +22,7 @@ index 9b239e1..a83ee2e 100644 (file)
    {"PCBChanged", 0, PCBChanged},
    {"PointCursor", 0, PointCursor},
    {"Popup", 0, Popup, popup_help, popup_syntax},
+--- /dev/null
++++ b/po/POTFILES.skip
+@@ -0,0 +1 @@
++.pc/fix_pan_action.diff/src/hid/gtk/gtkhid-main.c

-- 
Packaging for Pcb