[SCM] cddlib: library for finding vertices of convex polytopes branch, master, updated. debian/094b.dfsg-4.2-10-g23f7976

Tobias Hansen tobias.han at gmx.de
Sun Dec 30 01:37:51 UTC 2012


The following commit has been merged in the master branch:
commit d469811d2b9c44a0d9df82e15de6a94f3f7588af
Author: Tobias Hansen <tobias.han at gmx.de>
Date:   Sun Dec 30 01:10:35 2012 +0100

    Delete old patch and update changelog.

diff --git a/debian/changelog b/debian/changelog
index 8916d37..1988266 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cddlib (094g-1) UNRELEASED; urgency=low
+
+  * New upstream version.
+
+ -- Tobias Hansen <thansen at debian.org>  Sun, 30 Dec 2012 01:09:43 +0100
+
 cddlib (094b.dfsg-4.2) unstable; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/patches/cddlib-shared-library.patch b/debian/patches/cddlib-shared-library.patch
deleted file mode 100644
index 3ab67d4..0000000
--- a/debian/patches/cddlib-shared-library.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- a/lib-src-gmp/Makefile.am
-+++ b/lib-src-gmp/Makefile.am
-@@ -1,6 +1,6 @@
--lib_LIBRARIES = libcddgmp.a
-+lib_LTLIBRARIES = libcddgmp.la
- 
--libcddgmp_a_SOURCES = \
-+libcddgmp_la_SOURCES = \
- cddcore.c \
- cddlp.c	\
- cddmp.c \
-@@ -25,7 +25,7 @@
- setoper.h
- 
- CC       = $(CXX)
--CPPFLAGS = -DGMPRATIONAL
--CXXFLAGS = -O3
-+AM_CPPFLAGS = -DGMPRATIONAL
-+AM_CXXFLAGS = -O3
- INCLUDES = -I$(gmpincludedir)
- 
---- a/lib-src/Makefile.am
-+++ b/lib-src/Makefile.am
-@@ -1,6 +1,6 @@
--lib_LIBRARIES = libcdd.a
-+lib_LTLIBRARIES = libcdd.la
- 
--libcdd_a_SOURCES = \
-+libcdd_la_SOURCES = \
- cddcore.c \
- cddlp.c	\
- cddmp.c \
-@@ -16,7 +16,7 @@
- setoper.h
- 
- CC       = $(CXX)
--CPPFLAGS = -UGMPRATIONAL
--CXXFLAGS = -O3
-+AM_CPPFLAGS = -UGMPRATIONAL
-+AM_CXXFLAGS = -O3
- 
- 
---- a/configure.in
-+++ b/configure.in
-@@ -8,7 +8,7 @@
- AC_PROG_CC
- AC_PROG_INSTALL
- AC_PROG_CXX
--AC_PROG_RANLIB
-+AC_PROG_LIBTOOL
- 
- dnl Checks for libraries.
- dnl Replace `main' with a function in -lg:
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -30,7 +30,7 @@
- # cddmathlink_SOURCES                = cddmathlink.c cddmlio.h cddmlio.c
- 
- CC           = $(CXX)
--LDADD        = ../lib-src/libcdd.a
-+LDADD        = ../lib-src/libcdd.la
- INCLUDES     = -I../lib-src
--CPPFLAGS     = -UGMPRATIONAL
--CXXFLAGS     = -O2
-+AM_CPPFLAGS     = -UGMPRATIONAL
-+AM_CXXFLAGS     = -O2
---- a/src-gmp/Makefile.am
-+++ b/src-gmp/Makefile.am
-@@ -30,9 +30,9 @@
- # cddmathlink_SOURCES                = cddmathlink.c cddmlio.h cddmlio.c
- 
- CC           = $(CXX)
--LDADD        = ../lib-src-gmp/libcddgmp.a
--LDFLAGS      = -L$(gmplibdir)
-+LDADD        = ../lib-src-gmp/libcddgmp.la
-+AM_LDFLAGS      = -L$(gmplibdir)
- INCLUDES     = -I../lib-src-gmp
- INCLUDES    += -I$(gmpincludedir)
--CPPFLAGS     = -DGMPRATIONAL
--CXXFLAGS     = -O2
-+AM_CPPFLAGS     = -DGMPRATIONAL
-+AM_CXXFLAGS     = -O2
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index f79d15b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-cddlib-shared-library.patch

-- 
cddlib: library for finding vertices of convex polytopes



More information about the debian-science-commits mailing list