[SCM] libopenshot-audio/debian/sid: Update packaging due to repack.

ghisvail-guest at users.alioth.debian.org ghisvail-guest at users.alioth.debian.org
Thu Jan 21 12:41:40 UTC 2016


The following commit has been merged in the debian/sid branch:
commit 85a69adf56b9e045a1d1c091fbcb35acc12c10db
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Tue Jan 19 19:26:58 2016 +0000

    Update packaging due to repack.

diff --git a/debian/changelog b/debian/changelog
index 232ce87..5eaf8f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libopenshot-audio (0.0.6-1) UNRELEASED; urgency=low
+libopenshot-audio (0.0.6+ds1-1) UNRELEASED; urgency=low
 
   * Initial release. Closes: #810787
 
diff --git a/debian/copyright b/debian/copyright
index 45982fa..68a7789 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,11 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: libopenshot-audio
 Upstream-Contact: Jonathan Thomas <jonathan at openshot.org>
 Source: https://github.com/OpenShot/libopenshot-audio
+Files-Excluded: JuceLibraryCode/modules/juce_audio_formats/codecs/flac/*
+                JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/*
+                JuceLibraryCode/modules/juce_core/zip/zlib/*
+                JuceLibraryCode/modules/juce_graphics/image_formats/jpglib/*
+                JuceLibraryCode/modules/juce_graphics/image_formats/pnglib/*
 
 Files: *
 Copyright: 2008-2015 OpenShot Studios, LLC
@@ -19,30 +24,10 @@ Files: JuceLibraryCode/*
 Copyright: 2015 ROLI Ltd.
 License: GPL-2+ or AGPL-3
 
-Files: JuceLibraryCode/modules/juce_audio_formats/codecs/flac/*
-Copyright: 2011-2014, Xiph.Org Foundation
-License: GPL-2+ or LGPL-2.1+
-
-Files: JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/*
-Copyright: 2002, Xiph.org Foundation
-License: BSD-3-clause
-
 Files: JuceLibraryCode/modules/juce_core/*
 Copyright: 2015 ROLI Ltd.
 License: ISC
 
-Files: JuceLibraryCode/modules/juce_core/zip/zlib/*
-Copyright: 1995-1998 Jean-loup Gailly and Mark Adler
-License: zlib
-
-Files: JuceLibraryCode/modules/juce_graphics/image_formats/jpglib/*
-Copyright: 1991-1998, Thomas G. Lane
-License: libjpeg
-
-Files: JuceLibraryCode/modules/juce_graphics/image_formats/pnglib/*
-Copyright: 1998-2013 Glenn Randers-Pehrson
-License: libpng
-
 License: AGPL-3
                     GNU AFFERO GENERAL PUBLIC LICENSE
                        Version 3, 19 November 2007
@@ -758,240 +743,3 @@ License: ISC
  Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
  .
  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-License: LGPL-2.1+
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published by the
- Free Software Foundation; version 2.1 of the License, or (at
- your option) any later version.
- .
- On Debian systems, the complete text of version 2.1 of the GNU Lesser
- General Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
-
-License: libjpeg
- LEGAL ISSUES
- ============
- .
- In plain English:
- .
- 1. We don't promise that this software works.  (But if you find any bugs,
-    please let us know!)
- 2. You can use this software for whatever you want.  You don't have to pay us.
- 3. You may not pretend that you wrote this software.  If you use it in a
-    program, you must acknowledge somewhere in your documentation that
-    you've used the IJG code.
- .
- In legalese:
- .
- The authors make NO WARRANTY or representation, either express or implied,
- with respect to this software, its quality, accuracy, merchantability, or
- fitness for a particular purpose.  This software is provided "AS IS", and you,
- its user, assume the entire risk as to its quality and accuracy.
- .
- This software is copyright (C) 1991-1998, Thomas G. Lane.
- All Rights Reserved except as specified below.
- .
- Permission is hereby granted to use, copy, modify, and distribute this
- software (or portions thereof) for any purpose, without fee, subject to these
- conditions:
- (1) If any part of the source code for this software is distributed, then this
- README file must be included, with this copyright and no-warranty notice
- unaltered; and any additions, deletions, or changes to the original files
- must be clearly indicated in accompanying documentation.
- (2) If only executable code is distributed, then the accompanying
- documentation must state that "this software is based in part on the work of
- the Independent JPEG Group".
- (3) Permission for use of this software is granted only if the user accepts
- full responsibility for any undesirable consequences; the authors accept
- NO LIABILITY for damages of any kind.
- .
- These conditions apply to any software derived from or based on the IJG code,
- not just to the unmodified library.  If you use our work, you ought to
- acknowledge us.
- .
- Permission is NOT granted for the use of any IJG author's name or company name
- in advertising or publicity relating to this software or products derived from
- it.  This software may be referred to only as "the Independent JPEG Group's
- software".
- .
- We specifically permit and encourage the use of this software as the basis of
- commercial products, provided that all warranty or liability claims are
- assumed by the product vendor.
- .
- .
- ansi2knr.c is included in this distribution by permission of L. Peter Deutsch,
- sole proprietor of its copyright holder, Aladdin Enterprises of Menlo Park, CA.
- ansi2knr.c is NOT covered by the above copyright and conditions, but instead
- by the usual distribution terms of the Free Software Foundation; principally,
- that you must include source code if you redistribute it.  (See the file
- ansi2knr.c for full details.)  However, since ansi2knr.c is not needed as part
- of any program generated from the IJG code, this does not limit you more than
- the foregoing paragraphs do.
- .
- The Unix configuration script "configure" was produced with GNU Autoconf.
- It is copyright by the Free Software Foundation but is freely distributable.
- The same holds for its supporting scripts (config.guess, config.sub,
- ltconfig, ltmain.sh).  Another support script, install-sh, is copyright
- by M.I.T. but is also freely distributable.
- .
- It appears that the arithmetic coding option of the JPEG spec is covered by
- patents owned by IBM, AT&T, and Mitsubishi.  Hence arithmetic coding cannot
- legally be used without obtaining one or more licenses.  For this reason,
- support for arithmetic coding has been removed from the free JPEG software.
- (Since arithmetic coding provides only a marginal gain over the unpatented
- Huffman mode, it is unlikely that very many implementations will support it.)
- So far as we are aware, there are no patent restrictions on the remaining
- code.
- .
- The IJG distribution formerly included code to read and write GIF files.
- To avoid entanglement with the Unisys LZW patent, GIF reading support has
- been removed altogether, and the GIF writer has been simplified to produce
- "uncompressed GIFs".  This technique does not use the LZW algorithm; the
- resulting GIF files are larger than usual, but are readable by all standard
- GIF decoders.
- .
- We are required to state that
-     "The Graphics Interchange Format(c) is the Copyright property of
-     CompuServe Incorporated.  GIF(sm) is a Service Mark property of
-     CompuServe Incorporated."
-
-License: libpng
- This copy of the libpng notices is provided for your convenience.  In case of
- any discrepancy between this copy and the notices in the file png.h that is
- included in the libpng distribution, the latter shall prevail.
- .
- COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
- .
- If you modify libpng you may insert additional notices immediately following
- this sentence.
- .
- libpng versions 1.2.6, August 15, 2004, through 1.2.21, October 4, 2007, are
- Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are
- distributed according to the same disclaimer and license as libpng-1.2.5
- with the following individual added to the list of Contributing Authors
- .
-    Cosmin Truta
- .
- libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are
- Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
- distributed according to the same disclaimer and license as libpng-1.0.6
- with the following individuals added to the list of Contributing Authors
- .
-    Simon-Pierre Cadieux
-    Eric S. Raymond
-    Gilles Vollant
- .
- and with the following additions to the disclaimer:
- .
-    There is no warranty against interference with your enjoyment of the
-    library or against infringement.  There is no warranty that our
-    efforts or the library will fulfill any of your particular purposes
-    or needs.  This library is provided with all faults, and the entire
-    risk of satisfactory quality, performance, accuracy, and effort is with
-    the user.
- .
- libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
- Copyright (c) 1998, 1999 Glenn Randers-Pehrson, and are
- distributed according to the same disclaimer and license as libpng-0.96,
- with the following individuals added to the list of Contributing Authors:
- .
-    Tom Lane
-    Glenn Randers-Pehrson
-    Willem van Schaik
- .
- libpng versions 0.89, June 1996, through 0.96, May 1997, are
- Copyright (c) 1996, 1997 Andreas Dilger
- Distributed according to the same disclaimer and license as libpng-0.88,
- with the following individuals added to the list of Contributing Authors:
- .
-    John Bowler
-    Kevin Bracey
-    Sam Bushell
-    Magnus Holmgren
-    Greg Roelofs
-    Tom Tanner
- .
- libpng versions 0.5, May 1995, through 0.88, January 1996, are
- Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
- .
- For the purposes of this copyright and license, "Contributing Authors"
- is defined as the following set of individuals:
- .
-    Andreas Dilger
-    Dave Martindale
-    Guy Eric Schalnat
-    Paul Schmidt
-    Tim Wegner
- .
- The PNG Reference Library is supplied "AS IS".  The Contributing Authors
- and Group 42, Inc. disclaim all warranties, expressed or implied,
- including, without limitation, the warranties of merchantability and of
- fitness for any purpose.  The Contributing Authors and Group 42, Inc.
- assume no liability for direct, indirect, incidental, special, exemplary,
- or consequential damages, which may result from the use of the PNG
- Reference Library, even if advised of the possibility of such damage.
- .
- Permission is hereby granted to use, copy, modify, and distribute this
- source code, or portions hereof, for any purpose, without fee, subject
- to the following restrictions:
- .
- 1. The origin of this source code must not be misrepresented.
- .
- 2. Altered versions must be plainly marked as such and must not
-    be misrepresented as being the original source.
- .
- 3. This Copyright notice may not be removed or altered from any
-    source or altered source distribution.
- .
- The Contributing Authors and Group 42, Inc. specifically permit, without
- fee, and encourage the use of this source code as a component to
- supporting the PNG file format in commercial products.  If you use this
- source code in a product, acknowledgment is not required but would be
- appreciated.
- .
- .
- A "png_get_copyright" function is available, for convenient use in "about"
- boxes and the like:
- .
-    printf("%s",png_get_copyright(NULL));
- .
- Also, the PNG logo (in PNG format, of course) is supplied in the
- files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
- .
- Libpng is OSI Certified Open Source Software.  OSI Certified Open Source is a
- certification mark of the Open Source Initiative.
- .
- Glenn Randers-Pehrson
- glennrp at users.sourceforge.net
- October 4, 2007
-
-License: zlib
-   This software is provided 'as-is', without any express or implied
-   warranty.  In no event will the authors be held liable for any damages
-   arising from the use of this software.
- .
-   Permission is granted to anyone to use this software for any purpose,
-   including commercial applications, and to alter it and redistribute it
-   freely, subject to the following restrictions:
- .
-   1. The origin of this software must not be misrepresented; you must not
-      claim that you wrote the original software. If you use this software
-      in a product, an acknowledgment in the product documentation would be
-      appreciated but is not required.
-   2. Altered source versions must be plainly marked as such, and must not be
-      misrepresented as being the original software.
-   3. This notice may not be removed or altered from any source distribution.
- .
-   Jean-loup Gailly        Mark Adler
-   jloup at gzip.org          madler at alumni.caltech.edu
- .
- If you use the zlib library in a product, we would appreciate *not*
- receiving lengthy legal documents to sign. The sources are provided
- for free but without warranty of any kind.  The library has been
- entirely written by Jean-loup Gailly and Mark Adler; it does not
- include third-party code.
- .
- If you redistribute modified sources, we would appreciate that you include
- in the file ChangeLog history information documenting your changes. Please
- read the FAQ for more information on the distribution of modified source
- versions.
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 0304396..45d4a21 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,7 +1,7 @@
 [DEFAULT]
-upstream-branch = master
+upstream-branch = upstream
 debian-branch = debian/sid
-upstream-tag = v%(version)s
+upstream-tag = upstream/%(version)s
 debian-tag = debian/%(version)s
 pristine-tar = True
 
diff --git a/debian/watch b/debian/watch
index f497bbb..62f866b 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,5 @@
 version=3
-opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/libopenshot-audio-$1\.tar\.gz/ \
+opts=dversionmangle=s/\+(debian|dfsg|ds|deb)(\.\d+)?$//,\
+repacksuffix=+ds1,\
+filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/libopenshot-audio-$1\.tar\.gz/ \
 https://github.com/OpenShot/libopenshot-audio/tags .*/v?(\d\S*)\.tar\.gz

-- 
libopenshot-audio packaging



More information about the pkg-multimedia-commits mailing list