[Pkg-electronics-commits] [SCM] Debian packaging for Icarus Verilog branch, master, updated. debian/0.9.2-2-5-gfc55a64

[أحمد المحمودي (Ahmed El-Mahmoudy)]

The following commit has been merged in the master branch:
commit bb98b31b2ffb72fbf5015619c7dbaafffb46e1ca
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date:   Tue Sep 28 21:15:43 2010 +0300

    Removed 0001-Fix-build-with-gcc-4.5.patch as it got applied upstream

diff --git a/debian/patches/0001-Fix-build-with-gcc-4.5.patch b/debian/patches/0001-Fix-build-with-gcc-4.5.patch
deleted file mode 100644
index 0c9c61a..0000000
--- a/debian/patches/0001-Fix-build-with-gcc-4.5.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Description: Fix build with gcc-4.5
-  New version of GCC does not like the X::X() construct.
-Origin: http://sourceforge.net/tracker/?func=detail&aid=2931589&group_id=149850&atid=775999
-Author: Nick Gasson <nick at nickg.me.uk>
----
- pform_disciplines.cc |   10 +++++-----
- 1 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/pform_disciplines.cc b/pform_disciplines.cc
-index 73a23b5..c05ff13 100644
---- a/pform_disciplines.cc
-+++ b/pform_disciplines.cc
-@@ -27,8 +27,8 @@ map<perm_string,ivl_nature_t> natures;
- map<perm_string,ivl_discipline_t> disciplines;
- map<perm_string,ivl_nature_t> access_function_nature;
- 
--static perm_string nature_name = perm_string::perm_string();
--static perm_string nature_access = perm_string::perm_string();
-+static perm_string nature_name = perm_string();
-+static perm_string nature_access = perm_string();
- 
- void pform_start_nature(const char*name)
- {
-@@ -82,8 +82,8 @@ void pform_end_nature(const struct vlltype&loc)
- 	// expressions that use the access function can find it.
-       access_function_nature[nature_access] = tmp;
- 
--      nature_name = perm_string::perm_string();
--      nature_access = perm_string::perm_string();
-+      nature_name = perm_string();
-+      nature_access = perm_string();
- }
- 
- 
-@@ -171,7 +171,7 @@ void pform_end_discipline(const struct vlltype&loc)
-       FILE_NAME(tmp, loc);
- 
- 	/* Clear the static variables for the next item. */
--      discipline_name = perm_string::perm_string();
-+      discipline_name = perm_string();
-       discipline_domain = IVL_DIS_NONE;
-       discipline_potential = 0;
-       discipline_flow = 0;
--- 
-1.6.5
-
diff --git a/debian/patches/series b/debian/patches/series
index cf0946c..d6cfa75 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 outdated_config.diff
-0001-Fix-build-with-gcc-4.5.patch

-- 
Debian packaging for Icarus Verilog