[SCM] maria packaging branch, master, updated. upstream/1.2-22-gc4c33c2

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 2e0dda3f4abd0113e67c7c90a7bd423e7871c397
Author: Ralf Treinen <treinen at debian.org>
Date:   Fri Nov 29 23:02:38 2002 +0100

    Imported Debian patch 1.3.1-3

diff --git a/Makefile.Linux b/Makefile.Linux
index edfa86e..5beae05 100644
--- a/Makefile.Linux
+++ b/Makefile.Linux
@@ -11,9 +11,9 @@ INCREADLINE = $(HAS_READLINE:yes=-I/usr/include -DHAS_READLINE)
 EXPR_COMPILE = yes
 #EXPR_COMPILE =
 
-CXX = g++
-CC = gcc
-EXTRA_INCLUDES =
+CXX = g++-3.0
+CC = gcc-3.0
+EXTRA_INCLUDES = -I/usr/include/g++-3
 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
diff --git a/Makefile.Linux b/Makefile.Linux.save
similarity index 100%
copy from Makefile.Linux
copy to Makefile.Linux.save
diff --git a/debian/changelog b/debian/changelog
index 2eeb677..ab8376c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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).
diff --git a/debian/control b/debian/control
index 2a0c446..726157e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: maria
 Section: math
 Priority: optional
 Maintainer: Ralf Treinen <treinen at debian.org>
-Build-Depends: debhelper (>> 3.0.0), libreadline4-dev, libncurses5-dev, flex, bison, xutils
+Build-Depends: debhelper (>= 4.0), libreadline4-dev, libncurses5-dev, flex, bison, xutils
 Build-Depends-Indep: texinfo, texi2html
 Standards-Version: 3.5.8
 
diff --git a/debian/rules b/debian/rules
index 862c12b..8af1969 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 # rules for maria
 
-export DH_VERBOSE=1
+# export DH_VERBOSE=1
 export DH_COMPAT=4
 export MAKE=make -f Makefile.Linux
 
@@ -10,42 +10,42 @@ ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 endif
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	R_COPTFLAGS = -O0
+else
+	R_COPTFLAGS = -O3
 endif
 
-build-arch: build-stamp-arch
+build: build-stamp
 
-build-stamp-arch:
+build-stamp:
 	dh_testdir
 	$(MAKE) COPTFLAGS=$(R_COPTFLAGS) DEBUG=$(R_DEBUG)
-	touch build-stamp-arch
+	touch build-stamp
 
-build-indep: build-stamp-indep
+build-doc: build-doc-stamp
 
-build-stamp-indep:
+build-doc-stamp:
 	dh_testdir
 	cd doc \
 		 && makeinfo maria.texinfo \
 		 && texi2html -split chapter maria.texinfo
-	touch build-stamp-indep
-
-build: build-arch build-indep
+	touch build-doc-stamp
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp-arch build-stamp-indep
+	-rm build-stamp build-doc-stamp
 	-$(MAKE) reallyclean
 	cd doc && rm -f maria.info maria.info-* maria*.html
 	dh_clean
 
-install-indep: build-indep
+install-indep: build-doc
 	dh_testdir -i
 	dh_testroot -i
 	dh_clean -k
 	dh_installdirs -i
 	dh_install -i
 
-install-arch: build-arch
+install-arch: build
 	dh_testdir -a
 	dh_testroot -a
 	dh_clean -k
@@ -58,10 +58,8 @@ install-arch: build-arch
 	$(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
-	# the examples go into maria-doc
-	-rm -r $(CURDIR)/debian/maria/usr/share/maria/examples
 
-binary-indep: build-indep install-indep
+binary-indep: install-indep
 	dh_testdir -i
 	dh_testroot -i
 	dh_installdocs -i
@@ -75,10 +73,9 @@ binary-indep: build-indep install-indep
 	dh_md5sums -i
 	dh_builddeb -i
 
-binary-arch: build-arch install-arch
+binary-arch: install-arch
 	dh_testdir -a
 	dh_testroot -a
-	dh_installexamples -a
 	dh_installemacsen -a
 	dh_installchangelogs -a 
 	dh_installdocs -a

-- 
maria packaging