[cpl-plugin-vimos] 02/02: Adjust patches for new version

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole-guest pushed a commit to branch debian
in repository cpl-plugin-vimos.

commit 9e40b4bfd9a11935ad3d5092d7f19eda32054b7e
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri May 9 16:12:54 2014 +0200

    Adjust patches for new version
---
 debian/changelog                    |  6 ++++++
 debian/patches/private_libpil.patch | 21 +++++----------------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 298fbd3..9a447ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cpl-plugin-vimos (2.9.15+dfsg-1) UNRELEASED; urgency=medium
+
+  * New upstream version
+
+ -- Ole Streicher <debian at liska.ath.cx>  Fri, 09 May 2014 16:08:25 +0200
+
 cpl-plugin-vimos (2.9.14+dfsg-1) unstable; urgency=low
 
   * New upstream version
diff --git a/debian/patches/private_libpil.patch b/debian/patches/private_libpil.patch
index c84657d..40bd30c 100644
--- a/debian/patches/private_libpil.patch
+++ b/debian/patches/private_libpil.patch
@@ -1,22 +1,11 @@
 Author: Ole Streicher <debian at liska.ath.cx>
 Description: Make the "pil" library private since it should only be used 
  by this pipeline.
---- a/libpil/pil/Makefile.am
-+++ b/libpil/pil/Makefile.am
-@@ -43,7 +43,7 @@
- 
- noinst_HEADERS = md5.h #xmemory.h
- 
--lib_LTLIBRARIES = libpil.la
-+privatelib_LTLIBRARIES = libpil.la
- 
- libpil_la_SOURCES = pilalias.c pilastroutils.c pilcatmap.c pilcdb.c \
- 	pildate.c pildfsconfig.c pildictionary.c pilerrno.c pilfileutils.c \
 --- a/libpil/acinclude.m4
 +++ b/libpil/acinclude.m4
-@@ -105,6 +105,10 @@
- AC_DEFUN([LIBPIL_SET_PATHS],
- [
+@@ -109,6 +109,10 @@
+         pilprivatelibdir='${libdir}/${PACKAGE}-${VERSION}'
+     fi
  
 +    if test -z "$privatelibdir"; then
 +        privatelibdir='${libdir}/vimos'
@@ -25,9 +14,9 @@ Description: Make the "pil" library private since it should only be used
      if test x"$includedir" = x'${prefix}/include'; then
          includedir='${prefix}/include/pil'
      fi
-@@ -119,5 +123,6 @@
- 
+@@ -124,5 +128,6 @@
      AC_SUBST(configdir)
+     AC_SUBST(pilprivatelibdir)
      AC_SUBST(htmldir)
 +    AC_SUBST(privatelibdir)
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/cpl-plugin-vimos.git