[SCM] mona packaging branch, master, updated. upstream/1.4-2-17-g7d5620d

Ralf Treinen treinen at free.fr
Wed May 11 20:50:17 UTC 2011


The following commit has been merged in the master branch:
commit d19e69cb07e748ed379bf02af2ee849eb8ff5983
Merge: 9852f2c845cc49b82a14355f6b5ad4a28d58a390 8301e10621ec2f8bfd69896765eae5e893a75aef
Author: Ralf Treinen <treinen at debian.org>
Date:   Thu Aug 27 20:25:39 2009 +0200

    Imported Debian patch 1.4-13-1

diff --combined debian/changelog
index a1d04e1,0000000..955dbb8
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,112 -1,0 +1,129 @@@
++mona (1.4-13-1) unstable; urgency=low
++
++  * New upstream release
++  * debian/rules:
++    - we do not have to calculate DEB_HOST_ARCH ourselves
++    - dh-clean -k => dh_prep
++    - Drop usage of dpatch, link to recent config.{sub.guess} during build.
++    - use variable $(INSTALLROOT)
++    - install lintian overrides
++  * Lintian overrides for private libraries 
++  * dh-compat level 7
++  * Change section to math
++  * Standards-Version 3.8.3 (no change)
++  * Remove build-dependency on dpatch
++
++ -- Ralf Treinen <treinen at debian.org>  Thu, 27 Aug 2009 20:25:39 +0200
++
 +mona (1.4-10-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * debian/conrol: 
 +    - add homepage field.
 +    - Standards-Version 3.7.3 (no change).
 +    - build-depends on chrpath
 +  * debian/rules: 
 +    - have build-stamp depend on patch-stamp in order to avoid
 +      multiple configuration passes.
 +    - use upstream install target to install everything
 +    - use chrpah to clear out rpaths 
 +
 + -- Ralf Treinen <treinen at debian.org>  Tue, 15 Apr 2008 20:05:10 +0200
 +
 +mona (1.4-8-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Removed patches 01_gcc3.4 and 02_gcc4.0 as this upstream version
 +    compiles cleanly on gcc-3.4 and gcc-4.1.
 +  * Patch 01_config: use recent config.{guess,sub}, depend on autotools-dev.
 +  * Standards-version 3.7.2 (no change)
 +  * Update address of the FSF in debian/copyright
 +  * debian/rules, target "clean": execute "make clean" only when makefile
 +    exists. Remove extra commands to remove generated makefiles as this 
 +    is now fixed by upstream.
 +
 + -- Ralf Treinen <treinen at debian.org>  Sat, 07 Jul 2007 15:00:49 +0200
 +
 +mona (1.4-7-4) unstable; urgency=low
 +
 +  * Compile with -O2 instead of -O3 on m68k in order to resolve FTBFS on
 +    m68k which is due to a gcc-4.0 bug.
 +  * Let "debian/rules clean" also remove the generated makefiles in
 +    Examples/ and config/
 +  * Switch from dh_installmanpages to dh_installman.
 +
 + -- Ralf Treinen <treinen at debian.org>  Fri,  5 Aug 2005 21:31:32 +0200
 +
 +mona (1.4-7-3) unstable; urgency=low
 +
 +  * Recommends graphiz (instead of Suggests).
 +  * Standards-version 3.6.2 (no change).
 +  * Rebuild with gcc 4.
 +
 + -- Ralf Treinen <treinen at debian.org>  Tue, 12 Jul 2005 08:59:49 +0200
 +
 +mona (1.4-7-2) unstable; urgency=low
 +
 +  * Patch 02_gcc4.0 fixes compilation error with gcc4.0 on amd64. Patch
 +    provided by Andreas Jochens - thanks! (closes: Bug#287662).
 +
 + -- Ralf Treinen <treinen at debian.org>  Wed, 29 Dec 2004 17:09:44 +0100
 +
 +mona (1.4-7-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Clean target: do a make distclean, and remove all generated makefiles
 +  * Removed phony configure target
 +  * Dpatch-ified
 +  * Patch 01_gcc3.4: fix to compile with gcc-3.4. Thanks a lot to Andreas
 +    Jochens for sending in this patch (closes: Bug#260596)
 +
 + -- Ralf Treinen <treinen at debian.org>  Wed,  4 Aug 2004 01:17:41 +0200
 +
 +mona (1.4-5-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * Standards-Version 3.6.1:
 +    - Honor "noopt" in the value of DEB_BUILD_OPTIONS
 +  * Use the new ./configure script.
 +  * Replace DH_COMPAT variable by file debian/compat, set to level 4.
 +  * Build-dependency on debhelper: specify >= 4.0
 +  * Removed "g++" from Build-Depends since it is build-essential.
 +  * Dependencies in debian/rules: replace configure-stamp by makefile and
 +    build-stamp by mona.
 +  * Target clean in debian/rules: remove config.{status,log}, makefile.
 +  * Upstream fixed his clean target to properly cleanup Examples and Lib,
 +    remove according cleanup code in debian/rules stemming from 1.4-3.1.
 +  * copyright: reformatted and fixed typos, specified v2 of GPL, added
 +    GPL copyright declaration.
 +
 + -- Ralf Treinen <treinen at debian.org>  Sat,  6 Mar 2004 07:58:18 +0100
 +
 +mona (1.4-3-1) unstable; urgency=low
 +
 +  * Standards-version 3.5.6.0.
 +  * DH_COMPAT=3. This marks all files in /etc as conffiles (closes:
 +    Bug#132122).  
 +  * Some cleanup in debian/rules.
 +  * Removed local emacs variable in debian/changelog.
 +  * Removed from the source package the following binary files (no idea
 +    how they have slipped in the first place). Also, have them removed
 +    by the clean target of debian/rules:
 +    Examples/presburger_transduction, Examples/presburger_analysis,
 +    Examples/gta_example, Examples/bdd_example, Lib/dfa2dot, Lib/gta2dot.
 +  * Removed debian/docs and debian/dirs. Instead, pass arguments directly
 +    to dh_installdocs and dh_installdirs.
 +  * Add invocation of dh_installdeb in debian/rules.
 +  * Changed in description the sentence on documentation, added url of
 +    the upstream webpage.
 +
 + -- Ralf Treinen <treinen at debian.org>  Tue,  5 Feb 2002 21:23:09 +0100
 +
 +mona (1.4-2-1) unstable; urgency=low
 +
 +  * Initial Release.
 +
 + -- Ralf Treinen <treinen at debian.org>  Mon, 23 Oct 2000 20:25:27 +0200
 +
 +Local variables:
 +End:
diff --combined debian/compat
index b8626c4,0000000..7f8f011
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 4
++7
diff --combined debian/control
index c58c4b1,0000000..18fb478
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,21 -1,0 +1,21 @@@
 +Source: mona
- Section: misc
++Section: math
 +Priority: optional
 +Maintainer: Ralf Treinen <treinen at debian.org>
- Build-Depends: debhelper (>= 4.0), bison, flex, dpatch, autotools-dev, chrpath
- Standards-Version: 3.7.3
++Build-Depends: debhelper (>= 7.0), bison, flex, autotools-dev, chrpath
++Standards-Version: 3.8.3
 +Homepage: http://www.brics.dk/~amoeller/mona/index.html
 +
 +Package: mona
 +Architecture: any
 +Depends: ${shlibs:Depends}
 +Recommends: graphviz
 +Description: a theorem prover based on automata
 + MONA is a tool that translates formulas in the logics WS1S or WS2S
 + into finite-state automata represented by BDDs.  The formulas may
 + express search patterns, temporal properties of reactive systems,
 + parse tree constraints, etc.  MONA also analyses the automaton
 + resulting from the compilation, and determines whether the formula is
 + valid and, if the formula is not valid, generates a counter-example.
 + .
 + Documentation is available from the MONA website http://www.brics.dk/mona/.
diff --combined debian/dirs
index 5f15f3d,0000000..bdcea69
mode 100644,000000..100644
--- a/debian/dirs
+++ b/debian/dirs
@@@ -1,2 -1,0 +1,3 @@@
 +usr/bin
- usr/share/emacs/site-lisp/mona
++usr/share/emacs/site-lisp/mona
++usr/share/lintian/overrides
diff --combined debian/lintian-overrides
index 0000000,0000000..c0bd89d
new file mode 100644
--- /dev/null
+++ b/debian/lintian-overrides
@@@ -1,0 -1,0 +1,6 @@@
++non-dev-pkg-with-shlib-symlink usr/lib/libmonamem.so.1.0.4 usr/lib/libmonamem.so
++non-dev-pkg-with-shlib-symlink usr/lib/libmonadfa.so.1.0.4 usr/lib/libmonadfa.so
++non-dev-pkg-with-shlib-symlink usr/lib/libmonabdd.so.1.0.4 usr/lib/libmonabdd.so
++non-dev-pkg-with-shlib-symlink usr/lib/libmonagta.so.1.0.4 usr/lib/libmonagta.so
++package-name-doesnt-match-sonames libmonabdd1 libmonadfa1 libmonagta1 libmonamem1
++
diff --combined debian/rules
index da30cd6,0000000..bc06f34
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,78 -1,0 +1,89 @@@
 +#!/usr/bin/make -f
 +#export DH_VERBOSE=1
 +
- include /usr/share/dpatch/dpatch.make
++INSTALLROOT := `pwd`/debian/mona
 +
 +# workaround for gcc-4.0 bug on m68k
- export DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH)
 +ifeq ($(DEB_HOST_ARCH),m68k)
 +  OPTFLAGS = -O2
 +else			
 +  OPTFLAGS = -O3
 +endif
 +
 +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 +     OPTFLAGS = -O0
 +endif
 +
 +build: build-stamp 
 +
- build-stamp: patch-stamp
++build-stamp:
 +	dh_testdir
++	(cd config;\
++	 [ -h config.guess ] || { mv config.guess config.guess.upstream; \
++                ln -s /usr/share/misc/config.guess; };\
++         [ -h config.sub ] || { mv config.sub config.sub.upstream; \
++                ln -s /usr/share/misc/config.sub; })
 +	./configure --prefix=/usr CFLAGS=$(OPTFLAGS) CXXFLAGS=$(OPTFLAGS)
 +	$(MAKE) CFLAGS=$(OPTFLAGS) CXXFLAGS=$(OPTFLAGS)
 +	touch build-stamp
 +
- clean: clean1 unpatch
++clean: clean1
 +
 +clean1:
 +	dh_testdir
 +	dh_testroot
++	(cd config;\
++	 [ ! -h  config.guess ] || mv config.guess.upstream config.guess;\
++         [ ! -h  config.sub ] || mv config.sub.upstream config.sub)
 +	if [ -e makefile ]; then $(MAKE) distclean; fi
 +	-rm build-stamp
 +	dh_clean
 +
 +install: build
 +	dh_testdir
 +	dh_testroot
- 	dh_clean -k
++	dh_prep
 +	dh_installdirs 
 +
 +	# the generated makefile does not honor PREFIX=...
- 	./configure --prefix=`pwd`/debian/mona/usr \
- 		--mandir=`pwd`/debian/mona/usr/share/man
++	./configure --prefix=$(INSTALLROOT)/usr \
++		--mandir=$(INSTALLROOT)/usr/share/man
 +	$(MAKE) install
 +
 +	# get rid of rpaths
 +	for lib in libmonabdd.so libmonadfa.so libmonagta.so;\
- 		do chrpath -d `pwd`/debian/mona/usr/lib/$$lib; \
++		do chrpath -d $(INSTALLROOT)/usr/lib/$$lib; \
 +	done
- 	chrpath -d `pwd`/debian/mona/usr/bin/mona
++	chrpath -d $(INSTALLROOT)/usr/bin/mona
 +
 +	# make install seems to misplace this one
- 	-rm `pwd`/debian/mona/usr/share/mona-mode.el
- 	cp mona-mode.el `pwd`/debian/mona/usr/share/emacs/site-lisp/mona
++	-rm $(INSTALLROOT)/usr/share/mona-mode.el
++	cp mona-mode.el $(INSTALLROOT)/usr/share/emacs/site-lisp/mona
++
++	cp debian/lintian-overrides \
++	  $(INSTALLROOT)/usr/share/lintian/overrides/mona
++
 +
 +binary-indep: build install
 +
 +binary-arch: build install
 +	dh_testdir
 +	dh_testroot
 +	dh_installdocs README
 +	dh_installexamples Examples/*
- 	-rm `pwd`/debian/mona/usr/share/doc/mona/examples/*.o
++	-rm $(INSTALLROOT)/usr/share/doc/mona/examples/*.o
 +	dh_installemacsen
 +	dh_installman mona.1
 +	dh_installchangelogs 
 +	dh_strip
 +	dh_compress
 +	dh_fixperms
 +	dh_makeshlibs
 +	dh_installdeb
 +	dh_shlibdeps
 +	dh_gencontrol
 +	dh_md5sums
 +	dh_builddeb
 +
 +binary: binary-indep binary-arch
- .PHONY: build clean clean1 binary-indep binary-arch binary install patch unpatch
++.PHONY: build clean clean1 binary-indep binary-arch binary install

-- 
mona packaging



More information about the debian-science-commits mailing list