[Pkg-octave-commit] [SCM] Debian packaging for octave branch, master, updated. debian/3.6.1-6-8-g8b29c98

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit 137dbb8dd9a9ea6b21fe1c426401c6e9ea47746b
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Fri Jun 1 11:58:33 2012 +0200

    Refresh other patches

diff --git a/debian/patches/drop_versioned_binarys b/debian/patches/drop_versioned_binarys
index 51058c7..2ff177b 100644
--- a/debian/patches/drop_versioned_binarys
+++ b/debian/patches/drop_versioned_binarys
@@ -4,7 +4,7 @@ Forwarded: not-needed
 Author: Thomas Weber <tweber at debian.org>
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -695,7 +695,7 @@
+@@ -697,7 +697,7 @@
  	chmod a+rx $@
  endif
  
diff --git a/debian/patches/install_libraries_publically b/debian/patches/install_libraries_publically
index dbb0efe..34792d4 100644
--- a/debian/patches/install_libraries_publically
+++ b/debian/patches/install_libraries_publically
@@ -7,7 +7,7 @@ Forwarded: not-needed
 Author: Thomas Weber <tweber at debian.org>
 --- a/libcruft/Makefile.am
 +++ b/libcruft/Makefile.am
-@@ -24,7 +24,8 @@
+@@ -27,7 +27,8 @@
  
  AUTOMAKE_OPTIONS = subdir-objects
  
@@ -17,7 +17,7 @@ Author: Thomas Weber <tweber at debian.org>
  
  libcruft_la_SOURCES =
  
-@@ -56,7 +57,7 @@
+@@ -59,7 +60,7 @@
    -bindir $(bindir) \
    $(LIBCRUFT_LINK_OPTS)
  
@@ -28,7 +28,7 @@ Author: Thomas Weber <tweber at debian.org>
  
 --- a/liboctave/Makefile.am
 +++ b/liboctave/Makefile.am
-@@ -411,7 +411,8 @@
+@@ -413,7 +413,8 @@
    uint64NDArray.cc \
    uint8NDArray.cc
  
@@ -40,7 +40,7 @@ Author: Thomas Weber <tweber at debian.org>
    CollocWt.cc \
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -28,7 +28,8 @@
+@@ -30,7 +30,8 @@
  
  AUTOMAKE_OPTIONS = subdir-objects
  
diff --git a/debian/patches/use_system_gl2ps b/debian/patches/use_system_gl2ps
index a1d9324..1964564 100644
--- a/debian/patches/use_system_gl2ps
+++ b/debian/patches/use_system_gl2ps
@@ -6324,7 +6324,7 @@ Author: Thomas Weber <tweber at debian.org>
  OCTINTERP_API
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -100,7 +100,6 @@
+@@ -102,7 +102,6 @@
    DOCSTRINGS \
    find-defun-files.sh \
    genprops.awk \
@@ -6332,7 +6332,7 @@ Author: Thomas Weber <tweber at debian.org>
    graphics.h.in \
    mk-errno-list \
    mk-pkg-add \
-@@ -247,7 +246,6 @@
+@@ -249,7 +248,6 @@
    error.h \
    file-io.h \
    gl-render.h \
@@ -6340,7 +6340,7 @@ Author: Thomas Weber <tweber at debian.org>
    gl2ps-renderer.h \
    graphics-props.cc \
    gripes.h \
-@@ -467,7 +465,6 @@
+@@ -469,7 +467,6 @@
    utils.cc \
    variables.cc \
    xdiv.cc \

-- 
Debian packaging for octave