[SCM] maria packaging branch, master, updated. upstream/1.2-22-gc4c33c2
Ralf Treinen
treinen at free.fr
Fri May 13 19:26:07 UTC 2011
The following commit has been merged in the master branch:
commit eb4073656b63f3a5f4b326c5b1308d5d4c39060a
Merge: 95af61d00e98be4143bbd264781ad77443a95bf0 b20d49618880d458c9397dd06d2f44aa59b7d18a
Author: Ralf Treinen <treinen at debian.org>
Date: Mon Dec 9 21:48:45 2002 +0100
Imported Debian patch 1.3.3-1
diff --combined Makefile.Linux
index ecbc840,ec62679..a2b8b0b
--- a/Makefile.Linux
+++ b/Makefile.Linux
@@@ -1,11 -1,11 +1,11 @@@
### Target-specific definitions for compiling Maria -*- makefile -*-
- ### Linux and GNU Compiler Collection (2.95.x and 3.0.x)
+ ### Linux and GNU Compiler Collection (2.95, 3.0 and 3.2)
## The GNU Readline library (if enabled, check also the directories)
HAS_READLINE = yes
#HAS_READLINE =
- LIBREADLINE = $(HAS_READLINE:yes=-L/usr/lib -lreadline -lncurses)
- INCREADLINE = $(HAS_READLINE:yes=-I/usr/include -DHAS_READLINE)
+ LIBREADLINE = $(HAS_READLINE:yes=-L/usr/local/lib -lreadline -lncurses)
+ INCREADLINE = $(HAS_READLINE:yes=-I/usr/local/include -DHAS_READLINE)
## Support for compiled expressions
EXPR_COMPILE = yes
@@@ -15,15 -15,9 +15,9 @@@ CXX = g+
CC = gcc
EXTRA_INCLUDES =
EXTRA_LIBS = -ldl# -lstlport
- ## The following is for g++ 2.95
- DEFINES = -DHAS_REGEX -DHAS_GETOPT_LONG -DHASH_MAP_LOC='<hash_map>' -D_GNU_SOURCE
- ## The following is for g++ 3.0
- #DEFINES = -DHAS_REGEX -DHAS_GETOPT_LONG -DHASH_MAP_LOC='<ext/hash_map>' -DSLIST_LOC='<ext/slist>' -DEXT_NS=std::
- ## The following is for g++ 3.2
- #DEFINES = -DHAS_REGEX -DHAS_GETOPT_LONG -DHASH_MAP_LOC='<ext/hash_map>' -DSLIST_LOC='<ext/slist>' -DEXT_NS='__gnu_cxx::'
- COPTFLAGS = -O3
- CFLAGS = -Wall -ansi -pedantic $(COPTFLAGS)
- CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti# -I/usr/include/stlport
+ DEFINES = -DHAS_REGEX -D_GNU_SOURCE -DHAS_GETOPT_LONG
-CFLAGS = -Wall -ansi -pedantic -O3
-CXXFLAGS = $(CFLAGS) -Iport -fno-exceptions -fno-rtti# -I/usr/include/stlport
++CFLAGS = -Wall -ansi -pedantic -g
++CXXFLAGS = $(CFLAGS) $(CXXOPTFLAGS) -Iport -fno-exceptions -fno-rtti# -I/usr/include/stlport
all: real-all
diff --combined debian/changelog
index 8d99a35,0000000..09e4bf3
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,48 -1,0 +1,55 @@@
++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/rules
index 8af1969,0000000..5edc828
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,93 -1,0 +1,90 @@@
+#!/usr/bin/make -f
+# rules for maria
+
+# export DH_VERBOSE=1
+export DH_COMPAT=4
+export MAKE=make -f Makefile.Linux
+
- ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- R_DEBUG = -g
- endif
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ R_COPTFLAGS = -O0
+else
+ R_COPTFLAGS = -O3
+endif
+
+build: build-stamp
+
+build-stamp:
+ dh_testdir
- $(MAKE) COPTFLAGS=$(R_COPTFLAGS) DEBUG=$(R_DEBUG)
++ $(MAKE) CXXOPTFLAGS=$(R_COPTFLAGS)
+ 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:
+ dh_testdir
+ dh_testroot
+ -rm build-stamp build-doc-stamp
+ -$(MAKE) reallyclean
+ cd doc && rm -f maria.info maria.info-* 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=$(CURDIR)/debian/maria \
+ EXDIR=/usr/share/doc/maria/examples
+ # the maria-vis executable goes into the maria-vis package
+ -rm $(CURDIR)/debian/maria/usr/bin/maria-vis
+ $(MAKE) installman DESTDIR=$(CURDIR)/debian/maria
+ # the man page for maria-vis goes into the maria-vis package
+ -rm $(CURDIR)/debian/maria/usr/share/man/man1/maria-vis.1
+
+binary-indep: install-indep
+ dh_testdir -i
+ dh_testroot -i
+ dh_installdocs -i
+ dh_installinfo -pmaria-doc doc/maria.info doc/maria.info-*
+ dh_installchangelogs -i
+ 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_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
--
maria packaging
More information about the debian-science-commits
mailing list