[SCM] libdvdread/master: Simply refresh remaining patches

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1bf68fd67ab209b55e58566b4b9932b936192f36
Author: Benjamin Drung <bdrung at debian.org>
Date:   Sat Aug 22 18:56:27 2015 +0200

    Simply refresh remaining patches

diff --git a/debian/patches/0001-libdvdcss.patch b/debian/patches/0001-libdvdcss.patch
index 70ecd62..78ad091 100644
--- a/debian/patches/0001-libdvdcss.patch
+++ b/debian/patches/0001-libdvdcss.patch
@@ -9,19 +9,19 @@ Print information about the CSS README.
 
 --- a/src/dvd_input.c
 +++ b/src/dvd_input.c
-@@ -344,7 +344,14 @@ int dvdinput_setup(void)
+@@ -366,7 +366,14 @@
      return 1;
  
    } else {
 -    fprintf(stderr, "libdvdread: Encrypted DVD support unavailable.\n");
 +    fprintf(stderr, "libdvdread: Encrypted DVD support unavailable.\n"
-+	    "************************************************\n"
-+	    "**                                            **\n"
-+	    "**  No css library available. See             **\n"
-+	    "**  /usr/share/doc/libdvdread4/README.css     **\n"
-+	    "**  for more information.                     **\n"
-+	    "**                                            **\n"
-+	    "************************************************\n");
++                    "************************************************\n"
++                    "**                                            **\n"
++                    "**  No css library available. See             **\n"
++                    "**  /usr/share/doc/libdvdread4/README.css     **\n"
++                    "**  for more information.                     **\n"
++                    "**                                            **\n"
++                    "************************************************\n");
  
      /* libdvdcss replacement functions */
      dvdinput_open  = file_open;
diff --git a/debian/patches/0006-descriptor.patch b/debian/patches/0006-descriptor.patch
index 83df829..f0dbb10 100644
--- a/debian/patches/0006-descriptor.patch
+++ b/debian/patches/0006-descriptor.patch
@@ -27,7 +27,7 @@ Closes: #663512
 
 --- a/src/dvd_udf.c
 +++ b/src/dvd_udf.c
-@@ -82,6 +82,8 @@ struct Partition {
+@@ -82,6 +82,8 @@
    uint32_t AccessType;
    uint32_t Start;
    uint32_t Length;
@@ -36,7 +36,7 @@ Closes: #663512
  };
  
  struct AD {
-@@ -101,6 +103,12 @@ struct avdp_t {
+@@ -101,6 +103,12 @@
    struct extent_ad rvds;
  };
  
@@ -49,7 +49,7 @@ Closes: #663512
  struct pvd_t {
    uint8_t VolumeIdentifier[32];
    uint8_t VolumeSetIdentifier[128];
-@@ -427,6 +435,16 @@ static int UDFLogVolume( uint8_t *data,
+@@ -427,6 +435,16 @@
    return 0;
  }
  
@@ -66,7 +66,7 @@ Closes: #663512
  static int UDFFileEntry( uint8_t *data, uint8_t *FileType,
                           struct Partition *partition, struct AD *ad )
  {
-@@ -773,8 +791,18 @@ static int UDFFindPartition( dvd_reader_
+@@ -775,8 +793,18 @@
          /* Logical Volume Descriptor */
          if( UDFLogVolume( LogBlock, part->VolumeDesc ) ) {
            /* TODO: sector size wrong! */
@@ -87,7 +87,7 @@ Closes: #663512
        }
  
      } while( ( lbnum <= MVDS_location + ( MVDS_length - 1 )
-@@ -817,7 +845,10 @@ uint32_t UDFFindFile( dvd_reader_t *devi
+@@ -818,7 +846,10 @@
      SetUDFCache(device, PartitionCache, 0, &partition);
  
      /* Find root dir ICB */

-- 
libdvdread packaging