Merge branch 'master' of ssh://git.b9.com/home/gitpub/lml2
authorKevin M. Rosenberg <kevin@rosenberg.net>
Mon, 19 Mar 2012 16:47:32 +0000 (10:47 -0600)
committerKevin M. Rosenberg <kevin@rosenberg.net>
Mon, 19 Mar 2012 16:47:32 +0000 (10:47 -0600)
12 files changed:
.gitignore [changed mode: 0644->0755]
ChangeLog
debian/changelog
debian/cl-lml2.doc-base [new file with mode: 0644]
debian/compat
debian/control
debian/postinst [deleted file]
debian/prerm [deleted file]
debian/rules
debian/watch [new file with mode: 0644]
doc/Makefile [changed mode: 0644->0755]
tests.lisp

old mode 100644 (file)
new mode 100755 (executable)
index 396b7b6cfc3a0857feee2f6b7cc3b2e7b9a135f5..84fb864311a8f47e0011f1f3ba7af8f424ab117f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-10  Kevin M. Rosenberg  <kevin@rosenberg.net>
+       * Version 1.6.6
+       * tests.lisp: Fix package names
+
 2007-10-22  Kevin M. Rosenberg  <kevin@rosenberg.net>
        * Version 1.6.5
        * htmlgen.lisp: Remove dependency on simple string, thanks to Anton Vodonosov
index f92780584823c21052ff82ae346cb8fe3ba87c8d..a3745d8aabbf05395f57b925cff2f1f657048781 100644 (file)
@@ -1,3 +1,34 @@
+cl-lml2 (1.6.6-4) unstable; urgency=low
+
+  * Add doc-base entry for readme.html
+  * Update standards-version (no changes needed)
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Mon, 16 Nov 2009 09:08:48 -0700
+
+cl-lml2 (1.6.6-3) unstable; urgency=low
+
+  * Build with debhelper extension dh-lisp
+  * control: Add Vcs-Browser field. Fix Depends field.
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Mon, 03 Aug 2009 14:21:37 -0600
+
+cl-lml2 (1.6.6-2) unstable; urgency=low
+
+  * debian/watch: New file
+  * debian/control: Require debhelper 7. Change to new lisp section.
+  Add Vcs-Git and Homepage fields.
+  * debian/compat: Update to version 7
+  * debian/rules: Update for debhelper 7, architecture-independent build
+  * debian/{prerm,postrm}: Remove path from binary function
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Sun, 02 Aug 2009 02:15:56 -0600
+
+cl-lml2 (1.6.6-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Sun, 09 Dec 2007 07:47:36 -0700
+
 cl-lml2 (1.6.5-1) unstable; urgency=low
 
   * New upstream
diff --git a/debian/cl-lml2.doc-base b/debian/cl-lml2.doc-base
new file mode 100644 (file)
index 0000000..4427ea8
--- /dev/null
@@ -0,0 +1,10 @@
+Document: cl-lml2
+Title: CL-LML2
+Author: Kevin Rosenberg
+Abstract: This manual describes the use of the LML2 Common Lisp
+ Markup Language
+Section: Programming/Lisp
+
+Format: HTML
+Index: /usr/share/doc/cl-lml2/readme.html
+Files: /usr/share/doc/cl-lml2/readme.html
index b8626c4cff2849624fb67f87cd0ad72b163671ad..7f8f011eb73d6043d2e6db9d2c101195ae2801f2 100644 (file)
@@ -1 +1 @@
-4
+7
index d919cbc99cb41261904fe1b2a7d47d3733e48a2c..7658d77886248edbfdbf2fce1005c47cd0d48f5a 100644 (file)
@@ -1,16 +1,19 @@
 Source: cl-lml2
-Section: devel
+Section: lisp
 Priority: optional
 Maintainer: Kevin M. Rosenberg <kmr@debian.org>
-Build-Depends: debhelper (>> 4.0.0)
-Standards-Version: 3.7.2.2
+Build-Depends-Indep: dh-lisp
+Build-Depends: debhelper (>> 7.0.0)
+Standards-Version: 3.8.3.0
+Homepage: http://lml2.b9.com/
+Vcs-Git: git://git.b9.com/lml2.git
+Vcs-Browser: http://git.b9.com/?p=lml2.git
 
 Package: cl-lml2
 Architecture: all
-Depends: ${shlibs:Depends}, common-lisp-controller (>= 3.37), cl-kmrcl
+Depends: ${misc:Depends}, cl-kmrcl
 Description: Lisp Markup Language
  LML2 provides a markup language for generation XHTML web pages.
  .
- The usage of LML2 is incompatible the the original LML version. However,
+ The usage of LML2 is incompatible with the original LML version. However,
  the two versions may be used along side each other.
-
diff --git a/debian/postinst b/debian/postinst
deleted file mode 100644 (file)
index a6ea28d..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /bin/sh
-set -e
-
-LISP_PKG=lml2
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-#
-# quoting from the policy:
-#     Any necessary prompting should almost always be confined to the
-#     post-installation script, and should be protected with a conditional
-#     so that unnecessary prompting doesn't happen if a package's
-#     installation fails and the `postinst' is called with `abort-upgrade',
-#     `abort-remove' or `abort-deconfigure'.
-
-case "$1" in
-    configure)
-       /usr/sbin/register-common-lisp-source ${LISP_PKG}
-
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/debian/prerm b/debian/prerm
deleted file mode 100644 (file)
index 4abbfb2..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh
-set -e
-
-# package name according to lisp
-LISP_PKG=lml2
-
-# summary of how this script can be called:
-#        * <prerm> `remove'
-#        * <old-prerm> `upgrade' <new-version>
-#        * <new-prerm> `failed-upgrade' <old-version>
-#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-#        * <deconfigured's-prerm> `deconfigure' `in-favour'
-#          <package-being-installed> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    remove|upgrade|deconfigure)
-       /usr/sbin/unregister-common-lisp-source ${LISP_PKG}
-        ;;
-    failed-upgrade)
-        ;;
-    *)
-        echo "prerm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
index ff93e37763662afe73cf93b169eaf1e11daf6e6a..cc4f062426b2b223383c91da7a2504a81521bd71 100755 (executable)
@@ -1,79 +1,45 @@
 #!/usr/bin/make -f
 
