[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:24 UTC 2011
The following commit has been merged in the debian branch:
commit be106d2c4267538b878c10b24758d735b7253313
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date: Sun Mar 27 09:41:03 2011 +0200
* import all changes done by Jonathan Michalon <johndescs at gmail.com>
diff --git a/debian/changelog b/debian/changelog
index 4857a86..243949c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,30 @@
+lisaac (1:0.39~rc1-0.1) unstable; urgency=low
+
+ * Non-maintainer upload
+ * New upstream release
+ + Lots of various improvements, huge gap between versions.
+ + Reuse Makefile of previous packaging since the new one is interactive
+ * Switch to short debian/rules
+ * Provide doc-base integration with debian/lisaac-doc.doc-base
+ * Update makefile.patch
+ * Add new patch fixing typo in source code (lintian warning)
+ * Update URL in debian/watch and debian/control (Closes: #612824)
+ * Bump Standards-Version to 3.9.1
+
+ -- Jonathan Michalon <johndescs at gmail.com> Tue, 19 Oct 2010 13:39:15 +0200
+
+lisaac (1:0.13.1-3) unstable; urgency=low
+
+ * debian/control:
+ - Change my mail address
+ - Bump Standards-Version to 3.8.4
+ - Update Build-Depends on debhelper 7
+ - Update Depends on emacs23 instead of emacs22 (Closes: #571568)
+ * Update debian/compat to 7
+ * Switch to dpkg-source 3.0 (quilt) format
+
+ -- Xavier Oswald <xoswald at debian.org> Mon, 01 Mar 2010 23:51:44 +0100
+
lisaac (1:0.13.1-2) unstable; urgency=low
* Add myself to Uploaders with the team's agreement.
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 98d4e2e..bb78665 100644
--- a/debian/control
+++ b/debian/control
@@ -2,15 +2,15 @@ Source: lisaac
Section: devel
Priority: optional
Maintainer: picca frederic <picca at synchrotron-soleil.fr>
-Uploaders: Xavier Oswald <x.oswald at free.fr>, Aurélien GÉRÔME <ag at debian.org>
-Build-Depends: debhelper (>= 5.0.0), gcc (>= 4.1), quilt, emacs22 | emacsen
-Standards-Version: 3.8.0
-Homepage: http://isaacproject.u-strasbg.fr/
+Uploaders: Xavier Oswald <xoswald at debian.org>, Aurélien GÉRÔME <ag at debian.org>
+Build-Depends: debhelper (>= 7), gcc (>= 4.1)
+Standards-Version: 3.9.1
+Homepage: http://lisaac.org/
DM-Upload-Allowed: yes
Package: lisaac
Architecture: any
-Depends: ${shlibs:Depends}, lisaac-common, gcc(>= 4.1)
+Depends: ${shlibs:Depends}, ${misc:Depends}, lisaac-common, gcc(>= 4.1)
Recommends: lisaac-doc
Suggests: lisaac-mode
Description: Object-oriented language base on prototype
@@ -32,22 +32,26 @@ Description: Object-oriented language base on prototype
Package: lisaac-common
Architecture: all
+Depends: ${misc:Depends}
Description: Arch-independent part for lisaac
Lisaac is a small prototype-based programming language.
.
This package contains the libraries needed by the Lisaac compiler.
+ They are grouped in four categories, intra, standard, unstable and extra.
Package: lisaac-doc
Section: doc
Architecture: all
+Depends: ${misc:Depends}
Description: Documentation for lisaac
Lisaac is a small prototype-based programming language.
.
This package contains the documentation in html format.
+ Your are also provided with a pdf smart and complete documentation.
Package: lisaac-mode
Architecture: all
-Depends: emacs22 | emacsen
+Depends: ${misc:Depends}, emacs23 | emacsen
Enhances: lisaac
Description: Emacs mode for editing Lisaac programs
Lisaac is a small prototype-based programming language.
diff --git a/debian/lisaac-doc.install b/debian/lisaac-doc.install
index 1a184dc..de15d94 100644
--- a/debian/lisaac-doc.install
+++ b/debian/lisaac-doc.install
@@ -1,2 +1,2 @@
-usr/share/doc/lisaac-doc/html
+usr/share/doc/lisaac-doc/pdf
usr/share/doc/lisaac-doc/examples
diff --git a/debian/lisaac-mode.install b/debian/lisaac-mode.install
index ea58b31..007a923 100644
--- a/debian/lisaac-mode.install
+++ b/debian/lisaac-mode.install
@@ -1 +1 @@
-usr/share/emacs/site-lisp/lisaac-mode
+#usr/share/emacs/site-lisp/lisaac-mode
diff --git a/debian/patches/makefile.patch b/debian/patches/makefile.patch
index 36ade62..cee246f 100644
--- a/debian/patches/makefile.patch
+++ b/debian/patches/makefile.patch
@@ -1,48 +1,85 @@
-Index: lisaac-0.13.1/Makefile
-===================================================================
---- lisaac-0.13.1.orig/Makefile 2008-08-02 09:38:49.000000000 +0200
-+++ lisaac-0.13.1/Makefile 2008-08-02 09:39:53.000000000 +0200
-@@ -54,12 +54,13 @@
- # bug tracker system: https://gna.org/bugs/?func=additem&group=isaac
- # mail to: Xavier Oswald <x.oswald at free.fr>
+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/lib/lisaac
++
+LIB=/usr/share/lisaac
- EXAMPLE=/examples
- HTML=/html
- BIN=/usr/bin
- MAN=/usr/share/man/man1
--DOC=/usr/share/doc/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=
++DESTDIR=
++
CC=gcc
CFLAGS=-O2
-@@ -81,23 +82,21 @@
- mkdir -p $(DESTDIR)$(MAN)
- mkdir -p $(DESTDIR)$(DOC)$(HTML)
- 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 -rf lib_os/ $(DESTDIR)$(LIB)
-+ cp -rf lib_html/* $(DESTDIR)$(DOC)$(HTML)
- cp -rf example/* $(DESTDIR)$(DOC)$(EXAMPLE)
+
+-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
- cp -rf shorter/ $(DESTDIR)$(LIB)
- cp -rf manpage/*.gz $(DESTDIR)$(MAN)
-+ cp -f editor/emacs/lisaac-mode.el $(DESTDIR)$(EMACS)
- #$(DESTDIR)$(BIN)/shorter -r -f html lib -o $(DESTDIR)$(DOC)$(HTML)
++ 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 -rf bin/lisaac
- rm -rf bin/shorter
- rm -rf bin/path.h
-- rm -rf $(DESTDIR)$(BIN)/lisaac
-- rm -rf $(DESTDIR)$(BIN)/shorter
-- rm -rf $(DESTDIR)$(LIB)
-- rm -rf $(DESTDIR)$(DOC)
-- rm -rf $(DESTDIR)$(MAN)/lisaac.1.gz
-- rm -rf $(DESTDIR)$(MAN)/shorter.1.gz
+- 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 82374e5..ae095ac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
makefile.patch
+typo-lisaac-c.patch
diff --git a/debian/patches/typo-lisaac-c.patch b/debian/patches/typo-lisaac-c.patch
new file mode 100644
index 0000000..5cb2b4f
--- /dev/null
+++ b/debian/patches/typo-lisaac-c.patch
@@ -0,0 +1,12 @@
+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 *)"};
diff --git a/debian/rules b/debian/rules
index 7cddf05..806ab05 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,94 +1,15 @@
#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
-include /usr/share/quilt/quilt.make
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-CFLAGS = -g
+%:
+ dh $@
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- touch configure-stamp
-
-build: patch build-arch build-indep
-
-build-arch: build-arch-stamp
-build-arch-stamp: configure-stamp
-ifeq (,$(filter $(shell dpkg-architecture -qDEB_BUILD_ARCH), alpha amd64 ia64))
- $(MAKE) CFLAGS="$(CFLAGS)"
-else
- @echo "************************************************************************" >&2
- @echo "* Sorry, this package is not supposed to work on 64-bit architectures! *" >&2
- @echo "************************************************************************" >&2
- @false
-endif
- touch build-arch-stamp
-
-build-indep: build-indep-stamp
-build-indep-stamp: configure-stamp
- touch build-indep-stamp
-
-clean: clean-patched unpatch
-clean-patched:
- dh_testdir
- dh_testroot
- $(MAKE) clean DESTDIR=$(CURDIR)/debian/tmp
- rm -f build-arch-stamp
- rm -f build-indep-stamp
- dh_clean
-
-install: install-indep install-arch
-install-indep:
- dh_testdir
- dh_testroot
- dh_clean -k -i
- dh_installdirs -i
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
- [ ! -f $(CURDIR)/debian/tmp/usr/share/lisaac/lib/clean ] || rm --verbose $(CURDIR)/debian/tmp/usr/share/lisaac/lib/clean
- [ ! -f $(CURDIR)/debian/tmp/usr/share/lisaac/lib_os/clean ] || rm --verbose $(CURDIR)/debian/tmp/usr/share/lisaac/lib_os/clean
- [ ! -f $(CURDIR)/debian/tmp/usr/share/lisaac/lib/number/essai ] || rm --verbose $(CURDIR)/debian/tmp/usr/share/lisaac/lib/number/essai
- dh_install -i --sourcedir=debian/tmp
-
-install-arch:
- dh_testdir
- dh_testroot
- dh_clean -k -s
- dh_installdirs -s
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
- dh_install -s --sourcedir=debian/tmp
- dh_installman
-
-binary-common:
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installemacsen
- dh_installexamples
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary-indep: build-indep install-indep
- $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-binary-arch: build-arch install-arch
- $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
-
-binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
index fb53d47..cf9b1a1 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
version=3
-http://isaacproject.u-strasbg.fr/download/lisaac-(.*)\.tar\.gz
+# disabled since we got a forbidden...
+#http://lisaac.org/download/lisaac-(.*)\.tar\.gz
--
Lisaac compiler
More information about the Lisaac-commits
mailing list