[ppl] 10/68: Imported Debian patch 0.10~pre27-4
Andreas Tille
tille at debian.org
Sat Nov 12 08:40:07 UTC 2016
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository ppl.
commit cacbd9cf410432cc46cc3196ec44d25dca851541
Author: Arthur Loiret <arthur.loiret at gmail.com>
Date: Tue Sep 23 19:53:51 2008 +0000
Imported Debian patch 0.10~pre27-4
---
debian/Makefile.in | 1 -
debian/changelog | 20 ++++++++++++++++++++
debian/control | 4 +++-
debian/libppl-dev.docs | 4 ++++
debian/libppl-dev.install | 4 ++++
debian/libppl-dev.links | 3 ++-
debian/libppl7.install | 4 ----
debian/libpwl-dev.docs | 4 ++++
debian/libpwl-dev.links | 2 +-
debian/rules | 45 ++++++++++++++++++---------------------------
10 files changed, 56 insertions(+), 35 deletions(-)
diff --git a/debian/Makefile.in b/debian/Makefile.in
index dc03c50..3bf842e 100644
--- a/debian/Makefile.in
+++ b/debian/Makefile.in
@@ -152,7 +152,6 @@ MD5SUM = @MD5SUM@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OCAMLC = @OCAMLC@
OTOOL = @OTOOL@
diff --git a/debian/changelog b/debian/changelog
index dd89731..595dc6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+ppl (0.10~pre27-4) unstable; urgency=low
+
+ * debian/rules:
+ - Always copy config.sub an config.guess since we Build-Depends on
+ autotools-dev.
+ - Fix targets to have testsuite runs.
+ - Add check to .PHONY.
+ * Move ppl_lcdd and ppl_lpsol binaries and manpages from libppl7 to
+ libppl-dev, make libppl-dev Replaces libppl7 (<< 0.10~pre27-4).
+ Closes: #499832.
+ * Make libppl-dev Replaces libppl6, ppl-config binary has moved.
+ Closes: #499830.
+ * Make libpwl-dev Replaces libpwl3, /usr/bin/libpwl.a has moved.
+ Closes: #499937.
+ * Only install huge ChangeLog into libppl-dev and libpwl-dev.
+ - Don't symlink libppl-dev /usr/share/doc dir to libppl7.
+ - Add symlinks for changelog.gz to libppl7, libppl-c0 and libpwl4.
+
+ -- Arthur Loiret <arthur.loiret at gmail.com> Tue, 23 Sep 2008 19:53:51 +0000
+
ppl (0.10~pre27-3) unstable; urgency=low
* Properly install ppl-config into libppl-dev package, including man page,
diff --git a/debian/control b/debian/control
index 264b4d6..9f4299b 100644
--- a/debian/control
+++ b/debian/control
@@ -24,9 +24,10 @@ Description: Parma Polyhedra Library (runtime library)
Package: libppl-dev
Architecture: any
Section: libdevel
-Provides: libppl-c-dev
Depends: libppl7 (= ${binary:Version}), libppl-c0 (= ${binary:Version}), ${shlibs:Depends}
+Provides: libppl-c-dev
Recommends: libgmp3-dev (>= 4.1.3)
+Replaces: libppl6, libppl7 (<< 0.10~pre27-4)
Suggests: libppl-doc
Description: Parma Polyhedra Library (development)
The Parma Polyhedra Library (PPL) is a C++ library for the
@@ -73,6 +74,7 @@ Architecture: any
Section: libdevel
Depends: libpwl4 (= ${binary:Version}), ${shlibs:Depends}
Provides: libppl-pwl-dev
+Replaces: libpwl3
Description: Parma Watchdog Library (Watchdog timers - development)
The Parma Watchdog Library (PWL) provides support for multiple,
concurrent watchdog timers on systems providing setitimer(2). The
diff --git a/debian/libppl-dev.docs b/debian/libppl-dev.docs
new file mode 100644
index 0000000..0363680
--- /dev/null
+++ b/debian/libppl-dev.docs
@@ -0,0 +1,4 @@
+BUGS
+NEWS
+README
+CREDITS
diff --git a/debian/libppl-dev.install b/debian/libppl-dev.install
index 9bb7914..6010c9b 100644
--- a/debian/libppl-dev.install
+++ b/debian/libppl-dev.install
@@ -12,3 +12,7 @@ usr/share/man/man1/ppl-config.1
usr/share/aclocal/ppl.m4
usr/share/aclocal/ppl_c.m4
+usr/bin/ppl_lcdd
+usr/bin/ppl_lpsol
+usr/share/man/man1/ppl_lcdd.1
+usr/share/man/man1/ppl_lpsol.1
diff --git a/debian/libppl-dev.links b/debian/libppl-dev.links
index 274381b..67bcd66 100644
--- a/debian/libppl-dev.links
+++ b/debian/libppl-dev.links
@@ -1 +1,2 @@
-usr/share/doc/libppl7 usr/share/doc/libppl-dev
+usr/share/doc/libppl-dev/changelog.gz usr/share/doc/libppl7/changelog.gz
+usr/share/doc/libppl-dev/changelog.gz usr/share/doc/libppl-c0/changelog.gz
diff --git a/debian/libppl7.install b/debian/libppl7.install
index 0ebe725..c2c8ffe 100644
--- a/debian/libppl7.install
+++ b/debian/libppl7.install
@@ -1,5 +1 @@
usr/lib/libppl.so.*
-usr/bin/ppl_lcdd
-usr/bin/ppl_lpsol
-usr/share/man/man1/ppl_lcdd.1
-usr/share/man/man1/ppl_lpsol.1
diff --git a/debian/libpwl-dev.docs b/debian/libpwl-dev.docs
new file mode 100644
index 0000000..0363680
--- /dev/null
+++ b/debian/libpwl-dev.docs
@@ -0,0 +1,4 @@
+BUGS
+NEWS
+README
+CREDITS
diff --git a/debian/libpwl-dev.links b/debian/libpwl-dev.links
index 2686321..5f7b74d 100644
--- a/debian/libpwl-dev.links
+++ b/debian/libpwl-dev.links
@@ -1 +1 @@
-usr/share/doc/libpwl4 usr/share/doc/libpwl-dev
+usr/share/doc/libpwl-dev/changelog.gz usr/share/doc/libpwl4/changelog.gz
diff --git a/debian/rules b/debian/rules
index c324bce..6546172 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,7 @@ else
confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
endif
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ifneq (,$(findstring check,$(DEB_BUILD_OPTIONS)))
with_check := disabled by DEB_BUILD_OPTIONS.
else
ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
@@ -58,14 +58,10 @@ config.status:
# /usr/share/doc/autotools-dev/README.Debian.gz:
# - Call the autoconf suite using simple names ("autoconf", "autoheader", etc.)
# - Call the automake suite using *versioned* names ("automake-1.9", etc),
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
cp -f /usr/share/misc/config.sub Watchdog/config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess
cp -f /usr/share/misc/config.guess Watchdog/config.guess
-endif
./configure $(confflags) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)"
## Architecture
@@ -76,7 +72,7 @@ build-arch-stamp: config.status
# Add here commands to compile the arch part of the package.
$(MAKE) $(NJOBS)
- touch build-arch-stamp
+ touch $@
check:
dh_testdir
@@ -93,7 +89,7 @@ build-indep-stamp: config.status
# Add here commands to compile the indep part of the package.
# FIX this depends on build-arch to install the doc to debian/tmp
# $(MAKE) doc
- touch build-indep-stamp
+ touch $@
clean:
dh_testdir
@@ -102,18 +98,13 @@ clean:
# Add here commands to clean up after the build process.
[ ! -e Makefile ] || $(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
rm -f config.sub Watchdog/config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
rm -f config.guess Watchdog/config.guess
-endif
dh_clean
install: install-indep install-arch
-install: install-arch
-install-indep:
+install-indep: build-indep
# dh_testdir
# dh_testroot
# dh_clean -k -i
@@ -130,7 +121,7 @@ DOC_DIR=debian/libppl-doc/usr/share/doc/libppl-doc
DEV_DOC_DIR=debian/libppl-doc/usr/share/doc/libppl-doc
#SRC_DOC_DIR=$(CURDIR)/debian/tmp/usr/share/doc/ppl/
SRC_DOC_DIR=$(CURDIR)/doc
-install-arch:
+install-arch: build-arch check
dh_testdir
dh_testroot
dh_clean -k -s
@@ -169,7 +160,7 @@ binary-arch: install-arch
dh_testdir
dh_testroot
- dh_installchangelogs ChangeLog
+ dh_installchangelogs
dh_installdocs
dh_install -s --sourcedir=debian/tmp
# dh_installexamples
@@ -182,15 +173,15 @@ binary-arch: install-arch
# dh_installman
# These directories will be symlinks instead. The [^p] is to keep
# the directory for libppl-pwl.
- for f in copyright changelog.Debian changelog ; do \
- rm debian/libppl-c0/usr/share/doc/libppl-c0/$$f ; done
- for f in copyright changelog.Debian changelog ; do \
- rm debian/libppl-dev/usr/share/doc/libppl-dev/$$f ; done
- for f in copyright changelog.Debian changelog ; do \
- rm debian/libpwl-dev/usr/share/doc/libpwl-dev/$$f ; done
- rmdir debian/libppl-c0/usr/share/doc/libppl-c0
- rmdir debian/libppl-dev/usr/share/doc/libppl-dev
- rmdir debian/libpwl-dev/usr/share/doc/libpwl-dev
+ rm -rf debian/libppl-c0/usr/share/doc/libppl-c0
+# Insrall huge ChangeLog into libppl-dev and libpwl-dev only, with
+# symlinks to other packages.
+ mkdir -p debian/libppl-dev/usr/share/doc/libppl-dev
+ cp ChangeLog debian/libppl-dev/usr/share/doc/libppl-dev/changelog
+ gzip -9nf debian/libppl-dev/usr/share/doc/libppl-dev/changelog
+ mkdir -p debian/libpwl-dev/usr/share/doc/libpwl-dev
+ cp ChangeLog debian/libpwl-dev/usr/share/doc/libpwl-dev/changelog
+ gzip -9nf debian/libpwl-dev/usr/share/doc/libpwl-dev/changelog
dh_link
dh_strip
dh_compress
@@ -205,11 +196,11 @@ binary-arch: install-arch
dh_builddeb
## Build architecture independant packages using the common target.
-binary-indep: binary-arch
+binary-indep: binary-arch install-indep
dh_testdir
dh_testroot
- dh_installchangelogs ChangeLog
+ dh_installchangelogs
dh_installdocs
dh_link
dh_strip
@@ -234,4 +225,4 @@ get-orig-source:
tar czf ppl_$$debvers.orig.tar.gz ppl-$$debvers ; \
rm -r ppl-$$debvers
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch get-orig-source
+.PHONY: build check clean binary-indep binary-arch binary install install-indep install-arch get-orig-source
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ppl.git
More information about the debian-science-commits
mailing list