Debian/Ubuntu build files: update from official package (quilt)

This commit is contained in:
Moritz Bunkus 2011-10-08 15:33:00 +02:00
parent caf34f4e62
commit 8772c58ee6
18 changed files with 107 additions and 146 deletions

View File

@ -1,5 +1,8 @@
2011-10-08 Moritz Bunkus <moritz@bunkus.org> 2011-10-08 Moritz Bunkus <moritz@bunkus.org>
* build system: Updated the Debian/Ubuntu files to debhelper
v7/quilt 3.0 format.
* mkvmerge: enhancement: Implemented support for yet another way * mkvmerge: enhancement: Implemented support for yet another way
of storing EAC3 in MPEG transport streams. of storing EAC3 in MPEG transport streams.

View File

@ -1 +1 @@
4 7

View File

@ -2,39 +2,43 @@ Source: mkvtoolnix
Section: graphics Section: graphics
Priority: optional Priority: optional
Maintainer: Moritz Bunkus <moritz@bunkus.org> Maintainer: Moritz Bunkus <moritz@bunkus.org>
Build-Depends: debhelper (>> 4.0.0), libogg-dev, libvorbis-dev, libwxgtk2.8-dev, libexpat1-dev, zlib1g-dev, liblzo2-dev, libbz2-dev, libflac-dev, libmagic-dev, libboost-dev (>= 1.34), libboost-regex-dev, libboost-filesystem-dev, libboost-filesystem-dev (<< 1.35) | libboost-system-dev, ruby, libcurl4-gnutls-dev | libcurl4-openssl-dev, libebml-dev (>= 1.2.2-1), libmatroska-dev (>= 1.3.0-1) Homepage: http://www.bunkus.org/videotools/mkvtoolnix/
Standards-Version: 3.7.2 Standards-Version: 3.9.2
Build-Depends: debhelper (>= 7.0.50~), libwxgtk2.8-dev, ruby,
libbz2-dev, liblzo2-dev, zlib1g-dev, libexpat1-dev, libmagic-dev,
libflac-dev, libogg-dev, libvorbis-dev,
libcurl4-gnutls-dev | libcurl4-openssl-dev,
libboost-dev (>= 1.34), libboost-filesystem-dev, libboost-regex-dev,
libboost-filesystem-dev (<< 1.35) | libboost-system-dev,
libebml-dev (>= 1.2.0), libmatroska-dev (>= 1.1.0)
Package: mkvtoolnix Package: mkvtoolnix
Architecture: any Architecture: any
Depends: ${shlibs:Depends} Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: mkvtoolnix-mb
Suggests: mkvtoolnix-gui Suggests: mkvtoolnix-gui
Description: Command line tools to create and work with Matroska media files Replaces: mkvtoolnix-gui (<= 4.6.0-1)
Matroska is aiming to become the standard of Multimedia Container Description: Set of command-line tools to work with Matroska files
Formats. It is based on EBML (Extensible Binary Meta Language), a Matroska is a new multimedia container format, based on EBML (Extensible
kind of binary version of XML. These tools can work with Matroska files: Binary Meta Language), which is a kind of binary XML.
* mkvmerge creates Matroska files from various other formats. These tools allow to manipulate Matroska files.
* mkvinfo lists information about the tracks contained in a Matroska * mkvmerge is a tool to create Matroska files from other formats
file. * mkvinfo allows one to get information about the tracks in a Matroska file
* mkvextract extracts tracks from a Matroska file into other suitable * mkvextract can extract tracks from Matroska files to other formats
file formats. * mkvpropedit can edit header and chapter information without remuxing
. .
This package only provides command-line tools. For graphical tools, you This package only provides command-line tools. For graphical tools, you
should install the mkvtoolnix-gui package. should install the mkvtoolnix-gui package.
Package: mkvtoolnix-gui Package: mkvtoolnix-gui
Architecture: any Architecture: any
Depends: mkvtoolnix (>= ${source:Version}), ${shlibs:Depends} Depends: mkvtoolnix, ${shlibs:Depends}, ${misc:Depends}
Conflicts: mkvtoolnix-mb Replaces: mkvtoolnix (<= 4.6.0-1)
Description: Tools for working with Matroska media files -- GUI frontend Description: Set of tools to work with Matroska files - GUI frontend
Matroska is aiming to become the standard of Multimedia Container Matroska is a new multimedia container format, based on EBML (Extensible
Formats. It is based on EBML (Extensible Binary Meta Language), a Binary Meta Language), which is a kind of binary XML.
kind of binary version of XML. These tools can work with Matroska files:
* mkvmerge creates Matroska files from various other formats.
* mkvinfo lists information about the tracks contained in a Matroska
file.
* mkvextract extracts tracks from a Matroska file into other suitable
file formats.
. .
This package contains mmg, a GUI frontend to mkvmerge. The mmg tool is a graphical user interface for the mkvmerge program, which
allows one to create Matroska files from other formats.
.
This package also contains a graphical version of the mkvinfo tool, which
allows to get information about a Matroska file.

