From 08aeba6a42b4147d495237eebe101cfe36f44989 Mon Sep 17 00:00:00 2001 From: Richard Kreckel Date: Fri, 29 Aug 2003 00:34:38 +0000 Subject: [PATCH 1/1] * Preliminar update over Debian's ginac_1.1.3-1.diff.gz. --- debian/changelog | 28 ++++++++++++++++++++++++++++ debian/control | 6 +++--- debian/ginac-tools.files | 2 +- debian/ginac-tools.menu | 2 +- debian/libginac1.1.dirs | 1 - debian/libginac1.1.files | 1 - debian/rules | 11 ++++++----- debian/shlibs | 2 +- 8 files changed, 40 insertions(+), 13 deletions(-) delete mode 100644 debian/libginac1.1.dirs delete mode 100644 debian/libginac1.1.files diff --git a/debian/changelog b/debian/changelog index 7ad4568e..1c03d1bd 100644 --- 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 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. + + -- Richard Kreckel Tue, 12 Aug 2003 14:50:27 +0200 + +ginac (1.1.1-1) unstable; urgency=low + + * New upstream (bugfix only) release. + + -- Richard Kreckel 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. diff --git a/debian/control b/debian/control index 08df8712..a2172708 100644 --- a/debian/control +++ b/debian/control @@ -3,9 +3,9 @@ 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 +Package: libginac1.2 Architecture: any Section: libs Depends: ${shlibs:Depends} @@ -21,7 +21,7 @@ Description: The GiNaC framework (runtime library) 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) 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/libginac1.1.dirs b/debian/libginac1.1.dirs deleted file mode 100644 index 68457717..00000000 --- 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 index 9a5c1be4..00000000 --- a/debian/libginac1.1.files +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libginac*.so.* 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 diff --git a/debian/shlibs b/debian/shlibs index ce7d3dcb..6c866626 100644 --- 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) -- 2.44.0