From 8772c58ee6eb586077ab62625be5d92c4b3a6c8b Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Sat, 8 Oct 2011 15:33:00 +0200 Subject: [PATCH] Debian/Ubuntu build files: update from official package (quilt) --- ChangeLog | 3 + debian-upstream/compat | 2 +- debian-upstream/control | 54 ++++++------ debian-upstream/copyright | 23 ++++- debian-upstream/dirs | 1 - debian-upstream/mkvtoolnix-gui.desktop | 8 ++ debian-upstream/mkvtoolnix-gui.install | 5 -- debian-upstream/mkvtoolnix-gui.manpages | 1 + debian-upstream/mkvtoolnix-gui.menu | 2 +- debian-upstream/mkvtoolnix-gui.prerm | 1 - debian-upstream/mkvtoolnix.examples | 11 +-- debian-upstream/mkvtoolnix.install | 22 ++--- debian-upstream/mkvtoolnix.links | 1 + debian-upstream/mkvtoolnix.menu | 4 - debian-upstream/mkvtoolnix.prerm | 1 - debian-upstream/rules | 111 +++++++----------------- debian-upstream/source/format | 1 + debian-upstream/watch | 2 + 18 files changed, 107 insertions(+), 146 deletions(-) delete mode 100644 debian-upstream/dirs create mode 100644 debian-upstream/mkvtoolnix-gui.desktop create mode 100644 debian-upstream/mkvtoolnix-gui.manpages create mode 100644 debian-upstream/mkvtoolnix.links delete mode 100644 debian-upstream/mkvtoolnix.menu create mode 100644 debian-upstream/source/format create mode 100644 debian-upstream/watch diff --git a/ChangeLog b/ChangeLog index b37d5f021..ff80080ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2011-10-08 Moritz Bunkus + * build system: Updated the Debian/Ubuntu files to debhelper + v7/quilt 3.0 format. + * mkvmerge: enhancement: Implemented support for yet another way of storing EAC3 in MPEG transport streams. diff --git a/debian-upstream/compat b/debian-upstream/compat index b8626c4cf..7f8f011eb 100644 --- a/debian-upstream/compat +++ b/debian-upstream/compat @@ -1 +1 @@ -4 +7 diff --git a/debian-upstream/control b/debian-upstream/control index bf1ee5b1d..19e46b83d 100644 --- a/debian-upstream/control +++ b/debian-upstream/control @@ -2,39 +2,43 @@ Source: mkvtoolnix Section: graphics Priority: optional Maintainer: Moritz Bunkus -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) -Standards-Version: 3.7.2 +Homepage: http://www.bunkus.org/videotools/mkvtoolnix/ +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 Architecture: any -Depends: ${shlibs:Depends} -Conflicts: mkvtoolnix-mb +Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: mkvtoolnix-gui -Description: Command line tools to create and work with Matroska media files - Matroska is aiming to become the standard of Multimedia Container - Formats. It is based on EBML (Extensible Binary Meta Language), a - 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. +Replaces: mkvtoolnix-gui (<= 4.6.0-1) +Description: Set of command-line tools to work with Matroska files + Matroska is a new multimedia container format, based on EBML (Extensible + Binary Meta Language), which is a kind of binary XML. + These tools allow to manipulate Matroska files. + * mkvmerge is a tool to create Matroska files from other formats + * mkvinfo allows one to get information about the tracks in a Matroska file + * mkvextract can extract tracks from Matroska files to other formats + * mkvpropedit can edit header and chapter information without remuxing . This package only provides command-line tools. For graphical tools, you should install the mkvtoolnix-gui package. Package: mkvtoolnix-gui Architecture: any -Depends: mkvtoolnix (>= ${source:Version}), ${shlibs:Depends} -Conflicts: mkvtoolnix-mb -Description: Tools for working with Matroska media files -- GUI frontend - Matroska is aiming to become the standard of Multimedia Container - Formats. It is based on EBML (Extensible Binary Meta Language), a - 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. +Depends: mkvtoolnix, ${shlibs:Depends}, ${misc:Depends} +Replaces: mkvtoolnix (<= 4.6.0-1) +Description: Set of tools to work with Matroska files - GUI frontend + Matroska is a new multimedia container format, based on EBML (Extensible + Binary Meta Language), which is a kind of binary XML. . - 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. diff --git a/debian-upstream/copyright b/debian-upstream/copyright index 71838e04b..2fb193cc7 100644 --- a/debian-upstream/copyright +++ b/debian-upstream/copyright @@ -1,4 +1,25 @@ -License: +This package was debianized by Clément Stenac on +Tue, 1 Feb 2005 08:48:37 +0100. + +It was downloaded from http://www.bunkus.org/videotools/mkvtoolnix/ + +Upstream Author: Moritz Bunkus + +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 + Copyright (C) Thomas Östreich - June 2001 + (c)94 UP-Vision Computergrafik for c't + Copyright (C) 1999 Rainer Johanni + Copyright (C) Lukas Hejtmanek - January 2004 This software is licensed under the GNU General Public Licence. On Debian systems, this license can be found in /usr/share/common-licenses diff --git a/debian-upstream/dirs b/debian-upstream/dirs deleted file mode 100644 index e77248175..000000000 --- a/debian-upstream/dirs +++ /dev/null @@ -1 +0,0 @@ -usr/bin diff --git a/debian-upstream/mkvtoolnix-gui.desktop b/debian-upstream/mkvtoolnix-gui.desktop new file mode 100644 index 000000000..51f386a60 --- /dev/null +++ b/debian-upstream/mkvtoolnix-gui.desktop @@ -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 diff --git a/debian-upstream/mkvtoolnix-gui.install b/debian-upstream/mkvtoolnix-gui.install index 215bcdd1f..d07589c95 100644 --- a/debian-upstream/mkvtoolnix-gui.install +++ b/debian-upstream/mkvtoolnix-gui.install @@ -4,8 +4,3 @@ share/desktop/*.desktop /usr/share/applications share/mime/*.xml /usr/share/mime/packages share/icons/32x32/* /usr/share/icons/hicolor/32x32/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 - diff --git a/debian-upstream/mkvtoolnix-gui.manpages b/debian-upstream/mkvtoolnix-gui.manpages new file mode 100644 index 000000000..37c713eb0 --- /dev/null +++ b/debian-upstream/mkvtoolnix-gui.manpages @@ -0,0 +1 @@ +doc/man/mmg.1 diff --git a/debian-upstream/mkvtoolnix-gui.menu b/debian-upstream/mkvtoolnix-gui.menu index 028c5b580..81b9eb638 100644 --- a/debian-upstream/mkvtoolnix-gui.menu +++ b/debian-upstream/mkvtoolnix-gui.menu @@ -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" diff --git a/debian-upstream/mkvtoolnix-gui.prerm b/debian-upstream/mkvtoolnix-gui.prerm index 99ec2c967..c80445292 100644 --- a/debian-upstream/mkvtoolnix-gui.prerm +++ b/debian-upstream/mkvtoolnix-gui.prerm @@ -8,4 +8,3 @@ set -e #DEBHELPER# exit 0 - diff --git a/debian-upstream/mkvtoolnix.examples b/debian-upstream/mkvtoolnix.examples index 09464e640..e39721e20 100644 --- a/debian-upstream/mkvtoolnix.examples +++ b/debian-upstream/mkvtoolnix.examples @@ -1,10 +1 @@ -examples/example-chapters-1.xml -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 +examples/* diff --git a/debian-upstream/mkvtoolnix.install b/debian-upstream/mkvtoolnix.install index 07ca66244..c9b360f6e 100644 --- a/debian-upstream/mkvtoolnix.install +++ b/debian-upstream/mkvtoolnix.install @@ -1,15 +1,7 @@ -debian/tmp/bin/mkvmerge /usr/bin -debian/tmp/bin/mkvinfo /usr/bin -debian/tmp/bin/mkvextract /usr/bin -debian/tmp/bin/mkvpropedit /usr/bin -debian/tmp/share/locale/de/LC_MESSAGES/mkvtoolnix.mo /usr/share/locale/de/LC_MESSAGES -debian/tmp/share/locale/es/LC_MESSAGES/mkvtoolnix.mo /usr/share/locale/es/LC_MESSAGES -debian/tmp/share/locale/fr/LC_MESSAGES/mkvtoolnix.mo /usr/share/locale/fr/LC_MESSAGES -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 +usr/bin/mkvmerge +usr/bin/mkvinfo +usr/bin/mkvextract +usr/bin/mkvpropedit +usr/share/man +usr/share/locale +usr/share/doc/mkvtoolnix diff --git a/debian-upstream/mkvtoolnix.links b/debian-upstream/mkvtoolnix.links new file mode 100644 index 000000000..ff15c344c --- /dev/null +++ b/debian-upstream/mkvtoolnix.links @@ -0,0 +1 @@ +/usr/share/doc/quilt/README.source /usr/share/doc/mkvtoolnix/README.source diff --git a/debian-upstream/mkvtoolnix.menu b/debian-upstream/mkvtoolnix.menu deleted file mode 100644 index 278ed65bd..000000000 --- a/debian-upstream/mkvtoolnix.menu +++ /dev/null @@ -1,4 +0,0 @@ -?package(mkvtoolnix):needs="x11" \ - section="Apps/Graphics" \ - title="mkvtoolnix GUI" \ - command="/usr/bin/mmg" diff --git a/debian-upstream/mkvtoolnix.prerm b/debian-upstream/mkvtoolnix.prerm index f6af456cf..3041a6faa 100644 --- a/debian-upstream/mkvtoolnix.prerm +++ b/debian-upstream/mkvtoolnix.prerm @@ -8,4 +8,3 @@ set -e #DEBHELPER# exit 0 - diff --git a/debian-upstream/rules b/debian-upstream/rules index a1fd67f1a..40642d777 100755 --- a/debian-upstream/rules +++ b/debian-upstream/rules @@ -1,107 +1,56 @@ #!/usr/bin/make -f -# Rules for mkvtoolnix based on Joey Hess's sample -#################################################################### -# Build flags -#################################################################### -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +LDFLAGS += -Wl,-z,defs -Wl,--as-needed -CFLAGS = -Wall -g +NCPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1) -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 +ifeq ($(NCPUS),-1) + NCPUS:=1 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 $@ -####################################################################### -# 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 +override_dh_auto_configure: ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config.sub endif ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif - rm -f config.log - rm -f config.status + dh_auto_configure -- --enable-gui - dh_clean + ./drake -j $(NCPUS) -install: build - dh_testdir - dh_testroot - dh_clean -k + mv src/mkvinfo src/mkvinfo-gui + mv src/mmg/mmg src/mmg/mmg-gui - $(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 -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs ChangeLog - dh_installdocs -a - dh_installexamples +override_dh_install: + ./drake install DESTDIR=$(CURDIR)/debian/tmp + dh_install --fail-missing - dh_install -a 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 - 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-gui usr/share/man/man1/mkvinfo.1.gz usr/share/man/man1/mkvinfo-gui.1.gz - dh_strip - dh_compress - 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 +override_dh_builddeb: + dh_builddeb -- -Zbzip2 diff --git a/debian-upstream/source/format b/debian-upstream/source/format new file mode 100644 index 000000000..163aaf8d8 --- /dev/null +++ b/debian-upstream/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian-upstream/watch b/debian-upstream/watch new file mode 100644 index 000000000..48851a9f8 --- /dev/null +++ b/debian-upstream/watch @@ -0,0 +1,2 @@ +version=3 +http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-(.*)\.tar\.bz2