Fixed building with gcc3. Removed empty money dir from docs

git-svn-id: svn+ssh://svn.code.sf.net/p/check/code/trunk@211 64e312b2-a51f-0410-8e61-82d0ca0eb02a

diff --git a/check/debian/changelog b/check/debian/changelog
index 37126fd1dcf9ea4d562b9008aa6ca6d98e857e3f..31c208094453a44274d3a5ed659e8e07ca31860e 100644 (file)
--- a/check/debian/changelog
+++ b/check/debian/changelog
@@ -1,3 +1,10 @@
+check (0.9.2-2) unstable; urgency=low
+
+  * Fixed building with gcc3
+  * Removed empty money dir from docs
+
+ -- Fredrik Hugosson <hugo303@users.sourceforge.net>  Fri, 12 Nov 2004 11:54:00 +0000
+
 check (0.9.2-1) unstable; urgency=low
 
   * See upstream changelog

diff --git a/check/debian/check.dirs b/check/debian/check.dirs
index aa2ae1638598850528cb18068f54e2e4852f95c2..7cbede68f8cb2e5bc4e1aef67032235eae44d4c6 100644 (file)
--- a/check/debian/check.dirs
+++ b/check/debian/check.dirs
@@ -2,4 +2,3 @@ usr/lib
 usr/include
 usr/share/aclocal
 usr/share/doc/check
-usr/share/doc/check/money

diff --git a/check/debian/control b/check/debian/control
index 349e87f2ab781effb37f1284bf96721c43782acb..56aba5a138f63fa7ef5f2e8fc62b940df37a443e 100644 (file)
--- a/check/debian/control
+++ b/check/debian/control
@@ -2,7 +2,7 @@ Source: check
 Section: devel
 Priority: optional
 Maintainer: Fredrik Hugosson <hugo303@users.sourceforge.net>
-Build-Depends: debhelper (>> 3.0.0)
+Build-Depends: debhelper (>> 3.0.0), gcc (>= 3.0) | gcc-3.0 | gcc-3.2 | gcc-3.3
 Standards-Version: 3.5.2
 
 Package: check

diff --git a/check/debian/rules b/check/debian/rules
index b4308c0bc2b296e2d14e31d775f889e5cd896d77..4d04401811d73bb261bdbf5e248354f63bfb03bd 100755 (executable)
--- a/check/debian/rules
+++ b/check/debian/rules
@@ -17,11 +17,22 @@ major=2
 #major=`ls src/.libs/lib*.so.* | \
 # awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
 
+CC_VSK=-dumpversion | cut -c1
+CC=$(shell     if test `gcc $(CC_VSK)` = 3; then \
+                       echo gcc; \
+               elif test `which gcc-3.3` -a `gcc-3.3 $(CC_VSK)` = 3; then \
+                       echo gcc-3.3; \
+               elif test `which gcc-3.1` -a `gcc-3.1 $(CC_VSK)` = 3; then \
+                       echo gcc-3.1; \
+               elif test `which gcc-3.0` -a `gcc-3.0 $(CC_VSK)` = 3; then \
+                       echo gcc-3.0; \
+               fi)
+
 configure: configure-stamp
 configure-stamp:
        dh_testdir
        # Add here commands to configure the package.
-       ./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-plain-docdir
+       ./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-plain-docdir CC="$(CC)"
 
        touch configure-stamp
 
@@ -62,18 +73,19 @@ binary-indep: build install
 binary-arch: build install
        dh_testdir
        dh_testroot
-       dh_movefiles
+       # we don't want another copy of the GPL Licence file
+       dh_movefiles -XCOPYING
 
 #      dh_installdebconf       
        dh_installdocs
        dh_installexamples
-       dh_installmenu
+#      dh_installmenu
 #      dh_installlogrotate
 #      dh_installemacsen
 #      dh_installpam
 #      dh_installmime
 #      dh_installinit
-       dh_installcron
+#      dh_installcron
        dh_installman
        dh_installinfo
 #      dh_undocumented