[SCM] Zip library packaging branch, master, updated. debian/0.9.3-1-7-g2e3a8b7

[Fathi Boudra]

The following commit has been merged in the master branch:
commit 2e3a8b7f1b4bac4b5acf5731eebc345237ca9228
Author: Fathi Boudra <fabo at debian.org>
Date:   Sun May 1 18:42:30 2011 +0300

    Add patches:
    - fix_open_nonarchive_test.patch to fix regressions tests.
    - fix_zipconf_path.patch to install zipconf.h in include dir.
---
 debian/changelog                              |    3 ++
 debian/patches/fix_open_nonarchive_test.patch |   32 +++++++++++++++++++++++++
 debian/patches/fix_zipconf_path.patch         |   13 ++++++++++
 debian/patches/series                         |    2 +
 4 files changed, 50 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 20d7eca..e1c41f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 libzip (0.10-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Add patches:
+    - fix_open_nonarchive_test.patch to fix regressions tests.
+    - fix_zipconf_path.patch to install zipconf.h in include dir.
   * Update debian/control:
     - bump debhelper build dependency version to 8.0.0.
     - bump Standards-Version to 3.9.2 (no changes needed).
diff --git a/debian/patches/fix_open_nonarchive_test.patch b/debian/patches/fix_open_nonarchive_test.patch
new file mode 100644
index 0000000..4fb3ed1
--- /dev/null
+++ b/debian/patches/fix_open_nonarchive_test.patch
@@ -0,0 +1,32 @@
+Description: fix regressions tests
+Author: Fathi Boudra <fabo at debian.org>
+--- a/regress/open_new_but_exists.test
++++ b/regress/open_new_but_exists.test
+@@ -3,4 +3,4 @@ program tryopen
+ args -e test.zip
+ return 1
+ file test.zip test.zip test.zip
+-stdout opening `test.zip' returned error 10/0
++stdout opening `test.zip' returned error 10
+--- a/regress/open_nonarchive.test
++++ b/regress/open_nonarchive.test
+@@ -3,4 +3,4 @@ program tryopen
+ file Makefile.am Makefile.am Makefile.am
+ args Makefile.am
+ return 1
+-stdout opening `Makefile.am' returned error 19/2
++stdout opening `Makefile.am' returned error 19
+--- a/regress/tryopen.c
++++ b/regress/tryopen.c
+@@ -90,7 +90,9 @@ main(int argc, char *argv[])
+ 	return 0;
+     }
+ 
+-    printf("opening `%s' returned error %d/%d\n",
+-	   fname, ze, errno);
++    printf("opening `%s' returned error %d", fname, ze);
++    if (zip_error_get_sys_type(ze) == ZIP_ET_SYS)
++	printf("/%d", errno);
++    printf("\n");
+     return 1;
+ }
diff --git a/debian/patches/fix_zipconf_path.patch b/debian/patches/fix_zipconf_path.patch
new file mode 100644
index 0000000..20f4176
--- /dev/null
+++ b/debian/patches/fix_zipconf_path.patch
@@ -0,0 +1,13 @@
+Description: install zipconf.h in include dir
+Author: Fathi Boudra <fabo at debian.org>
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -2,7 +2,7 @@ libincludedir = ${libdir}/@PACKAGE@/incl
+ 
+ lib_LTLIBRARIES = libzip.la
+ noinst_HEADERS = zipint.h
+-include_HEADERS = zip.h
++include_HEADERS = zip.h zipconf.h
+ libinclude_HEADERS = zipconf.h
+ 
+ # also update CMakeLists.txt when changing version
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e950881
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+fix_open_nonarchive_test.patch
+fix_zipconf_path.patch

-- 
Zip library packaging