[coinutils] 01/01: Address copyright issues; remove .la files
Miles Lubin
mlubin-guest at alioth.debian.org
Wed Sep 25 20:34:44 UTC 2013
This is an automated email from the git hooks/post-receive script.
mlubin-guest pushed a commit to branch master
in repository coinutils.
commit 8e24db0bb56148a272380b3c7216ad79cce4d08c
Author: Miles Lubin <miles.lubin at gmail.com>
Date: Wed Sep 25 16:34:20 2013 -0400
Address copyright issues; remove .la files
---
debian/changelog | 9 +++++
debian/coinor-libcoinutils-dev.install | 3 +-
debian/control | 68 ++++++++++++++++---------------
debian/copyright | 8 +++-
debian/orig-tar.sh | 12 ------
debian/patches/rpath.diff | 69 --------------------------------
debian/patches/series | 1 -
debian/watch | 2 +-
8 files changed, 53 insertions(+), 119 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c9a830f..5be3e34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+coinutils (2.9.4-2) experimental; urgency=low
+
+ * Update package descriptions from upstream.
+ * Purge license-incompatible files from previous maintainer.
+ - Update copyright file.
+ * Remove .la files. Reverse dependencies will be updated in experimental.
+
+ -- Miles Lubin <miles.lubin at gmail.com> Wed, 25 Sep 2013 16:23:58 -0400
+
coinutils (2.9.4-1) experimental; urgency=low
* New upstream version (Closes: #687262)
diff --git a/debian/coinor-libcoinutils-dev.install b/debian/coinor-libcoinutils-dev.install
index 937fe50..c064a38 100644
--- a/debian/coinor-libcoinutils-dev.install
+++ b/debian/coinor-libcoinutils-dev.install
@@ -1,6 +1,5 @@
debian/tmp/usr/include/coin
-debian/tmp/usr/share/coin
debian/tmp/usr/lib/*/lib*.a
-debian/tmp/usr/lib/*/lib*.la
debian/tmp/usr/lib/*/lib*.so
debian/tmp/usr/lib/*/pkgconfig/*.pc
+debian/tmp/usr/share/coin
diff --git a/debian/control b/debian/control
index 4481ac9..5d27971 100644
--- a/debian/control
+++ b/debian/control
@@ -16,14 +16,15 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
Provides: libcoinutils3
Conflicts: libcoinutils3
Replaces: libcoinutils3
-Description: Coin-or collection of utility classes
- CoinUtils (Coin-or Utilities) is a collection of classes that are generally
- useful to more than one COIN-OR project. These include vector, matrix, mps
- file reading classes.
- .
- COIN-OR (COmputational INfrastructure for Operations Research project) is
- an initiative to spur the development of open source software in operational
- research - mathematical optimization algorithms.
+Description: Coin-or collection of utility classes (binaries and libraries)
+ CoinUtils (Coin-or Utilities) is a collection of classes and functions
+ that are generally useful to more than one COIN-OR project. These include
+ classes for vectors, matrices, mps file reading, and functions for
+ floating-point comparisons.
+ .
+ The Computational Infrastructure for Operations Research (COIN-OR, or simply COIN)
+ project is an initiative to spur the development of open source software for the
+ operations research community.
.
This package contains the binaries and libraries.
@@ -34,14 +35,15 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, coinor-libcoinutils3 (= ${binary:Ve
Provides: libcoinutils-dev
Conflicts: libcoinutils-dev
Replaces: libcoinutils-dev
-Description: Coin-or collection of utility classes
- CoinUtils (Coin-or Utilities) is a collection of classes that are generally
- useful to more than one COIN-OR project. These include vector, matrix, mps
- file reading classes.
- .
- COIN-OR (COmputational INfrastructure for Operations Research project) is
- an initiative to spur the development of open source software in operational
- research - mathematical optimization algorithms.
+Description: Coin-or collection of utility classes (developer files)
+ CoinUtils (Coin-or Utilities) is a collection of classes and functions
+ that are generally useful to more than one COIN-OR project. These include
+ classes for vectors, matrices, mps file reading, and functions for
+ floating-point comparisons.
+ .
+ The Computational Infrastructure for Operations Research (COIN-OR, or simply COIN)
+ project is an initiative to spur the development of open source software for the
+ operations research community.
.
This package contains the header files for developers.
@@ -53,14 +55,15 @@ Recommends: coinor-libcoinutils-dev
Provides: libcoinutils-doc
Conflicts: libcoinutils-doc
Replaces: libcoinutils-doc
-Description: Coin-or collection of utility classes
- CoinUtils (Coin-or Utilities) is a collection of classes that are generally
- useful to more than one COIN-OR project. These include vector, matrix, mps
- file reading classes.
- .
- COIN-OR (COmputational INfrastructure for Operations Research project) is
- an initiative to spur the development of open source software in operational
- research - mathematical optimization algorithms.
+Description: Coin-or collection of utility classes (documentation)
+ CoinUtils (Coin-or Utilities) is a collection of classes and functions
+ that are generally useful to more than one COIN-OR project. These include
+ classes for vectors, matrices, mps file reading, and functions for
+ floating-point comparisons.
+ .
+ The Computational Infrastructure for Operations Research (COIN-OR, or simply COIN)
+ project is an initiative to spur the development of open source software for the
+ operations research community.
.
This package contains the documentation.
@@ -71,13 +74,14 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, coinor-libcoinutils3 (= ${binary:Ve
Provides: libcoinutils3-dbg
Conflicts: libcoinutils3-dbg
Replaces: libcoinutils3-dbg
-Description: Coin-or collection of utility classes
- CoinUtils (Coin-or Utilities) is a collection of classes that are generally
- useful to more than one COIN-OR project. These include vector, matrix, mps
- file reading classes.
- .
- COIN-OR (COmputational INfrastructure for Operations Research project) is
- an initiative to spur the development of open source software in operational
- research - mathematical optimization algorithms.
+Description: Coin-or collection of utility classes (debug symbols)
+ CoinUtils (Coin-or Utilities) is a collection of classes and functions
+ that are generally useful to more than one COIN-OR project. These include
+ classes for vectors, matrices, mps file reading, and functions for
+ floating-point comparisons.
+ .
+ The Computational Infrastructure for Operations Research (COIN-OR, or simply COIN)
+ project is an initiative to spur the development of open source software for the
+ operations research community.
.
This package contains the debug symbols.
diff --git a/debian/copyright b/debian/copyright
index 155c8b1..6da8089 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,11 +7,15 @@ Copyright: 2000-2013, IBM Corporation and others
License: EPL-1
Files: debian/*
+Copyright: 2013 Miles Lubin <miles.lubin at gmail.com>
+License: EPL-1
+
+Files: debian/changelog
Copyright: 2008-2010 Soeren Sonnenburg <sonne at debian.org>
2008 Torsten Werner <twerner at debian.org>
2008 Aramian Wasielak <aramian.wasielak at gmail.com>
- 2013 Miles Lubin
-License: EPL-1
+ 2013 Miles Lubin <miles.lubin at gmail.com>
+License: GPL-3
License: EPL-1
Eclipse Public License - v 1.0
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
deleted file mode 100755
index 83b5715..0000000
--- a/debian/orig-tar.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-# called by uscan with '--upstream-version' <version> <file>
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
- . .svn/deb-layout
- mv $3 $origDir
- echo "moved $3 to $origDir"
-fi
-
-exit 0
diff --git a/debian/patches/rpath.diff b/debian/patches/rpath.diff
deleted file mode 100644
index 7b917cd..0000000
--- a/debian/patches/rpath.diff
+++ /dev/null
@@ -1,69 +0,0 @@
---- a/BuildTools/coin.m4
-+++ b/BuildTools/coin.m4
-@@ -1690,9 +1690,6 @@
- # Stuff for libtool
- AC_COIN_PROG_LIBTOOL
- # AC_MSG_NOTICE([Finished COIN_PROG_LIBTOOL.])
-- # set RPATH_FLAGS to the compiler link flags required to hardcode location
-- # of the shared objects
-- AC_COIN_RPATH_FLAGS([$abs_lib_dir])
-
- else
-
-@@ -1935,56 +1932,6 @@
- # ]) # AC_COIN_DLFCN_H
-
- ###########################################################################
--# COIN_RPATH_FLAGS #
--###########################################################################
--
--# This macro, in case shared objects are used, defines a variable
--# RPATH_FLAGS that can be used by the linker to hardwire the library
--# search path for the given directories. This is useful for example
--# Makefiles
--
--AC_DEFUN([AC_COIN_RPATH_FLAGS],
--[RPATH_FLAGS=
--
--if test $enable_shared = yes; then
-- case $build in
-- *-linux-*)
-- if test "$GXX" = "yes"; then
-- RPATH_FLAGS=
-- for dir in $1; do
-- RPATH_FLAGS="$RPATH_FLAGS -Wl,--rpath -Wl,$dir"
-- done
-- fi ;;
-- *-darwin*)
-- RPATH_FLAGS=nothing ;;
-- *-ibm-*)
-- case "$CXX" in
-- xlC* | */xlC* | mpxlC* | */mpxlC*)
-- RPATH_FLAGS=nothing ;;
-- esac ;;
-- *-hp-*)
-- RPATH_FLAGS=nothing ;;
-- *-mingw32)
-- RPATH_FLAGS=nothing ;;
-- *-*-solaris*)
-- RPATH_FLAGS=
-- for dir in $1; do
-- RPATH_FLAGS="$RPATH_FLAGS -R$dir"
-- done
-- esac
--
-- if test "$RPATH_FLAGS" = ""; then
-- AC_MSG_WARN([Could not automatically determine how to tell the linker about automatic inclusion of the path for shared libraries. The test examples might not work if you link against shared objects. You will need to set the LD_LIBRARY_PATH, DYLP_LIBRARY_PATH, or LIBDIR variable manually.])
-- fi
-- if test "$RPATH_FLAGS" = "nothing"; then
-- RPATH_FLAGS=
-- fi
--fi
--
--AC_SUBST(RPATH_FLAGS)
--]) # AC_COIN_RPATH_FLAGS
--
--###########################################################################
- # COIN_LINK_INPUT_CMD #
- ###########################################################################
-
diff --git a/debian/patches/series b/debian/patches/series
index e95a59d..5c24f68 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-rpath.diff
format-security-fix.patch
diff --git a/debian/watch b/debian/watch
index 24d8d44..4b584ff 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,5 @@
version=3
http://www.coin-or.org/download/source/CoinUtils/CoinUtils-([\d\.]+).tgz \
- debian debian/orig-tar.sh
+ debian
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/coinutils.git
More information about the debian-science-commits
mailing list