[SCM] maria packaging branch, master, updated. upstream/1.2-22-gc4c33c2
Ralf Treinen
treinen at free.fr
Fri May 13 19:26:21 UTC 2011
The following commit has been merged in the master branch:
commit e6d7c7c6ac0ddb4631396ce95da7ce7cf976d79c
Merge: 6f8490a47247bf6a61c9f46215ca2f21d212710b e1c9b041136fae5238f44618874ea6f9da52c021
Author: Ralf Treinen <treinen at debian.org>
Date: Mon Aug 8 12:32:36 2005 +0200
Imported Debian patch 1.3.5-1
diff --combined debian/changelog
index 6e8c29c,0000000..e638413
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,123 -1,0 +1,131 @@@
++maria (1.3.5-1) unstable; urgency=low
++
++ * New upstream release.
++ * Desactivated patch 03gcc40, seems to be fixed by upstream.
++ * Install upstream NEWS file as /usr/share/doc/*/changelog.
++
++ -- Ralf Treinen <treinen at debian.org> Mon, 8 Aug 2005 12:32:36 +0200
++
+maria (1.3.4-7) unstable; urgency=low
+
+ * Compile with "-O3" instead of "-O2" on m68k to work around a FTBFS
+ caused by a gcc-4.0 bug.
+ * texi2html now produces *html files in subdirectory "maria/"
+
+ -- Ralf Treinen <treinen at debian.org> Fri, 5 Aug 2005 12:38:59 +0200
+
+maria (1.3.4-6) unstable; urgency=low
+
+ * Standards Version 3.6.2 (no changes).
+ * Some minor improvements in README.examples.
+ * Rebuild with gcc 4.
+
+ -- Ralf Treinen <treinen at debian.org> Wed, 6 Jul 2005 20:44:25 +0200
+
+maria (1.3.4-5) unstable; urgency=low
+
+ * The binary package maria-vis is no longer build since graphviz is
+ now in main. The package maria now replaces and conflicts with
+ maria-vis. (closes: Bug#292595).
+ * debian/copyright: distinguish copyright and licence.
+ * Removed the lintian override concerning unusual interpreter lefty -
+ this is now a lintian bug.
+ * Wrote README.examples, put it in /usr/share/doc/maria/examples
+ * Removed spurious $(CURDIR) in debian/rules
+
+ -- Ralf Treinen <treinen at debian.org> Sun, 13 Feb 2005 17:17:51 +0100
+
+maria (1.3.4-4) unstable; urgency=low
+
+ * Use dpatch. Dpatchify old patches:
+ - 01lefty_path: fix path of lefty interpreter
+ - 02compile_options: fix compile flags
+ * Patch 03gcc40: Fix compilation error for gcc4.0 on amd64. Patch
+ contributed by Andreas Jochens - thanks! (closes: Bug#288926)
+ * Short descriptions start on a lowercase letter.
+ * Removed useless ${misc:Depends} from maria's Dependency.
+ * Removed debian/TODO.
+
+ -- Ralf Treinen <treinen at debian.org> Thu, 6 Jan 2005 20:48:05 +0100
+
+maria (1.3.4-3) unstable; urgency=low
+
+ * Switch from libreadline4 to libreadline5.
+
+ -- Ralf Treinen <treinen at debian.org> Sat, 1 Jan 2005 18:19:33 +0100
+
+maria (1.3.4-2) unstable; urgency=low
+
+ * Converted this changelog file to UTF-8
+ * Package maria-doc: added Recommends infobrowser
+ * Standards-version 3.6.1 (no change)
+ * Added a debian/watch file
+ * Added a lintian override for maria-vis concering the use of lefty as
+ an interpreter
+
+ -- Ralf Treinen <treinen at debian.org> Wed, 4 Aug 2004 09:54:50 +0200
+
+maria (1.3.4-1) unstable; urgency=low
+
+ * New upstream release
+ * Standards-Version: 3.6.0
+ * Use a file debian/compat instead of variable DH_COMPAT in debian/rules
+ * Installation of info files: don't attempt to install maria.info-*
+
+ -- Ralf Treinen <treinen at debian.org> Mon, 4 Aug 2003 23:01:40 +0200
+
+maria (1.3.3-1) unstable; urgency=low
+
+ * New upstream release. This release should compile on gcc 3.0 (closes:
+ Bug#171226).
+
+ -- Ralf Treinen <treinen at debian.org> Mon, 9 Dec 2002 21:48:45 +0100
+
+maria (1.3.2-1) unstable; urgency=low
+
+ * New upstream release.
+ * Applied a patch to maria.texinfo sent by Marko Mäkelä.
+ * Compilation/runtime/codec.h, and Graph/BitBuffer.h: Put the test for
+ __linux before tests on specific architectures (solution suggested by
+ Marko Mäkelä). This should resolve the autobuilder failure on alpha.
+
+ -- Ralf Treinen <treinen at debian.org> Thu, 5 Dec 2002 21:32:26 +0100
+
+maria (1.3.1-3) unstable; urgency=low
+
+ * Build-Dependency on debhelper bumped up to >= 4.0
+ * debian/rules: target "build" does no longer depend on target "build-doc"
+
+ -- Ralf Treinen <treinen at debian.org> Fri, 29 Nov 2002 23:02:38 +0100
+
+maria (1.3.1-2) unstable; urgency=low
+
+ * Added build-dependency on xutils (needed since Makefile calls makedepend).
+ This should resolve the autobuilder failures on 1.3.1-1.
+ * DH_COMPAT=4 in debian/rules, and added ${misc:Depends} to the Depends
+ field in debian/control.
+
+ -- Ralf Treinen <treinen at debian.org> Thu, 28 Nov 2002 19:50:02 +0100
+
+maria (1.3.1-1) unstable; urgency=low
+
+ * New upstream release, and first version actually uploaded to unstable
+ (closes: Bug#146320).
+ * Standards-Version: 3.5.8.
+ * debian/copyright: corrected email address of upstream author.
+ * debian/copyright: the maria-vis script is now in the public domain.
+ * debian/rules: change value of EXDIR, since Makefile uses it relativ
+ to the value of DESTDIR.
+ * debian/rules: pass debug and noopt option to make.
+ * Makefile.Linux: /usr/local/{lib,include} -> /usr/{lib,include}
+ * Makefile.Linux: add a COPTFLAGS variable, to pass optimization flags
+ to the makefile.
+
+ -- Ralf Treinen <treinen at debian.org> Thu, 21 Nov 2002 20:57:19 +0100
+
+maria (1.2-0.alpha) experimental; urgency=low
+
+ * Initial Release.
+
+ -- Ralf Treinen <treinen at debian.org> Tue, 6 Aug 2002 23:15:53 +0200
+
diff --combined debian/patches/00list
index b98b49f,0000000..9c9065a
mode 100644,000000..100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@@ -1,3 -1,0 +1,3 @@@
+01lefty_path
+02compile_options
- 03gcc40
++# 03gcc40
diff --combined debian/rules
index 20723b2,0000000..236fe13
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,93 -1,0 +1,93 @@@
+#!/usr/bin/make -f
+# rules for maria
+
+# export DH_VERBOSE=1
+export MAKE=make -f Makefile.Linux
+
+include /usr/share/dpatch/dpatch.make
+
+# 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
+ dh_testdir
+ $(MAKE) CXXOPTFLAGS=$(OPTFLAGS)
+ touch build-stamp
+
+build-doc: build-doc-stamp
+
+build-doc-stamp:
+ dh_testdir
+ cd doc \
+ && makeinfo maria.texinfo \
+ && texi2html -split chapter maria.texinfo
+ touch build-doc-stamp
+
+clean: unpatch
+ dh_testdir
+ dh_testroot
+ -rm build-stamp build-doc-stamp
+ -$(MAKE) reallyclean
+ cd doc && rm -f maria.info maria.info-* maria/maria*.html
+ dh_clean
+
+install-indep: build-doc
+ dh_testdir -i
+ dh_testroot -i
+ dh_clean -k
+ dh_installdirs -i
+ dh_install -i
+
+install-arch: build
+ dh_testdir -a
+ dh_testroot -a
+ dh_clean -k
+ dh_installdirs -a
+ dh_install -a
+ $(MAKE) install DESTDIR=debian/maria \
+ EXDIR=/usr/share/doc/maria/examples
+ cp debian/README.examples debian/maria/usr/share/doc/maria/examples
+ $(MAKE) installman DESTDIR=debian/maria
+
+binary-indep: install-indep
+ dh_testdir -i
+ dh_testroot -i
+ dh_installdocs -i
+ dh_installinfo -pmaria-doc doc/maria.info
- dh_installchangelogs -i
++ dh_installchangelogs -i NEWS
+ dh_link -i
+ dh_compress -i
+ dh_fixperms -i
+ dh_installdeb -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
+
+binary-arch: install-arch
+ dh_testdir -a
+ dh_testroot -a
+ dh_installemacsen -a
- dh_installchangelogs -a
++ dh_installchangelogs -a NEWS
+ dh_installdocs -a
+ dh_link -a
+ dh_strip -a
+ dh_compress -a
+ dh_fixperms -a
+ dh_installdeb -a
+ dh_shlibdeps -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch install-indep install-arch patch unpatch
--
maria packaging
More information about the debian-science-commits
mailing list