[SCM] ogmrip/master: wrap and sort

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Mon Nov 19 00:41:11 UTC 2012


The following commit has been merged in the master branch:
commit 715fb1b5a5e147b8d897f24c618c2820fb2a3eab
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Nov 19 00:41:00 2012 +0000

    wrap and sort

diff --git a/debian/control b/debian/control
index dc744fd..fd02daa 100644
--- a/debian/control
+++ b/debian/control
@@ -4,24 +4,25 @@ Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders:
  Alessio Treglia <alessio at debian.org>
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends:
+ debhelper (>= 7.0.50~),
+ dh-autoreconf,
+ gtk-doc-tools,
+ intltool,
+ libdbus-glib-1-dev (>= 0.7.2),
  libdvdread-dev (>= 4.1.3-4),
+ libenca-dev,
  libenchant-dev,
  libgconf2-dev,
  libglade2-dev,
+ libnotify-dev (>= 0.7),
  libtheora-dev,
+ libtiff-dev,
+ libtool,
  libvorbis-dev,
- libdbus-glib-1-dev (>= 0.7.2),
  libx264-dev,
- libenca-dev,
  libxml-parser-perl,
- intltool,
- libnotify-dev (>= 0.7),
- libtiff-dev,
- zlib1g-dev,
- dh-autoreconf,
- libtool,
- gtk-doc-tools
+ zlib1g-dev
 Standards-Version: 3.9.4
 Homepage: http://ogmrip.sourceforge.net
 Vcs-Git: git://anonscm.debian.org/pkg-multimedia/ogmrip.git
@@ -29,26 +30,30 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/ogmrip.git
 
 Package: ogmrip
 Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- mplayer-nogui | mplayer,
+Depends:
+ faac (>= 1.24),
+ gpac,
+ lame (>= 3.96),
  mencoder,
+ mkvtoolnix (>= 0.9.5),
+ mplayer-nogui | mplayer,
  ogmtools,
+ tesseract-ocr | ocrad | gocr,
  vorbis-tools (>= 1.0),
- lame (>= 3.96),
- mkvtoolnix (>= 0.9.5),
- faac (>= 1.24),
- gpac,
- tesseract-ocr | ocrad | gocr
-Recommends: ogmrip-doc,
- ogmrip-profiles,
+ ${misc:Depends},
+ ${shlibs:Depends}
+Recommends:
  ogmrip-ac3,
+ ogmrip-dirac,
+ ogmrip-doc,
  ogmrip-mpeg,
  ogmrip-oggz,
- ogmrip-video-copy,
- ogmrip-dirac
-Replaces: libogmrip0
-Conflicts: libogmrip0
+ ogmrip-profiles,
+ ogmrip-video-copy
+Replaces:
+ libogmrip0
+Conflicts:
+ libogmrip0
 Description: Application for ripping and encoding DVD
  ogmrip is an application and a set of libraries for ripping and encoding
  DVD into AVI, OGM MP4 or Matroska files using a wide variety of codecs. It
@@ -66,7 +71,8 @@ Description: Application for ripping and encoding DVD
 Package: ogmrip-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}
+Depends:
+ ${misc:Depends}
 Description: Application for ripping and encoding DVD - Documentation files
  ogmrip is an application and a set of libraries for ripping and encoding
  DVD into AVI, OGM MP4 or Matroska files using a wide variety of codecs. It
@@ -86,8 +92,9 @@ Description: Application for ripping and encoding DVD - Documentation files
 Package: libogmrip1
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends},
- ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: Application for ripping and encoding DVD - libraries files
  ogmrip is an application and a set of libraries for ripping and encoding
  DVD into AVI, OGM MP4 or Matroska files using a wide variety of codecs. It
@@ -107,13 +114,14 @@ Description: Application for ripping and encoding DVD - libraries files
 Package: libogmrip-dev
 Architecture: any
 Section: libdevel
-Depends: libogmrip1 (= ${binary:Version}),
- ${misc:Depends},
+Depends:
+ intltool,
+ libdvdread-dev,
  libenca-dev,
- libglade2-dev,
  libgconf2-dev,
- intltool,
- libdvdread-dev
+ libglade2-dev,
+ libogmrip1 (= ${binary:Version}),
+ ${misc:Depends}
 Description: Application for ripping and encoding DVD - development files
  ogmrip is an application and a set of libraries for ripping and encoding
  DVD into AVI, OGM MP4 or Matroska files using a wide variety of codecs. It
diff --git a/debian/copyright b/debian/copyright
index 0fb8e5c..288be6b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -18,12 +18,12 @@ License: GPL-2+
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2 of the License, or
  (at your option) any later version.
- 
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
- 
+
  You should have received a copy of the GNU General Public License along
  with this program; if not, write to the Free Software Foundation, Inc.,
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -55,7 +55,7 @@ License: zlib/libpng
 Files:libogmdvd/*
       libogmdvd-gtk/*
       libogmjob/*
-Copyright:  
+Copyright:
  Copyright (C) 2004-2010 Olivier Rolland <billl at users.sf.net>
  Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app at wanadoo.fr>
  Copyright (C) Andy Polyakov <appro at fy.chalmers.se>
@@ -67,18 +67,18 @@ License: LGPL-2.1+
  modify it under the terms of the GNU Lesser General Public
  License as published by the Free Software Foundation; either
  version 2.1 of the License, or (at your option) any later version.
- 
+
  This library is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  Lesser General Public License for more details.
- 
+
  You should have received a copy of the GNU Lesser General Public
  License along with this library; if not, write to the Free Software
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 Comment: On Debian systems, the complete text of the GNU Lesser General Public
 License can be found in the file `/usr/share/common-licenses/LGPL-2.1'.
- 
+
 Files: theoraenc/theoraenc.c
 License: BSD-like
  * THIS FILE IS PART OF THE OggTheora SOFTWARE CODEC SOURCE CODE.   *
@@ -117,4 +117,3 @@ License: BSD-like
  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
diff --git a/debian/ogmrip.install b/debian/ogmrip.install
index 1ea6a00..97d7151 100644
--- a/debian/ogmrip.install
+++ b/debian/ogmrip.install
@@ -1,7 +1,7 @@
+etc/gconf/schemas/ogmrip.schemas usr/share/gconf/schemas
 usr/bin
 usr/lib/ogmrip
 usr/share/applications/ogmrip.desktop
-etc/gconf/schemas/ogmrip.schemas usr/share/gconf/schemas
 usr/share/locale
 usr/share/man/man1
 usr/share/ogmrip

-- 
ogmrip packaging



More information about the pkg-multimedia-commits mailing list