[SCM] libdvdnav/master: Refresh patches.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 23543daa0a261967c2d555af7cd3a871b5d51fb4
Author: Benjamin Drung <bdrung at debian.org>
Date:   Sat Jan 11 18:05:34 2014 +0100

    Refresh patches.

diff --git a/debian/patches/0001-inttypes.patch b/debian/patches/0001-inttypes.patch
index 94e3ea4..c282d35 100644
--- a/debian/patches/0001-inttypes.patch
+++ b/debian/patches/0001-inttypes.patch
@@ -1,14 +1,13 @@
 Author: Dominik Mierzejewski <rpm at greysector.net>
-Description: Fixing missing <inttypes.h> include.
+Description: Add missing <stdint.h.h> include for uint32_t.
 
-diff -Naurp libdvdnav.orig/src/dvdnav/dvd_types.h libdvdnav/src/dvdnav/dvd_types.h
---- libdvdnav.orig/src/dvdnav/dvd_types.h
-+++ libdvdnav/src/dvdnav/dvd_types.h
+--- a/src/dvdnav/dvd_types.h
++++ b/src/dvdnav/dvd_types.h
 @@ -26,6 +26,8 @@
  #ifndef LIBDVDNAV_DVD_TYPES_H
  #define LIBDVDNAV_DVD_TYPES_H
  
-+#include <inttypes.h>
++#include <stdint.h>
 +
  /*
   * DVD Menu ID
diff --git a/debian/patches/0002-hurd.patch b/debian/patches/0002-hurd.patch
index e59c5aa..cccf663 100644
--- a/debian/patches/0002-hurd.patch
+++ b/debian/patches/0002-hurd.patch
@@ -3,10 +3,9 @@ Description:
  Use dynamically allocated strings instead of hardcoded size ones to fix FTBFS
  on hurd (Closes: #641028).
 
-diff -Naurp libdvdnav.orig/src/dvdnav.c libdvdnav/src/dvdnav.c
---- libdvdnav.orig/src/dvdnav.c
-+++ libdvdnav/src/dvdnav.c
-@@ -166,8 +166,7 @@ dvdnav_status_t dvdnav_open(dvdnav_t** d
+--- a/src/dvdnav.c
++++ b/src/dvdnav.c
+@@ -105,8 +105,7 @@
    }
  
    /* Set the path. FIXME: Is a deep copy 'right' */
@@ -16,10 +15,9 @@ diff -Naurp libdvdnav.orig/src/dvdnav.c libdvdnav/src/dvdnav.c
  
    /* Pre-open and close a file so that the CSS-keys are cached. */
    this->file = DVDOpenFile(vm_get_dvd_reader(this->vm), 0, DVD_READ_MENU_VOBS);
-diff -Naurp libdvdnav.orig/src/dvdnav_internal.h libdvdnav/src/dvdnav_internal.h
---- libdvdnav.orig/src/dvdnav_internal.h
-+++ libdvdnav/src/dvdnav_internal.h
-@@ -65,13 +65,6 @@ static inline int _private_gettimeofday(
+--- a/src/dvdnav_internal.h
++++ b/src/dvdnav_internal.h
+@@ -65,13 +65,6 @@
  /* Maximum length of an error string */
  #define MAX_ERR_LEN 255
  
@@ -33,7 +31,7 @@ diff -Naurp libdvdnav.orig/src/dvdnav_internal.h libdvdnav/src/dvdnav_internal.h
  #ifndef DVD_VIDEO_LB_LEN
  #define DVD_VIDEO_LB_LEN 2048
  #endif
-@@ -144,7 +137,7 @@ typedef struct dvdnav_vobu_s {
+@@ -144,7 +137,7 @@
  
  struct dvdnav_s {
    /* General data */
@@ -42,10 +40,9 @@ diff -Naurp libdvdnav.orig/src/dvdnav_internal.h libdvdnav/src/dvdnav_internal.h
    dvd_file_t *file;               /* Currently opened file */
  
    /* Position data */
-diff -Naurp libdvdnav.orig/src/remap.c libdvdnav/src/remap.c
---- libdvdnav.orig/src/remap.c
-+++ libdvdnav/src/remap.c
-@@ -27,10 +27,6 @@
+--- a/src/remap.c
++++ b/src/remap.c
+@@ -28,10 +28,6 @@
  #ifndef _MSC_VER
  #include <sys/param.h>
  #include <fcntl.h>
@@ -56,7 +53,7 @@ diff -Naurp libdvdnav.orig/src/remap.c libdvdnav/src/remap.c
  #endif /* _MSC_VER */
  
  #include <inttypes.h>
-@@ -197,7 +193,7 @@ static int parseblock(char *buf, int *do
+@@ -191,7 +187,7 @@
  
  remap_t* remap_loadmap( char *title) {
      char buf[160];
@@ -65,7 +62,7 @@ diff -Naurp libdvdnav.orig/src/remap.c libdvdnav/src/remap.c
      char *home;
      int res;
      FILE *fp;
-@@ -211,14 +207,19 @@ remap_t* remap_loadmap( char *title) {
+@@ -205,14 +201,19 @@
          fprintf(MSG_OUT, "libdvdnav: Unable to find home directory" );
          return NULL;
      }
@@ -85,4 +82,4 @@ diff -Naurp libdvdnav.orig/src/remap.c libdvdnav/src/remap.c
 +    free(fname);
  
      /* Load the map file */
-     if ((map = remap_new( title)) == NULL) {
+     map = remap_new( title);

-- 
libdvdnav packaging