From 124ce3195d0f1f0258933bfe58bfe11ae2e5b3b9 Mon Sep 17 00:00:00 2001 From: Richard Kreckel Date: Fri, 29 Aug 2003 00:29:56 +0000 Subject: [PATCH] * Updated to match Debian's current ginac_1.1.3-1.diff.gz. --- debian/changelog | 42 ++++++++++++++-------------------------- debian/control | 2 +- debian/ginac-tools.files | 2 +- debian/ginac-tools.menu | 2 +- debian/rules | 11 ++++++----- 5 files changed, 23 insertions(+), 36 deletions(-) diff --git a/debian/changelog b/debian/changelog index a4f1834e..1c03d1bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,20 +1,30 @@ ginac (1.1.3-1) unstable; urgency=low * New upstream (bugfix only) release. + * Probe configure's return-value and if non-zero remove Makefile so + that the library will not be built in vain and cause much grief and + suffering to the poor buildd. - -- Christian Bauer Fri, 22 Aug 2003 15:07:08 +0200 + -- Richard Kreckel Thu, 28 Aug 2003 21:33:24 +0200 + +ginac (1.1.2-2) unstable; urgency=low + + * Make library location in libginac.la be /usr/lib rather than the + build dir. + + -- Richard Kreckel Wed, 13 Aug 2003 16:03:46 +0200 ginac (1.1.2-1) unstable; urgency=low * New upstream (bugfix only) release. - -- Christian Bauer Mon, 11 Aug 2003 15:54:24 +0200 + -- Richard Kreckel Tue, 12 Aug 2003 14:50:27 +0200 ginac (1.1.1-1) unstable; urgency=low * New upstream (bugfix only) release. - -- Christian Bauer Wed, 18 Jun 2003 20:04:15 +0200 + -- Richard Kreckel Tue, 24 Jun 2003 23:22:36 +0200 ginac (1.1.0-1) unstable; urgency=low @@ -23,35 +33,11 @@ ginac (1.1.0-1) unstable; urgency=low -- Richard Kreckel Thu, 4 Apr 2003 12:11:21 +0200 -ginac (1.0.14-1) unstable; urgency=low - - * New upstream (bugfix only) release. - - -- Christian Bauer Sat, 1 Mar 2003 17:29:13 +0100 - -ginac (1.0.13-1) unstable; urgency=low - - * New upstream (bugfix only) release. - - -- Christian Bauer Mon, 27 Jan 2003 17:56:07 +0100 - -ginac (1.0.12-1) unstable; urgency=low - - * New upstream (bugfix only) release. - - -- Christian Bauer Thu, 31 Oct 2002 16:21:05 +0100 - ginac (1.0.11-1) unstable; urgency=low * New upstream (bugfix only) release. - -- Richard Kreckel Wed, 18 Sep 2002 16:45:05 +0200 - -ginac (1.0.10-1) unstable; urgency=low - - * New upstream (bugfix only) release. - - -- Richard Kreckel Wed, 24 Jul 2002 18:03:00 +0200 + -- Richard Kreckel Wed, 18 Sep 2002 16:45:05 +0100 ginac (1.0.8-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 08df8712..7f81bbb7 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: math Priority: optional Maintainer: Richard Kreckel Build-Depends: debhelper (>> 3.0.0), libcln-dev, libgmp3-dev, libreadline4-dev, flex, bison -Standards-Version: 3.5.8 +Standards-Version: 3.6.0 Package: libginac1.1 Architecture: any diff --git a/debian/ginac-tools.files b/debian/ginac-tools.files index 22848c00..ef6dee26 100644 --- a/debian/ginac-tools.files +++ b/debian/ginac-tools.files @@ -2,4 +2,4 @@ usr/bin/ginsh usr/bin/viewgar usr/share/man/man1/ginsh* usr/share/man/man1/viewgar* -usr/X11R6/include/X11/pixmaps/ginac.xpm +usr/share/pixmaps/ginac.xpm diff --git a/debian/ginac-tools.menu b/debian/ginac-tools.menu index 62267268..5424b40f 100644 --- a/debian/ginac-tools.menu +++ b/debian/ginac-tools.menu @@ -4,4 +4,4 @@ title="Ginsh"\ longtitle="Ginsh - GiNaC interactive shell"\ command="/usr/bin/ginsh" \ - icon="/usr/X11R6/include/X11/pixmaps/ginac.xpm" + icon="/usr/share/pixmaps/ginac.xpm" diff --git a/debian/rules b/debian/rules index a6d80b19..96d311bc 100755 --- a/debian/rules +++ b/debian/rules @@ -17,7 +17,7 @@ DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) export CXXFLAGS = -O0 else - export CXXFLAGS = -O2 -fomit-frame-pointer -finline-limit=1200 + export CXXFLAGS = -O2 -finline-limit=1200 endif ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) INSTALL_PROGRAM += -s @@ -26,14 +26,15 @@ endif config.status: configure dh_testdir # Add here commands to configure the package. - ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info + # The Makefile is removed on error in order to prevent the build at this early stage. + ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info || rm -f Makefile build: build-arch build-arch: build-arch-stamp build-arch-stamp: config.status # Add here commands to compile the arch part of the package. - $(MAKE) prefix=$(CURDIR)/debian/tmp/usr infodir=$(CURDIR)/debian/tmp/usr/share/info mandir=$(CURDIR)/debian/tmp/usr/share/man + $(MAKE) clean: dh_testdir @@ -51,8 +52,8 @@ install-arch: # Add here commands to install the arch part of the package into # debian/tmp. $(MAKE) install prefix=$(CURDIR)/debian/tmp/usr - mkdir -p $(CURDIR)/debian/tmp/usr/X11R6/include/X11/pixmaps - cp $(CURDIR)/debian/ginac.xpm $(CURDIR)/debian/tmp/usr/X11R6/include/X11/pixmaps/ + mkdir -p $(CURDIR)/debian/tmp/usr/share/pixmaps + cp $(CURDIR)/debian/ginac.xpm $(CURDIR)/debian/tmp/usr/share/pixmaps/ # Must not depend on anything. This is to be called by # binary-arch/binary-multi -- 2.50.0