[Pkg-electronics-commits] [SCM] Packaging for gEDA branch, master, updated. debian/1%1.6.2-4-18-g5923936

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

The following commit has been merged in the master branch:
commit 4436a4c4b0859700b1b4b28e053a43da0b76548b
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date:   Tue Nov 20 15:24:18 2012 +0200

    Removed all patches, they got applied upstream.

diff --git a/debian/patches/desktop.diff b/debian/patches/desktop.diff
deleted file mode 100644
index fb22924..0000000
--- a/debian/patches/desktop.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Remove Encoding field
-Forwarded: Yes
-Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
---- a/gattrib/data/geda-gattrib.desktop
-+++ b/gattrib/data/geda-gattrib.desktop
-@@ -1,6 +1,5 @@
- [Desktop Entry]
- Version=1.0
--Encoding=UTF-8
- GenericName=gattrib
- Name=gEDA Attribute Editor
- Name[ar]=محرّر السّمة ل‍ gEDA
---- a/gschem/data/geda-gschem.desktop
-+++ b/gschem/data/geda-gschem.desktop
-@@ -1,6 +1,5 @@
- [Desktop Entry]
- Version=1.0
--Encoding=UTF-8
- GenericName=gschem
- Name=gEDA Schematic Editor
- Name[af]=gEDA Stroombaandiagram Bewerker
diff --git a/debian/patches/format-security.diff b/debian/patches/format-security.diff
deleted file mode 100644
index 2e74aa7..0000000
--- a/debian/patches/format-security.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Fix possible security problems when displaying message string
-Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
-Bug: https://bugs.launchpad.net/geda/+bug/894400
-Forwarded: https://bugs.launchpad.net/geda/+bug/894400/+attachment/2607078/+files/format-security.diff
---- a/gschem/src/gschem.c
-+++ b/gschem/src/gschem.c
-@@ -216,9 +216,9 @@
-     GtkWidget* error_diag =
-       gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR,
-                               GTK_BUTTONS_OK,
--                              message);
-+                              "%s", message);
-     gtk_dialog_run (GTK_DIALOG (error_diag));
--    g_error (message);
-+    g_error ("%s", message);
-   }
- 
-   /* Allocate w_current */
diff --git a/debian/patches/glib-single-include.patch b/debian/patches/glib-single-include.patch
deleted file mode 100644
index 564dc21..0000000
--- a/debian/patches/glib-single-include.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Do not include individual glib headers
-Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
-Bug-Debian: http://bugs.debian.org/665528
-Bug: https://bugs.launchpad.net/geda/+bug/964101
-Forwarded: https://bugs.launchpad.net/geda/+bug/964101/+attachment/2930513/+files/glib-single-include.patch
---- a/libgeda/src/s_path.c
-+++ b/libgeda/src/s_path.c
-@@ -37,9 +37,7 @@
- #include <stdlib.h>
- #include <string.h>
- 
--#include <glib/gmem.h>
--#include <glib/gmessages.h>
--#include <glib/gtypes.h>
-+#include <glib.h>
- 
- #include "libgeda_priv.h"
- 
diff --git a/debian/patches/manpage_typos.diff b/debian/patches/manpage_typos.diff
deleted file mode 100644
index e107261..0000000
--- a/debian/patches/manpage_typos.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix a couple of typos in gschem manpage
-Forwarded: https://sourceforge.net/tracker/?func=detail&aid=2952092&group_id=161080&atid=818428
-Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
---- a/gschem/docs/gschem.1
-+++ b/gschem/docs/gschem.1
-@@ -62,9 +62,9 @@
- Print out short command line help.
- .TP 8
- .B schematic1 [... schematicN]
--Schematic file to be loaded.  Specifing a schematic file is optional.  If
-+Schematic file to be loaded.  Specifying a schematic file is optional.  If
- multiple schematic files are specified they are read in sequentially and 
--put on seperate pages.  It is important that the schematic(s) follow 
-+put on separate pages.  It is important that the schematic(s) follow 
- all the options (ie last).
- 
- .SH EXAMPLES 
diff --git a/debian/patches/series b/debian/patches/series
index 4aaed72..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +0,0 @@
-glib-single-include.patch
-desktop.diff
-manpage_typos.diff
-format-security.diff

-- 
Packaging for gEDA