* Updated to match Debian's current ginac_1.1.3-1.diff.gz.

diff --git a/debian/changelog b/debian/changelog
index a4f1834e550612e7ddf6b124be0b23a97fc0a841..1c03d1bdfe18a821ff117f97121a5200459c24ac 100644 (file)
--- 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 <cbauer@ginac.de>  Fri, 22 Aug 2003 15:07:08 +0200
+ -- Richard Kreckel <kreckel@ginac.de>  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 <kreckel@ginac.de>  Wed, 13 Aug 2003 16:03:46 +0200
 
 ginac (1.1.2-1) unstable; urgency=low
 
   * New upstream (bugfix only) release.
 
- -- Christian Bauer <cbauer@ginac.de>  Mon, 11 Aug 2003 15:54:24 +0200
+ -- Richard Kreckel <kreckel@ginac.de>  Tue, 12 Aug 2003 14:50:27 +0200
 
 ginac (1.1.1-1) unstable; urgency=low
 
   * New upstream (bugfix only) release.
 
- -- Christian Bauer <cbauer@ginac.de>  Wed, 18 Jun 2003 20:04:15 +0200
+ -- Richard Kreckel <kreckel@ginac.de>  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 <kreckel@ginac.de>  Thu,  4 Apr 2003 12:11:21 +0200
 
-ginac (1.0.14-1) unstable; urgency=low
-
-  * New upstream (bugfix only) release.
-
- -- Christian Bauer <cbauer@ginac.de>  Sat,  1 Mar 2003 17:29:13 +0100
-
-ginac (1.0.13-1) unstable; urgency=low
-
-  * New upstream (bugfix only) release.
-
- -- Christian Bauer <cbauer@ginac.de>  Mon, 27 Jan 2003 17:56:07 +0100
-
-ginac (1.0.12-1) unstable; urgency=low
-
-  * New upstream (bugfix only) release.
-
- -- Christian Bauer <cbauer@ginac.de>  Thu, 31 Oct 2002 16:21:05 +0100
-
 ginac (1.0.11-1) unstable; urgency=low
 
   * New upstream (bugfix only) release.
 
- -- Richard Kreckel <kreckel@ginac.de>  Wed, 18 Sep 2002 16:45:05 +0200
-
-ginac (1.0.10-1) unstable; urgency=low
-
-  * New upstream (bugfix only) release.
-
- -- Richard Kreckel <kreckel@ginac.de>  Wed, 24 Jul 2002 18:03:00 +0200
+ -- Richard Kreckel <kreckel@ginac.de>  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 08df8712627e6993d5aecb7b9f3b30b62c5367c5..7f81bbb729b386d24188d9616c7c5ee26a72b4bd 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: math
 Priority: optional
 Maintainer: Richard Kreckel <kreckel@ginac.de>
 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 22848c0070681e0d283fd493b3d969e7d224e367..ef6dee268ab7d7b052a7592850536eed315c3154 100644 (file)
--- 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 62267268f2a1b06d630b35a8fb7128000f19358b..5424b40fae7266ac63f41aebdd4375a24a41b09e 100644 (file)
--- 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 a6d80b1937391037d2704a659c36c62c91522f25..96d311bca55de05c70d9ffb08eb398ed4b16943a 100755 (executable)
--- 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