[Pkg-opt-media-team] [dvd+rw-tools] 04/04: Merge remote-tracking branch 'origin/master'

[Takaki Taniguchi]

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

takaki pushed a commit to branch master
in repository dvd+rw-tools.

commit c9c191012f019a3bd7fc0b931516f6dc5e731753
Merge: 7899b1a 7cb6df1
Author: TANIGUCHI Takaki <takaki at asis.media-as.org>
Date:   Mon Aug 7 19:09:14 2017 +0900

    Merge remote-tracking branch 'origin/master'

 debian/changelog                            | 31 ++++++++++++++++++
 debian/compat                               |  2 +-
 debian/control                              | 50 +++++++++++++++++------------
 debian/copyright                            | 14 ++++----
 debian/growisofs.install                    |  2 +-
 debian/patches/fix_burning_bd-r_discs.patch | 22 +++++++++++++
 debian/patches/series                       |  1 +
 debian/rules                                | 47 ++++-----------------------
 debian/source/options                       |  2 --
 debian/watch                                |  3 ++
 10 files changed, 102 insertions(+), 72 deletions(-)

diff --cc debian/changelog
index c65db82,6d4a3f7..39f849b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,34 +1,51 @@@
+ dvd+rw-tools (7.1-11~2.gbp445604) UNRELEASED; urgency=medium
+ 
+   ** SNAPSHOT build @4456041da1c8f4c139ce39df8ef10fd62a5c53da **
+ 
+   * Add list of files to ignore during the build.
+   * debian/watch: Add watch file. Thanks Bart Martens.
+   * debian/{control,growisofs.install}: Normalize with wrap-and-sort.
+   * debian/{compat,control}: Bump debhelper compat to 9.
+   * debian/patches:
+     + Add patch to fix burning BD-R discs.
+       Thanks to Thomas Schmitt <scdbackup at gmx.net> (Closes: #713016)
+   * debian/source/options:
+     + Remove outdated instructions to compress with bzip2.
+   * debian/control:
+     + Fix broken git URL.
+     + Remove outdated flag DMUA.
+     + Fix lintian's vcs-field-not-canonical complaint.
+     + Don't use hardcoded list of kFreeBSD architectures.
+       Thanks to Robert Millan <rmh at debian.org> (Closes: #634504)
+     + Confirm compliancy with policy 3.9.6.
+   * debian/rules:
+     + Don't force outdated compression format (bzip2).
+     + Use a smaller dh-style rules file (still not good). In particular,
+       this now respects the hardening options passed via CFLAGS and
+       siblings.
+   * debian/copyright:
+     + Convert to copyright format 1.0.
+     + Claim my copyright years.
+ 
+  -- Rogério Brito <rbrito at ime.usp.br>  Fri, 20 Feb 2015 23:19:02 -0200
+ 
 +dvd+rw-tools (7.1-11.1) unstable; urgency=medium
 +
 +  * Non-maintainer upload.
 +  * Do not specify bzip2 compressor to dh_builddeb
 +    (Closes: #833211)
 +
 + -- Jonathan Wiltshire <jmw at debian.org>  Fri, 11 Nov 2016 15:11:36 +0000
 +
 +dvd+rw-tools (7.1-11) unstable; urgency=medium
 +
 +  * debian/patches/10-blue-ray-bug713016.patch:
 +    - apply patch from Thomas Schmitt to fix in session closing
 +      on blue ray (closes: #713016), LP: #1113679
 +  * added myself to uploaders
 +
 + -- Michael Vogt <mvo at debian.org>  Thu, 26 Feb 2015 11:22:11 -0500
 +
  dvd+rw-tools (7.1-10) unstable; urgency=low
  
    * Add patch to fix grammar in manpage. Closes: #607605.
diff --cc debian/control
index 0bc99cd,4a6872c..21fcece
--- a/debian/control
+++ b/debian/control
@@@ -2,16 -2,16 +2,18 @@@ Source: dvd+rw-tool
  Section: video
  Priority: optional
  Maintainer: Optical Media Tools Team <pkg-opt-media-team at lists.alioth.debian.org>
- Uploaders: TANIGUCHI Takaki <takaki at debian.org>,
- 	   Rogério Brito <rbrito at ime.usp.br>,
-            Michael Vogt <mvo at debian.org>
- DM-Upload-Allowed: yes
- Build-Depends: debhelper (>= 7),
- 	       libcam-dev [kfreebsd-i386 kfreebsd-amd64],
- 	       m4
- Standards-Version: 3.9.1
- Vcs-Browser: http://git.debian.org/?p=pkg-opt-media/dvd%2Brw-tools.git
- Vcs-Git: git://git.debian.org/pkg-opt-media/dvd+rw-tools.git
+ Uploaders:
+  TANIGUCHI Takaki <takaki at debian.org>,
 - Rogério Brito <rbrito at ime.usp.br>
++ Rogério Brito <rbrito at ime.usp.br>,
++ Michael Vogt <mvo at debian.org>
+ Build-Depends:
+  debhelper (>= 9),
+  libcam-dev [kfreebsd-any],
+  m4
+ Standards-Version: 3.9.6
+ Vcs-Browser: http://anonscm.debian.org/cgit/pkg-opt-media/dvd+rw-tools.git
+ Vcs-Git: git://anonscm.debian.org/pkg-opt-media/dvd+rw-tools.git
++>>>>>>> origin/master
  Homepage: http://fy.chalmers.se/~appro/linux/DVD+RW/
  
  Package: growisofs
diff --cc debian/patches/series
index 196fecb,33760e9..ad7c71f
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -8,4 -8,4 +8,5 @@@
  08-includes.patch
  09-wctomb.patch
  ignore_pseudo_overwrite.patch
 +10-blue-ray-bug713016.patch
+ fix_burning_bd-r_discs.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opt-media/dvd+rw-tools.git