-pkg    := lml2
-debpkg  := cl-lml2
+pkg            := lml2
+debpkg         := cl-lml2
 
 clc-source     := usr/share/common-lisp/source
 clc-systems    := usr/share/common-lisp/systems
-clc-lml2       := $(clc-source)/$(pkg)
+clc-files      := $(clc-source)/$(pkg)
 
-doc-dir                := usr/share/doc/$(debpkg)
-
-configure: configure-stamp
-configure-stamp:
-       dh_testdir
-       # Add here commands to configure the package.
-       touch configure-stamp
 
-
-build: build-stamp
-
-build-stamp: configure-stamp 
-       dh_testdir
-       # Add here commands to compile the package.
-       touch build-stamp
+build:
 
 clean:
        dh_testdir
        dh_testroot
-       rm -f build-stamp configure-stamp
-       # Add here commands to clean up after the build process.
-       rm -f debian/cl-lml2.postinst.* debian/cl-lml2.prerm.*
        dh_clean
 
 install: build
        dh_testdir
        dh_testroot
-       dh_clean -k
-       # Add here commands to install the package into debian/lml2.
-       dh_installdirs $(clc-systems) $(clc-lml2) $(doc-dir)
-       dh_install lml2.asd lml2-tests.asd $(shell echo *.lisp) $(clc-lml2)
-       dh_link $(clc-lml2)/lml2.asd $(clc-systems)/lml2.asd
-       dh_link $(clc-lml2)/lml2-tests.asd $(clc-systems)/lml2-tests.asd
-
-# Build architecture-independent files here.
-binary-indep: build install
+       dh_prep
+       dh_installdirs
+       dh_install lml2.asd lml2-tests.asd $(clc-files)
+       dh_install *.lisp $(clc-files)
 
+binary-arch:
 
-# Build architecture-dependent files here.
-binary-arch: build install
+binary-indep: install
        dh_testdir
        dh_testroot
-#      dh_installdebconf       
        dh_installdocs doc/readme.html
-       dh_installexamples doc/Makefile doc/make.lisp $(shell echo doc/*.lml)
-#      dh_installmenu
-#      dh_installlogrotate
-#      dh_installemacsen
-#      dh_installpam
-#      dh_installmime
-#      dh_installinit
-#      dh_installcron
-#      dh_installman
-#      dh_installinfo
-#      dh_undocumented
-       dh_installchangelogs ChangeLog
-       dh_strip
+       dh_installexamples doc/Makefile doc/make.lisp doc/*.lml
+       dh_installchangelogs
+       dh_lisp
        dh_compress
        dh_fixperms
-#      dh_makeshlibs
        dh_installdeb
-#      dh_perl
-       dh_shlibdeps
        dh_gencontrol
        dh_md5sums
        dh_builddeb
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+binary: binary-indep
+
 
+.PHONY: build clean binary-arch binary-indep binary install
diff --git a/debian/watch b/debian/watch
new file mode 100644 (file)
index 0000000..110187c
--- /dev/null
@@ -0,0 +1,3 @@
+version=3
+http://files.b9.com/lml2/lml2-([\d\.]*)\.tar\.gz
+
old mode 100644 (file)
new mode 100755 (executable)
index 0387f88..1f9c384
@@ -1,3 +1,4 @@
+#!/usr/bin/make
 .PHONY: site all clean
 
 all: site
index 14dc3c86cd046b9b1243e9ed9c8b329c3ae945b9..5efcd47caedb9abb1cd73d42793b8cf30deb8d03 100644 (file)
 ;;;; *************************************************************************
 
 (in-package #:cl)
-(defpackage #:gmparse-tests
-  (:use #:gmparse #:cl #:rtest))
-(in-package #:gmparse-tests)
+(defpackage #:lml2-tests
+  (:use #:lml2 #:cl #:regression-test))
+(in-package #:lml2-tests)
 
 (rem-all-tests)
 
+