* Preliminar update over Debian's ginac_1.1.3-1.diff.gz.

diff --git a/debian/changelog b/debian/changelog
index 7ad4568e76abc66ffb4e615321443e74b88b51f2..1c03d1bdfe18a821ff117f97121a5200459c24ac 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,31 @@
+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.
+
+ -- 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.
+
+ -- 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.
+
+ -- Richard Kreckel <kreckel@ginac.de>  Tue, 24 Jun 2003 23:22:36 +0200
+

 ginac (1.1.0-1) unstable; urgency=low
 
   * New upstream release; binary incompatible, so it's libginac1.1 now.
 ginac (1.1.0-1) unstable; urgency=low
 
   * New upstream release; binary incompatible, so it's libginac1.1 now.

diff --git a/debian/control b/debian/control
index 08df8712627e6993d5aecb7b9f3b30b62c5367c5..a21727080d3418d47e03b00cbba9cfa1f196ad91 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,9 @@ Section: math
 Priority: optional
 Maintainer: Richard Kreckel <kreckel@ginac.de>
 Build-Depends: debhelper (>> 3.0.0), libcln-dev, libgmp3-dev, libreadline4-dev, flex, bison
 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
+Package: libginac1.2

 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}


@@ -21,7 +21,7 @@ Description: The GiNaC framework (runtime library)
 Package: libginac-dev
 Architecture: any
 Section: libdevel
 Package: libginac-dev
 Architecture: any
 Section: libdevel

-Depends: libginac1.1 (= ${Source-Version}), libc6-dev, g++, libcln-dev
+Depends: libginac1.2 (= ${Source-Version}), libc6-dev, g++, libcln-dev

 Recommends: info | info-browser
 Suggests: ginac-tools
 Description: The GiNaC framework (development files)
 Recommends: info | info-browser
 Suggests: ginac-tools
 Description: The GiNaC framework (development files)

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/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" \
   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/libginac1.1.dirs b/debian/libginac1.1.dirs
deleted file mode 100644 (file)
index 6845771..0000000
--- a/debian/libginac1.1.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib

diff --git a/debian/libginac1.1.files b/debian/libginac1.1.files
deleted file mode 100644 (file)
index 9a5c1be..0000000
--- a/debian/libginac1.1.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libginac*.so.*

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
 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
 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.
 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.
 
 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
 
 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
        # 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
 
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-multi

diff --git a/debian/shlibs b/debian/shlibs
index ce7d3dcbc27dc85272f5f077cf9ea35a5ad41b0e..6c86662671511f96e3ccc7a4f83ccb1b9a4cf621 100644 (file)
--- a/debian/shlibs
+++ b/debian/shlibs
@@ -1 +1 @@
-libginac-1.1   0       libginac1.1 (>= 1.1.0)
+libginac-1.2   0       libginac1.2 (>= 1.2.0)