summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/changelog9
-rw-r--r--debian/copyright4
-rw-r--r--debian/patches/01-build.patch19
-rw-r--r--debian/patches/series1
-rwxr-xr-xdebian/rules2
-rw-r--r--debian/source/options2
6 files changed, 33 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index d47c8e6..96d7270 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+lziprecover (1.13-2) unstable; urgency=low
+
+ * Adding patch to avoid overwriting build-environment.
+ * Using license exception description in license field in copyright
+ file.
+ * Switching to xz compression.
+
+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sat, 30 Jun 2012 01:02:06 +0200
+
lziprecover (1.13-1) unstable; urgency=low
* Merging upstream version 1.13.
diff --git a/debian/copyright b/debian/copyright
index da2b201..bcb36e6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,7 +9,7 @@ License: GPL-3+
Files: arg_parser.*
Copyright: 2006-2012 Antonio Diaz Diaz <ant_diaz@teleline.es>
-License: GPL-3+ with exception
+License: GPL-3+ with Library exception
Files: debian/*
Copyright: 2011-2012 Daniel Baumann <daniel.baumann@progress-technologies.net>
@@ -32,7 +32,7 @@ License: GPL-3+
The complete text of the GNU General Public License
can be found in /usr/share/common-licenses/GPL-3 file.
-License: GPL-3+ with exception
+License: GPL-3+ with Library exception
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
diff --git a/debian/patches/01-build.patch b/debian/patches/01-build.patch
new file mode 100644
index 0000000..0a190ad
--- /dev/null
+++ b/debian/patches/01-build.patch
@@ -0,0 +1,19 @@
+Author: Daniel Baumann <daniel.baumann@progress-technologies.net>
+Description: Avoid overwriting build-environment.
+
+diff -Naurp lzip.orig/configure lzip/configure
+--- lzip.orig/configure 2012-06-30 00:54:43.926501688 +0200
++++ lzip/configure 2012-06-30 00:55:57.423296881 +0200
+@@ -23,9 +23,9 @@ datarootdir='$(prefix)/share'
+ infodir='$(datarootdir)/info'
+ mandir='$(datarootdir)/man'
+ CXX=
+-CPPFLAGS=
+-CXXFLAGS='-Wall -W -O2'
+-LDFLAGS=
++#CPPFLAGS=
++#CXXFLAGS='-Wall -W -O2'
++#LDFLAGS=
+
+ # Loop over all args
+ while [ -n "$1" ] ; do
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..605653d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-build.patch
diff --git a/debian/rules b/debian/rules
index c465e00..45a2f60 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,4 +13,4 @@ override_dh_strip:
dh_strip --dbg-package=lziprecover-dbg
override_dh_builddeb:
- dh_builddeb -- -Zgzip -z9
+ dh_builddeb -- -Zxz -z9
diff --git a/debian/source/options b/debian/source/options
index d053b65..22a4de9 100644
--- a/debian/source/options
+++ b/debian/source/options
@@ -1,2 +1,2 @@
-compression = gzip
+compression = xz
compression-level = 9