summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2015-11-07 13:48:06 +0000
committerDaniel Baumann <mail@daniel-baumann.ch>2015-11-07 13:48:06 +0000
commit62a548f8b6f3f1972642a312c0f29a39458a3957 (patch)
treee2f06752645a2f59a3fa997d1e1c5214f65dddab
parentMerging upstream version 1.4~rc2. (diff)
downloadlzlib-62a548f8b6f3f1972642a312c0f29a39458a3957.tar.xz
lzlib-62a548f8b6f3f1972642a312c0f29a39458a3957.zip
Adding debian version 1.4~rc2-1.debian/1.4_rc2-1
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
-rw-r--r--debian/changelog12
-rw-r--r--debian/control2
-rw-r--r--debian/copyright6
-rw-r--r--[-rwxr-xr-x]debian/liblz-dev.install12
-rw-r--r--[-rwxr-xr-x]debian/liblz1.install10
-rw-r--r--debian/patches/0001-build.patch (renamed from debian/patches/01-build.patch)10
-rw-r--r--debian/patches/series2
-rwxr-xr-xdebian/rules16
-rw-r--r--debian/source/options1
9 files changed, 26 insertions, 45 deletions
diff --git a/debian/changelog b/debian/changelog
index 1f11f6d..09ce853 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+lzlib (1.4~rc2-1) experimental; urgency=low
+
+ * Merging upstream version 1.4~rc2.
+ * Dropping conditional multiarch support for pre-wheezy.
+ * Prefixing patches with ffour digits.
+ * Trimming diff headers in patches.
+ * Refreshing build.patch.
+ * Updating years in copyright file.
+ * Dropping dpkg-source compression levels.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch> Tue, 26 Mar 2013 09:56:34 +0100
+
lzlib (1.3-4) unstable; urgency=low
* Removing all references to my old email address.
diff --git a/debian/control b/debian/control
index 7ce5669..41cdb49 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Homepage: http://www.nongnu.org/lzip/lzlib.html
Package: liblz1
Section: libs
Architecture: any
-Pre-Depends: ${multiarch:Pre-Depends}
+Pre-Depends: multiarch-support
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: data compressor based on the LZMA algorithm (library)
The lzlib compression library provides in-memory LZMA compression and
diff --git a/debian/copyright b/debian/copyright
index bc534e4..1ca0471 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,15 +4,15 @@ Upstream-Contact: lzip-bug@nongnu.org
Source: http://download.savannah.gnu.org/releases/lzip/
Files: *
-Copyright: 2006-2012 Antonio Diaz Diaz <ant_diaz@teleline.es>
+Copyright: 2006-2013 Antonio Diaz Diaz <ant_diaz@teleline.es>
License: GPL-3+
Files: arg_parser.*
-Copyright: 2006-2012 Antonio Diaz Diaz <ant_diaz@teleline.es>
+Copyright: 2006-2013 Antonio Diaz Diaz <ant_diaz@teleline.es>
License: GPL-3+ with Library exception
Files: debian/*
-Copyright: 2009-2012 Daniel Baumann <mail@daniel-baumann.ch>
+Copyright: 2009-2013 Daniel Baumann <mail@daniel-baumann.ch>
License: GPL-3+
License: GPL-3+
diff --git a/debian/liblz-dev.install b/debian/liblz-dev.install
index a82be7b..2f05691 100755..100644
--- a/debian/liblz-dev.install
+++ b/debian/liblz-dev.install
@@ -1,12 +1,4 @@
-#!/bin/sh
-
-set -e
-
-DEB_HOST_MULTIARCH="$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
-
-cat << EOF
usr/include
-usr/lib/${DEB_HOST_MULTIARCH}/*.a
-usr/lib/${DEB_HOST_MULTIARCH}/*.so
+usr/lib/*/*.a
+usr/lib/*/*.so
usr/share/info
-EOF
diff --git a/debian/liblz1.install b/debian/liblz1.install
index 68a9cf4..3de3b10 100755..100644
--- a/debian/liblz1.install
+++ b/debian/liblz1.install
@@ -1,9 +1 @@
-#!/bin/sh
-
-set -e
-
-DEB_HOST_MULTIARCH="$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
-
-cat << EOF
-usr/lib/${DEB_HOST_MULTIARCH}/*.so.*
-EOF
+usr/lib/*/*.so.*
diff --git a/debian/patches/01-build.patch b/debian/patches/0001-build.patch
index 0f572cb..7a358f3 100644
--- a/debian/patches/01-build.patch
+++ b/debian/patches/0001-build.patch
@@ -2,12 +2,12 @@ Author: Daniel Baumann <mail@daniel-baumann.ch>
Description: Avoid overwriting build-environment.
diff -Naurp lzlib.orig/configure lzlib/configure
---- lzlib.orig/configure 2012-06-27 16:05:12.182145257 +0200
-+++ lzlib/configure 2012-06-30 01:12:33.017869646 +0200
+--- lzlib.orig/configure
++++ lzlib/configure
@@ -28,9 +28,9 @@ infodir='$(datarootdir)/info'
libdir='$(exec_prefix)/lib'
mandir='$(datarootdir)/man'
- CC=
+ CC=gcc
-CPPFLAGS=
-CFLAGS='-Wall -W -O2'
-LDFLAGS=
@@ -15,5 +15,5 @@ diff -Naurp lzlib.orig/configure lzlib/configure
+#CFLAGS='-Wall -W -O2'
+#LDFLAGS=
- # Loop over all args
- while [ -n "$1" ] ; do
+ # checking whether we are using GNU C.
+ if [ ! -x /bin/gcc ] &&
diff --git a/debian/patches/series b/debian/patches/series
index 605653d..58cf314 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-01-build.patch
+0001-build.patch
diff --git a/debian/rules b/debian/rules
index 9dcfcaa..e256952 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,25 +11,11 @@ override_dh_auto_configure:
override_dh_auto_install:
dh_auto_install -- LDCONFIG=/bin/true
- # adding missing symlink
-ifeq ($(DEB_HOST_MULTIARCH),)
- ln -s liblz.so.1.1 debian/tmp/usr/lib/liblz.so
-else
- ln -s liblz.so.1.1 debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/liblz.so
-endif
-
# removing unused files
rm -f debian/tmp/usr/share/info/dir*
override_dh_builddeb:
- dh_builddeb -- -Zxz -z9
-
-override_dh_gencontrol:
-ifeq ($(DEB_HOST_MULTIARCH),)
- dh_gencontrol
-else
- dh_gencontrol -- -Vmultiarch:Pre-Depends="multiarch-support"
-endif
+ dh_builddeb -- -Zxz
override_dh_install:
dh_install --fail-missing
diff --git a/debian/source/options b/debian/source/options
index 22a4de9..5bd47b7 100644
--- a/debian/source/options
+++ b/debian/source/options
@@ -1,2 +1 @@
compression = xz
-compression-level = 9