[SCM] Lisaac compiler branch, debian, updated. lisaac-0.12-625-g958996b
Picca Frédéric-Emmanuel
picca at synchrotron-soleil.fr
Sun Mar 27 09:47:40 UTC 2011
The following commit has been merged in the debian branch:
commit 2934cc58d3af12556b87aef8bc4bfab29e942b80
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date: Sun Mar 27 10:56:57 2011 +0200
* regenerate the patch queue with gbp-pq
diff --git a/debian/patches/0001-typo-lisaac-c.patch b/debian/patches/0001-typo-lisaac-c.patch
new file mode 100644
index 0000000..43d325e
--- /dev/null
+++ b/debian/patches/0001-typo-lisaac-c.patch
@@ -0,0 +1,23 @@
+From: picca frederic <picca at synchrotron-soleil.fr>
+Date: Sun, 27 Mar 2011 09:54:49 +0200
+Subject: typo-lisaac-c
+
+Fix small typo spotted by lintian
+---
+ bin/lisaac.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/bin/lisaac.c b/bin/lisaac.c
+index 99a1678..926c023 100644
+--- a/bin/lisaac.c
++++ b/bin/lisaac.c
+@@ -4267,7 +4267,7 @@ __li__U __string_699={__li__U__,11,"(&__string_"};
+ __li__U __string_700={__li__U__,8," style ["};
+ __li__U __string_701={__li__U__,2,"] "};
+ __li__U __string_702={__li__U__,36,"BUG ALIASER_LOCAL.add_var_size Error"};
+-__li__U __string_703={__li__U__,16,"/* PERSISTANT */"};
++__li__U __string_703={__li__U__,16,"/* PERSISTENT */"};
+ __li__U __string_704={__li__U__,2,")("};
+ __li__U __string_705={__li__U__,2,"))"};
+ __li__U __string_706={__li__U__,8,"(void *)"};
+--
diff --git a/debian/patches/0002-debian-fix-the-makefile.patch b/debian/patches/0002-debian-fix-the-makefile.patch
new file mode 100644
index 0000000..a14e6e6
--- /dev/null
+++ b/debian/patches/0002-debian-fix-the-makefile.patch
@@ -0,0 +1,70 @@
+From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at synchrotron-soleil.fr>
+Date: Sun, 27 Mar 2011 10:53:01 +0200
+Subject: debian fix the makefile
+
+Make the makefile suitable for packaging.
+---
+ Makefile | 45 +++++++++++++++++++++++++++++++++++++--------
+ 1 files changed, 37 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 7ace1c6..b5dea6e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -15,17 +15,46 @@
+ # You should have received a copy of the GNU General Public License
+ # along with this program. If not, see <http://www.gnu.org/licenses/>.
+
++
++LIB=/usr/share/lisaac
++EXAMPLE=/examples
++HTML=/html
++PDF=/pdf
++BIN=/usr/bin
++MAN=/usr/share/man/man1
++DOC=/usr/share/doc/lisaac-doc
++EMACS=/usr/share/emacs/site-lisp/lisaac-mode
++DESTDIR=
++
+ CC=gcc
+ CFLAGS=-O2
+
+-all: install_lisaac
+- ./install_lisaac
++all: bin/lisaac
++
++bin/path.h:
++ @echo "#define LISAAC_DIRECTORY \"$(LIB)\"" > bin/path.h
++
++bin/lisaac: bin/lisaac.c bin/path.h
++ $(CC) $(CFLAGS) $< -o $@
+
+-install_lisaac:
+- $(CC) $(CFLAGS) install_lisaac.c -o install_lisaac
++install:
++ mkdir -p $(DESTDIR)$(LIB)
++ mkdir -p $(DESTDIR)$(BIN)
++ mkdir -p $(DESTDIR)$(MAN)
++ mkdir -p $(DESTDIR)$(DOC)$(PDF)
++ mkdir -p $(DESTDIR)$(DOC)$(EXAMPLE)
++ mkdir -p $(DESTDIR)$(EMACS)
++ cp bin/lisaac $(DESTDIR)$(BIN)
++ cp -rf lib/ $(DESTDIR)$(LIB)
++ cp make.lip.sample $(DESTDIR)$(LIB)/make.lip
++# this seems really too unstable to be packed
++ rm -rf $(DESTDIR)$(LIB)/lib/unstable/freetype
++ cp -rf example/* $(DESTDIR)$(DOC)$(EXAMPLE)
++ rm -rf $(DESTDIR)$(DOC)$(EXAMPLE)/shootout
++ rm -rf $(DESTDIR)$(DOC)$(EXAMPLE)/gui/clock/.avoir.txt.swp
++ cp -rf doc/man/*.gz $(DESTDIR)$(MAN)
++ cp -rf doc/pdf/* $(DESTDIR)$(DOC)$(PDF)
++ cp -f editor/emacs/lisaac-mode.el $(DESTDIR)$(EMACS)
+
+ clean:
+- rm -f install_lisaac
+- rm -f bin/shorter.c bin/path.h bin/lisaac bin/shorter
+- rm -f src/shorter src/path.h
+- rm -rf doc/html
++ rm -f bin/path.h bin/lisaac
+\ No newline at end of file
+--
diff --git a/debian/patches/makefile.patch b/debian/patches/makefile.patch
deleted file mode 100644
index cee246f..0000000
--- a/debian/patches/makefile.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-Make the makefile suitable for packaging.
---- a/Makefile
-+++ b/Makefile
-@@ -1,31 +1,66 @@
--# This file is part of Lisaac compiler.
--# http://isaacproject.u-strasbg.fr/
--# LSIIT - ULP - CNRS - INRIA - FRANCE
-+# This file is part of Lisaac compiler.
-+# http://isaacproject.u-strasbg.fr/
-+# LSIIT - ULP - CNRS - INRIA - FRANCE
- #
- # This program is free software: you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
- # the Free Software Foundation, either version 3 of the License, or
--# (at your option) any later version.
--#
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--#
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+#
- # You should have received a copy of the GNU General Public License
- # along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-+
-+LIB=/usr/share/lisaac
-+EXAMPLE=/examples
-+HTML=/html
-+PDF=/pdf
-+BIN=/usr/bin
-+MAN=/usr/share/man/man1
-+DOC=/usr/share/doc/lisaac-doc
-+EMACS=/usr/share/emacs/site-lisp/lisaac-mode
-+DESTDIR=
-+
- CC=gcc
- CFLAGS=-O2
-
--all: install_lisaac
-- ./install_lisaac
-+all: bin/lisaac.c
-+ @echo "#define LISAAC_DIRECTORY \"$(DESTDIR)$(LIB)\"" > bin/path.h
-+ $(CC) $(CFLAGS) bin/lisaac.c -o bin/lisaac
-+
-+install:
-+ mkdir -p $(DESTDIR)$(LIB)
-+ mkdir -p $(DESTDIR)$(BIN)
-+ mkdir -p $(DESTDIR)$(MAN)
-+# mkdir -p $(DESTDIR)$(DOC)$(HTML)
-+ mkdir -p $(DESTDIR)$(DOC)$(PDF)
-+ mkdir -p $(DESTDIR)$(DOC)$(EXAMPLE)
-+# mkdir -p $(DESTDIR)$(EMACS)
-+ cp bin/lisaac $(DESTDIR)$(BIN)
-+# cp bin/shorter $(DESTDIR)$(BIN)
-+# cp path.li $(DESTDIR)$(LIB)
-+ cp -rf lib/ $(DESTDIR)$(LIB)
-+ cp make.lip.sample $(DESTDIR)$(LIB)/make.lip
-+# this seems really too unstable to be packed
-+ rm -rf $(DESTDIR)$(LIB)/lib/unstable/freetype
-+# cp -rf lib_os/ $(DESTDIR)$(LIB)
-+# cp -rf lib_html/* $(DESTDIR)$(DOC)$(HTML)
-+ cp -rf example/* $(DESTDIR)$(DOC)$(EXAMPLE)
-+ rm -rf $(DESTDIR)$(DOC)$(EXAMPLE)/shootout
-+ rm -rf $(DESTDIR)$(DOC)$(EXAMPLE)/gui/clock/.avoir.txt.swp
-+# cp -rf shorter/ $(DESTDIR)$(LIB)
-+ cp -rf doc/man/*.gz $(DESTDIR)$(MAN)
-+ cp -rf doc/pdf/* $(DESTDIR)$(DOC)$(PDF)
-+# cp -f editor/emacs/lisaac-mode.el $(DESTDIR)$(EMACS)
-+# $(DESTDIR)$(BIN)/shorter -r -f html lib -o $(DESTDIR)$(DOC)$(HTML)
-
--install_lisaac:
-- $(CC) $(CFLAGS) install_lisaac.c -o install_lisaac
-
- clean:
-- rm -f install_lisaac
- rm -f bin/shorter.c bin/path.h bin/lisaac bin/shorter
- rm -f src/shorter src/path.h
- rm -rf doc/html
diff --git a/debian/patches/series b/debian/patches/series
index ae095ac..8175be3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-makefile.patch
-typo-lisaac-c.patch
+0001-typo-lisaac-c.patch
+0002-debian-fix-the-makefile.patch
diff --git a/debian/patches/typo-lisaac-c.patch b/debian/patches/typo-lisaac-c.patch
deleted file mode 100644
index 5cb2b4f..0000000
--- a/debian/patches/typo-lisaac-c.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Fix small typo spotted by lintian
---- a/bin/lisaac.c
-+++ b/bin/lisaac.c
-@@ -4267,7 +4267,7 @@
- __li__U __string_700={__li__U__,8," style ["};
- __li__U __string_701={__li__U__,2,"] "};
- __li__U __string_702={__li__U__,36,"BUG ALIASER_LOCAL.add_var_size Error"};
--__li__U __string_703={__li__U__,16,"/* PERSISTANT */"};
-+__li__U __string_703={__li__U__,16,"/* PERSISTENT */"};
- __li__U __string_704={__li__U__,2,")("};
- __li__U __string_705={__li__U__,2,"))"};
- __li__U __string_706={__li__U__,8,"(void *)"};
--
Lisaac compiler
More information about the Lisaac-commits
mailing list