summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2015-11-07 15:34:09 +0000
committerDaniel Baumann <mail@daniel-baumann.ch>2015-11-07 15:34:09 +0000
commita06bc94dc912c037fb975083b7b6b01ca9eddf3e (patch)
tree4ea53bb19c2a180f8489d4afeae3ff72ceb7a779
parentMerging upstream version 1.0~rc1. (diff)
downloadplzip-a06bc94dc912c037fb975083b7b6b01ca9eddf3e.tar.xz
plzip-a06bc94dc912c037fb975083b7b6b01ca9eddf3e.zip
Adding debian version 1.0~rc1-1.debian/1.0_rc1-1
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to '')
-rw-r--r--debian/changelog12
-rw-r--r--debian/control1
-rw-r--r--debian/copyright6
-rw-r--r--debian/patches/0001-build.patch (renamed from debian/patches/01-build.patch)10
-rw-r--r--debian/patches/series2
-rw-r--r--debian/plzip.postinst25
-rw-r--r--debian/plzip.prerm22
-rwxr-xr-xdebian/rules11
-rw-r--r--debian/source/options1
9 files changed, 79 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog
index e6b588c..e0f5a88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+plzip (1.0~rc1-1) experimental; urgency=low
+
+ * Merging upstream version 1.0~rc1.
+ * Updating years in copyright file.
+ * Dropping dpkg-source compression levels.
+ * Prefixing patches with four digits.
+ * Trimming diff headers in patches.
+ * Refreshing build.patch.
+ * Adding alternative handling for /usr/bin/lzip.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch> Mon, 25 Mar 2013 15:34:25 +0100
+
plzip (0.9-4) unstable; urgency=low
* Removing all references to my old email address.
diff --git a/debian/control b/debian/control
index 18747a0..b525150 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Homepage: http://www.nongnu.org/lzip/plzip.html
Package: plzip
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: lzip (<< 1.15~)
Description: parallel, lossless data compressor based on the LZMA algorithm
Lzip is a lossless data compressor based on the LZMA algorithm, with very safe
integrity checking and a user interface similar to the one of gzip or bzip2.
diff --git a/debian/copyright b/debian/copyright
index 631fc52..7e7f544 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,16 +4,16 @@ 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>
2009 Laszlo Ersek <lacos@caesar.elte.hu>
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/patches/01-build.patch b/debian/patches/0001-build.patch
index ca92694..45559d7 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 plzip.orig/configure plzip/configure
---- plzip.orig/configure 2012-06-27 16:06:34.898944777 +0200
-+++ plzip/configure 2012-06-30 12:47:21.829197850 +0200
+--- plzip.orig/configure
++++ plzip/configure
@@ -23,9 +23,9 @@ datarootdir='$(prefix)/share'
infodir='$(datarootdir)/info'
mandir='$(datarootdir)/man'
- CXX=
+ CXX=g++
-CPPFLAGS=
-CXXFLAGS='-Wall -W -O2'
-LDFLAGS=
@@ -15,5 +15,5 @@ diff -Naurp plzip.orig/configure plzip/configure
+#CXXFLAGS='-Wall -W -O2'
+#LDFLAGS=
- # Loop over all args
- while [ -n "$1" ] ; do
+ # checking whether we are using GNU C++.
+ if [ ! -x /bin/g++ ] &&
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/plzip.postinst b/debian/plzip.postinst
new file mode 100644
index 0000000..2f5d2ae
--- /dev/null
+++ b/debian/plzip.postinst
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+set -e
+
+case "${1}" in
+ configure)
+ update-alternatives --quiet \
+ --install /usr/bin/lzip lzip /usr/bin/lzip.parallel 200 \
+ --slave /usr/share/info/lzip.info.gz lzip.info.gz /usr/share/info/lzip.parallel.info.gz \
+ --slave /usr/share/man/man1/lzip.1.gz lzip.1.gz /usr/share/man/man1/lzip.parallel.1.gz
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`${1}'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/plzip.prerm b/debian/plzip.prerm
new file mode 100644
index 0000000..4a0cdfd
--- /dev/null
+++ b/debian/plzip.prerm
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -e
+
+case "${1}" in
+ remove|upgrade|deconfigure)
+ update-alternatives --quiet --remove lzip /usr/bin/lzip.parallel
+ ;;
+
+ failed-upgrade)
+
+ ;;
+
+ *)
+ echo "prerm called with unknown argument \`${1}'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/rules b/debian/rules
index 948131f..a4c2433 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,13 +11,22 @@ override_dh_auto_install:
# removing unused files
rm -f debian/plzip/usr/share/info/dir*
+ # alernative handling
+ mv debian/plzip/usr/bin/plzip debian/plzip/usr/bin/lzip.parallel
+ mv debian/plzip/usr/share/info/plzip.info debian/plzip/usr/share/info/lzip.parallel.info
+ mv debian/plzip/usr/share/man/man1/plzip.1 debian/plzip/usr/share/man/man1/lzip.parallel.1
+
+ ln -s /usr/bin/lzip.parallel debian/plzip/usr/bin/plzip
+ ln -s /usr/share/info/lzip.parallel.info.gz debian/plzip/usr/share/info/plzip.info.gz
+ ln -s /usr/share/man/man1/lzip.parallel.1.gz debian/plzip/usr/share/man/man1/plzip.1.gz
+
ifeq ($(DEB_BUILD_ARCH),sparc)
override_dh_auto_test:
# disabled, see #608642 for more information
endif
override_dh_builddeb:
- dh_builddeb -- -Zxz -z9
+ dh_builddeb -- -Zxz
override_dh_strip:
dh_strip --dbg-package=plzip-dbg
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