[Pkg-electronics-commits] [SCM] Packaging for Verilator branch, master, updated. debian/3.801-1-5-g734a0ed

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

The following commit has been merged in the master branch:
commit 46dc52b5afc070c094d397d7ed0be24db9f0975d
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date:   Sat May 1 22:24:12 2010 +0300

    Removed install_perms.diff & typos.diff patches, as they got applied
    upstream.

diff --git a/debian/patches/install_perms.diff b/debian/patches/install_perms.diff
deleted file mode 100644
index 402fb80..0000000
--- a/debian/patches/install_perms.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: Install data files without executable permissions
-Forwarded: http://www.veripool.org/issues/show/239
-Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -267,20 +267,20 @@
- installman: $(VL_INST_MAN_FILES)
- 	$(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(mandir)/man1
- 	for p in $(VL_INST_MAN_FILES) ; do \
--	  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(mandir)/man1/$$p; \
-+	  $(INSTALL_DATA) $$p $(DESTDIR)$(mandir)/man1/$$p; \
- 	done
- 
- installdata:
- 	$(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(pkgdatadir)/include/vltstd
- 	for p in $(VL_INST_INC_FILES) ; do \
--	  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkgdatadir)/$$p; \
-+	  $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p; \
- 	done
- 	$(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(pkgdatadir)/examples/test_c
- 	$(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(pkgdatadir)/examples/test_sc
- 	$(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(pkgdatadir)/examples/test_sp
- 	$(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(pkgdatadir)/examples/test_v
- 	for p in $(VL_INST_DATA_FILES) ; do \
--	  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkgdatadir)/examples/$$p; \
-+	  $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/examples/$$p; \
- 	done
- 
- # We don't trust rm -rf, so rmdir instead as it will fail if user put in other files
-@@ -313,7 +313,7 @@
- 	strip verilator_bin*
- 	$(MAKE) install-project-quick
- 	for p in verilator.1 ; do \
--	  $(INSTALL_PROGRAM) -m 0666 $$p $(DIRPROJECT_PREFIX)/man/man1/$$p; \
-+	  $(INSTALL_DATA) $$p $(DIRPROJECT_PREFIX)/man/man1/$$p; \
- 	done
- 	$(INST_PROJ_CVS) $(DISTNAME).tgz $(DIRPROJECT)/hw/utils/verilator/verilator.tgz
- 	rm $(DISTNAME).tgz
diff --git a/debian/patches/series b/debian/patches/series
index 36b52f8..4b7e6fa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 shebang.diff
-install_perms.diff
-typos.diff
diff --git a/debian/patches/typos.diff b/debian/patches/typos.diff
deleted file mode 100644
index fdc8b1d..0000000
--- a/debian/patches/typos.diff
+++ /dev/null
@@ -1,51 +0,0 @@
-Description: Fix some spelling mistakes in verilator executable & manpage
-Forwarded: http://www.veripool.org/issues/show/240
-Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
---- a/verilator.1
-+++ b/verilator.1
-@@ -1319,20 +1319,20 @@
- .ie n .IP "coverage_off [\-file ""<filename>"" [\-lines <line> [ \- <line> ]]]" 4
- .el .IP "coverage_off [\-file ``<filename>'' [\-lines <line> [ \- <line> ]]]" 4
- .IX Item "coverage_off [-file <filename> [-lines <line> [ - <line> ]]]"
--Disable coverage for the specified filename (or all files if ommitted) and
--range of line numbers (or all lines if ommitted).  Often used to ignore an
-+Disable coverage for the specified filename (or all files if omitted) and
-+range of line numbers (or all lines if omitted).  Often used to ignore an
- entire module for coverage analysis purposes.
- .ie n .IP "lint_off \-msg <message> [\-file ""<filename>"" [\-lines <line> [ \- <line>]]]" 4
- .el .IP "lint_off \-msg <message> [\-file ``<filename>'' [\-lines <line> [ \- <line>]]]" 4
- .IX Item "lint_off -msg <message> [-file <filename> [-lines <line> [ - <line>]]]"
- Disables the specified lint warning in the specified filename (or all files
--if ommitted) and range of line numbers (or all lines if ommitted).
-+if omitted) and range of line numbers (or all lines if omitted).
- .ie n .IP "tracing_off [\-file ""<filename>"" [\-lines <line> [ \- <line> ]]]" 4
- .el .IP "tracing_off [\-file ``<filename>'' [\-lines <line> [ \- <line> ]]]" 4
- .IX Item "tracing_off [-file <filename> [-lines <line> [ - <line> ]]]"
- Disable waveform tracing for all future signals declared in the specified
--filename (or all files if ommitted) and range of line numbers (or all lines
--if ommitted).
-+filename (or all files if omitted) and range of line numbers (or all lines
-+if omitted).
- .SH "LANGUAGE STANDARD SUPPORT"
- .IX Header "LANGUAGE STANDARD SUPPORT"
- .Sh "Verilog 2001 (\s-1IEEE\s0 1364\-2001) Support"
-@@ -1544,7 +1544,7 @@
- Often used to ignore an entire module for coverage analysis purposes.
- .IP "/*verilator coverage_on*/" 4
- .IX Item "/*verilator coverage_on*/"
--Specifies that following lines of code should have coverage reenabled (if
-+Specifies that following lines of code should have coverage re-enabled (if
- appropriate \-\-coverage flags are passed) after being disabled earlier with
- /*verilator coverage_off*/.
- .IP "/*verilator inline_module*/" 4
---- a/src/V3Unroll.cpp
-+++ b/src/V3Unroll.cpp
-@@ -349,7 +349,7 @@
- 				      nodep->incsp(), nodep->bodysp())) {
- 		pushDeletep(nodep); nodep=NULL; // Did replacement
- 	    } else {
--		nodep->v3error("For loop doesn't have genvar index, or is misformed");
-+		nodep->v3error("For loop doesn't have genvar index, or is malformed");
- 	    }
- 	}
-     }

-- 
Packaging for Verilator