View File

@ -1,4 +1,25 @@
License: This package was debianized by Clément Stenac <zorglub@debian.org> on
Tue, 1 Feb 2005 08:48:37 +0100.
It was downloaded from http://www.bunkus.org/videotools/mkvtoolnix/
Upstream Author: Moritz Bunkus <moritz @ bunkus . org>
Licence for lib/librmff/* : LGPL 2.1
Copyright:
Copyright (C) Moritz Bunkus - March 2004
Licence for lib/utf8-cpp/source/* : BSD
Copyright:
Copyright 2006 Nemanja Trifunovic
License for other files : GPL 2
Copyright:
Copyright 2003 -2008 Moritz Bunkus <moritz @ bunkus . org>
Copyright (C) Thomas Östreich - June 2001
(c)94 UP-Vision Computergrafik for c't
Copyright (C) 1999 Rainer Johanni <Rainer@Johanni.de>
Copyright (C) Lukas Hejtmanek - January 2004
This software is licensed under the GNU General Public Licence. This software is licensed under the GNU General Public Licence.
On Debian systems, this license can be found in /usr/share/common-licenses On Debian systems, this license can be found in /usr/share/common-licenses

View File

@ -1 +0,0 @@
usr/bin

View File

@ -0,0 +1,8 @@
[Desktop Entry]
Name=MKV files creator
Name[fr]=Créateur de fichiers MKV
Exec=mmg
Terminal=false
Type=Application
Categories=GNOME;AudioVideo;
Icon=matroskalogo

View File

@ -4,8 +4,3 @@ share/desktop/*.desktop /usr/share/applications
share/mime/*.xml /usr/share/mime/packages share/mime/*.xml /usr/share/mime/packages
share/icons/32x32/* /usr/share/icons/hicolor/32x32/apps share/icons/32x32/* /usr/share/icons/hicolor/32x32/apps
share/icons/64x64/* /usr/share/icons/hicolor/64x64/apps share/icons/64x64/* /usr/share/icons/hicolor/64x64/apps
doc/guide/en/*.html doc/guide/en/*.hh? /usr/share/doc/mkvtoolnix/guide/en
doc/guide/en/images/* /usr/share/doc/mkvtoolnix/guide/en/images
doc/guide/zh_CN/*.html doc/guide/zh_CN/*.hh? /usr/share/doc/mkvtoolnix/guide/zh_CN
doc/guide/zh_CN/images/* /usr/share/doc/mkvtoolnix/guide/zh_CN/images

View File

@ -0,0 +1 @@
doc/man/mmg.1

View File

@ -1,2 +1,2 @@
?package(mkvtoolnix-gui):needs="X11" section="Apps/Graphics"\ ?package(mkvtoolnix-gui):needs="X11" section="Applications/Video"\
title="MKV Creator" command="/usr/bin/mmg" title="MKV Creator" command="/usr/bin/mmg"

View File

@ -8,4 +8,3 @@ set -e
#DEBHELPER# #DEBHELPER#
exit 0 exit 0

View File

@ -1,10 +1 @@
examples/example-chapters-1.xml examples/*
examples/example-chapters-2.xml
examples/example-cue-sheet-1.cue
examples/example-segmentinfo-1.xml
examples/example-tags-2.xml
examples/example-timecodes-v1.txt
examples/example-timecodes-v2.txt
examples/matroskachapters.dtd
examples/matroskasegmentinfo.dtd
examples/matroskatags.dtd

View File

@ -1,15 +1,7 @@
debian/tmp/bin/mkvmerge /usr/bin usr/bin/mkvmerge
debian/tmp/bin/mkvinfo /usr/bin usr/bin/mkvinfo
debian/tmp/bin/mkvextract /usr/bin usr/bin/mkvextract
debian/tmp/bin/mkvpropedit /usr/bin usr/bin/mkvpropedit
debian/tmp/share/locale/de/LC_MESSAGES/mkvtoolnix.mo /usr/share/locale/de/LC_MESSAGES usr/share/man
debian/tmp/share/locale/es/LC_MESSAGES/mkvtoolnix.mo /usr/share/locale/es/LC_MESSAGES usr/share/locale
debian/tmp/share/locale/fr/LC_MESSAGES/mkvtoolnix.mo /usr/share/locale/fr/LC_MESSAGES usr/share/doc/mkvtoolnix
debian/tmp/share/locale/it/LC_MESSAGES/mkvtoolnix.mo /usr/share/locale/it/LC_MESSAGES
debian/tmp/share/locale/ja/LC_MESSAGES/mkvtoolnix.mo /usr/share/locale/ja/LC_MESSAGES
debian/tmp/share/locale/nl/LC_MESSAGES/mkvtoolnix.mo /usr/share/locale/nl/LC_MESSAGES
debian/tmp/share/locale/ru/LC_MESSAGES/mkvtoolnix.mo /usr/share/locale/ru/LC_MESSAGES
debian/tmp/share/locale/tr/LC_MESSAGES/mkvtoolnix.mo /usr/share/locale/tr/LC_MESSAGES
debian/tmp/share/locale/uk/LC_MESSAGES/mkvtoolnix.mo /usr/share/locale/uk/LC_MESSAGES
debian/tmp/share/locale/zh_CN/LC_MESSAGES/mkvtoolnix.mo /usr/share/locale/zh_CN/LC_MESSAGES
debian/tmp/share/locale/zh_TW/LC_MESSAGES/mkvtoolnix.mo /usr/share/locale/zh_TW/LC_MESSAGES

View File

@ -0,0 +1 @@
/usr/share/doc/quilt/README.source /usr/share/doc/mkvtoolnix/README.source

View File

@ -1,4 +0,0 @@
?package(mkvtoolnix):needs="x11" \
section="Apps/Graphics" \
title="mkvtoolnix GUI" \
command="/usr/bin/mmg"

View File

@ -8,4 +8,3 @@ set -e
#DEBHELPER# #DEBHELPER#
exit 0 exit 0

View File

@ -1,107 +1,56 @@
#!/usr/bin/make -f #!/usr/bin/make -f
# Rules for mkvtoolnix based on Joey Hess's sample
#################################################################### LDFLAGS += -Wl,-z,defs -Wl,--as-needed
# Build flags
####################################################################
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
CFLAGS = -Wall -g NCPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) ifeq ($(NCPUS),-1)
CFLAGS += -O0 NCPUS:=1
else
CFLAGS += -O2
endif endif
CONFIG_FLAGS = --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info ifeq ($(NCPUS),0)
NCPUS:=1
endif
RAKE=./drake %:
dh $@
####################################################################### override_dh_auto_configure:
# BUILD : Two versions: without and with GUI.
# This impacts mmg which only exists in -GUI
# For mkvinfo, we use an alternative
#######################################################################
build: build-stamp
build-stamp:
dh_testdir
CFLAGS="$(CFLAGS)" ./configure $(CONFIG_FLAGS) --enable-gui
$(RAKE) apps:mkvinfo apps:mmg
mv src/mkvinfo src/mkvinfo-gui
mv src/mmg/mmg src/mmg/mmg-gui
$(RAKE) clean:dist
CFLAGS="$(CFLAGS)" ./configure $(CONFIG_FLAGS) --disable-gui
$(RAKE)
touch build-stamp
########################################################################
# Other rules
########################################################################
clean:
dh_testdir
dh_testroot
rm -f build-stamp
rm -f src/mkvinfo-gui
rm -f src/mmg/mmg-gui
-$(RAKE) clean
rm -f build-config config.h
ifneq "$(wildcard /usr/share/misc/config.sub)" "" ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub cp -f /usr/share/misc/config.sub config.sub
endif endif
ifneq "$(wildcard /usr/share/misc/config.guess)" "" ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess cp -f /usr/share/misc/config.guess config.guess
endif endif
rm -f config.log dh_auto_configure -- --enable-gui
rm -f config.status
dh_clean ./drake -j $(NCPUS)
install: build mv src/mkvinfo src/mkvinfo-gui
dh_testdir mv src/mmg/mmg src/mmg/mmg-gui
dh_testroot
dh_clean -k
$(RAKE) install prefix=$(CURDIR)/debian/tmp ./drake clean
dh_auto_configure -- --disable-gui
./drake -j $(NCPUS)
override_dh_clean:
dh_clean src/mkvinfo-gui src/mmg/mmg-gui config.status config.log
[ ! -f build-config ] || ./drake clean
override_dh_auto_build:
binary-indep: build install override_dh_install:
binary-arch: build install ./drake install DESTDIR=$(CURDIR)/debian/tmp
dh_testdir dh_install --fail-missing
dh_testroot
dh_installchangelogs ChangeLog
dh_installdocs -a
dh_installexamples
dh_install -a
mv debian/mkvtoolnix/usr/bin/mkvinfo debian/mkvtoolnix/usr/bin/mkvinfo-text mv debian/mkvtoolnix/usr/bin/mkvinfo debian/mkvtoolnix/usr/bin/mkvinfo-text
mv debian/mkvtoolnix-gui/usr/bin/mmg-gui debian/mkvtoolnix-gui/usr/bin/mmg mv debian/mkvtoolnix-gui/usr/bin/mmg-gui debian/mkvtoolnix-gui/usr/bin/mmg
dh_installmenu -pmkvtoolnix-gui
dh_installman --language=C doc/man/mkvextract.1 doc/man/mkvinfo.1 doc/man/mkvmerge.1 doc/man/mkvpropedit.1
dh_installman --language=C -pmkvtoolnix-gui doc/man/mmg.1
dh_installman --language=ja doc/man/ja/mkvextract.1 doc/man/ja/mkvinfo.1 doc/man/ja/mkvmerge.1 doc/man/ja/mkvpropedit.1
dh_installman --language=ja -pmkvtoolnix-gui doc/man/ja/mmg.1
dh_installman --language=zh_CN doc/man/zh_CN/mkvextract.1 doc/man/zh_CN/mkvinfo.1 doc/man/zh_CN/mkvmerge.1 doc/man/zh_CN/mkvpropedit.1
dh_installman --language=zh_CN -pmkvtoolnix-gui doc/man/zh_CN/mmg.1
dh_link -pmkvtoolnix usr/share/man/man1/mkvinfo.1.gz usr/share/man/man1/mkvinfo-text.1.gz dh_link -pmkvtoolnix usr/share/man/man1/mkvinfo.1.gz usr/share/man/man1/mkvinfo-text.1.gz
dh_link -pmkvtoolnix-gui usr/share/man/man1/mkvinfo.1.gz usr/share/man/man1/mkvinfo-gui.1.gz dh_link -pmkvtoolnix-gui usr/share/man/man1/mkvinfo.1.gz usr/share/man/man1/mkvinfo-gui.1.gz
dh_strip override_dh_builddeb:
dh_compress dh_builddeb -- -Zbzip2
dh_fixperms
dh_installdeb
dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install

View File

@ -0,0 +1 @@
3.0 (quilt)

2
debian-upstream/watch Normal file
View File

@ -0,0 +1,2 @@
version=3
http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-(.*)\.tar\.bz2