Hi, I have made these changes to the package:
* debian/mkvtoolnix-gui.desktop:
- Remove deprecated value "Application" from Categories.
- Remove deprecated Encoding key.
- Remove extension from icon file name.
* debian/control: Break and sort Build-Depends entry.
* Switch to debhelper from deprecated version 4 to 7 to make lintian
happy:
- debian/control: Bump Build-Depends version of debhelper to 7.
- debian/compat: Bump to 7.
- debian/rules:
- Replace dh_clean -k by dh_prep.
- *-stamp files are now removed by dh_clean.
* Add .patch suffix to patch files.
* debian/rules: Remove automatically generated hidden directories and
Makefiles.
You can find the updated package on mentors.debian.net. Attached the
debdiff for the changes to the previous package on mentors.debian.net. I
have moved "Non-maintainer upload." to the top of the changelog entry to
make lintian happy. When we have to change the debhelper version (v4 is
deprecated) then we can switch directly to version 7.
Cheers,
Benjamin
diff -u mkvtoolnix-2.6.0/debian/compat mkvtoolnix-2.6.0/debian/compat --- mkvtoolnix-2.6.0/debian/compat +++ mkvtoolnix-2.6.0/debian/compat @@ -1 +1 @@ -5 +7 diff -u mkvtoolnix-2.6.0/debian/rules mkvtoolnix-2.6.0/debian/rules --- mkvtoolnix-2.6.0/debian/rules +++ mkvtoolnix-2.6.0/debian/rules @@ -46,7 +46,6 @@ clean: dh_testdir dh_testroot - rm -f build-stamp rm -f src/mkvinfo-gui rm -f src/mmg/mmg-gui @@ -63,11 +62,13 @@ QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2 dh_clean + rm -rf .deps .pc + find -name Makefile -delete install: build dh_testdir dh_testroot - dh_clean -k + dh_prep $(MAKE) install prefix=$(CURDIR)/debian/tmp @@ -86,7 +87,7 @@ dh_installmenu -pmkvtoolnix-gui dh_installman dh_desktop -pmkvtoolnix-gui - + 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 diff -u mkvtoolnix-2.6.0/debian/control mkvtoolnix-2.6.0/debian/control --- mkvtoolnix-2.6.0/debian/control +++ mkvtoolnix-2.6.0/debian/control @@ -2,8 +2,23 @@ Section: graphics Priority: optional Maintainer: Clément Stenac <zorg...@debian.org> -Build-Depends: debhelper (>= 5.0.0) , libogg-dev, libvorbis-dev, zlib1g-dev, libwxgtk2.8-dev, libflac-dev, libexpat1-dev, libbz2-dev, liblzo2-dev, libebml-dev (>= 0.7.7), libmatroska-dev (>= 0.7.7), quilt, libmagic-dev, libpcre3-dev, libboost-dev, libboost-regex-dev -Standards-Version: 3.8.0 +Build-Depends: debhelper (>= 7), + libboost-dev, + libboost-regex-dev, + libbz2-dev, + libebml-dev (>= 0.7.7), + libexpat1-dev, + libflac-dev, + libmagic-dev, + libmatroska-dev (>= 0.7.7), + libogg-dev, + libpcre3-dev, + libvorbis-dev, + libwxgtk2.8-dev, + liblzo2-dev, + quilt, + zlib1g-dev +Standards-Version: 3.8.1 Homepage: http://www.bunkus.org/videotools/mkvtoolnix/ Package: mkvtoolnix diff -u mkvtoolnix-2.6.0/debian/changelog mkvtoolnix-2.6.0/debian/changelog --- mkvtoolnix-2.6.0/debian/changelog +++ mkvtoolnix-2.6.0/debian/changelog @@ -1,24 +1,22 @@ mkvtoolnix (2.6.0-0.1) unstable; urgency=low + * Non-maintainer upload. + [ Josh Triplett ] * New upstream version 2.6.0 (Closes: #503261) * Handles newer revisions of Theora. (Closes: #458024) * Requires libboost-dev and libboost-regex-dev; add them to Build-Depends. * Incorporates patches/20-honor-strip and patches/30-mplayer-options; patches removed. - * Incorporates part of patches/40-gcc-4.3; patch updated. + * Incorporates part of patches/40-gcc-4.3.patch; patch updated. * Remove base64tool, removed upstream. [ Julien Lavergne ] - * Non-maintainer upload. - * Rebuild for API changes + * Rebuild for API changes - (Closes: #426656, #437144, #471049, #476879, #481851, #483440) * debian/control - Conform to Standards 3.8.1. - Replace libwxgtk2.6-dev Build Depends by libwxgtk2.8-dev. - - Bump debhelper to >= 5.0.0. - * debian/compat - - Bump to 5. * debian/README.source - Add to conform to Standards 3.8.1. * mkvtoolnix.links @@ -31,13 +29,29 @@ - Switch from Apps to Applications. * debian/rules - Don't ignore errors in clean rule. - * debian/patches: + * debian/patches: - Add descriptions. - - 10-manpage-error: Update. + - 10-manpage-error.patch: Update. * debian/watch: - Update to version 3. - -- Julien Lavergne <julien.laver...@gmail.com> Mon, 06 Apr 2009 20:22:41 +0200 + [ Benjamin Drung ] + * debian/mkvtoolnix-gui.desktop: + - Remove deprecated value "Application" from Categories. + - Remove deprecated Encoding key. + - Remove extension from icon file name. + * debian/control: Break and sort Build-Depends entry. + * Switch to debhelper from deprecated version 4 to 7 to make lintian happy: + - debian/control: Bump Build-Depends version of debhelper to 7. + - debian/compat: Bump to 7. + - debian/rules: + - Replace dh_clean -k by dh_prep. + - *-stamp files are now removed by dh_clean. + * Add .patch suffix to patch files. + * debian/rules: Remove automatically generated hidden directories and + Makefiles. + + -- Benjamin Drung <benjamin.dr...@gmail.com> Sat, 11 Apr 2009 14:35:00 +0200 mkvtoolnix (2.0.2-1.1) unstable; urgency=medium diff -u mkvtoolnix-2.6.0/debian/mkvtoolnix-gui.desktop mkvtoolnix-2.6.0/debian/mkvtoolnix-gui.desktop --- mkvtoolnix-2.6.0/debian/mkvtoolnix-gui.desktop +++ mkvtoolnix-2.6.0/debian/mkvtoolnix-gui.desktop @@ -2,8 +2,7 @@ -Encoding=UTF-8 Name=MKV files creator Name[fr]=Créateur de fichiers MKV Exec=mmg Terminal=false Type=Application -Categories=GNOME;Application;AudioVideo; -Icon=matroskalogo.xpm +Categories=GNOME;AudioVideo; +Icon=matroskalogo diff -u mkvtoolnix-2.6.0/debian/patches/series mkvtoolnix-2.6.0/debian/patches/series --- mkvtoolnix-2.6.0/debian/patches/series +++ mkvtoolnix-2.6.0/debian/patches/series @@ -1,2 +1,2 @@ -10-manpage-error -40-gcc-4.3 +10-manpage-error.patch +40-gcc-4.3.patch reverted: --- mkvtoolnix-2.6.0/debian/patches/40-gcc-4.3 +++ mkvtoolnix-2.6.0.orig/debian/patches/40-gcc-4.3 @@ -1,26 +0,0 @@ -#Description : Fix FTBFS with gcc 4.3 by adding missing #include -Index: mkvtoolnix-2.4.1-repack1/src/common/random.h -=================================================================== ---- mkvtoolnix-2.4.1-repack1.orig/src/common/random.h 2008-12-06 20:38:20.000000000 +0100 -+++ mkvtoolnix-2.4.1-repack1/src/common/random.h 2008-12-06 20:49:05.000000000 +0100 -@@ -18,6 +18,8 @@ - - #include "os.h" - -+#include <memory> /* auto_ptr */ -+ - #include "mm_io.h" - #include "smart_pointers.h" - -Index: mkvtoolnix-2.4.1-repack1/src/common/xml_element_writer.h -=================================================================== ---- mkvtoolnix-2.4.1-repack1.orig/src/common/xml_element_writer.h 2008-12-06 20:38:20.000000000 +0100 -+++ mkvtoolnix-2.4.1-repack1/src/common/xml_element_writer.h 2008-12-06 20:49:05.000000000 +0100 -@@ -19,6 +19,7 @@ - #include "os.h" - - #include <expat.h> -+#include <memory> /* auto_ptr */ - - #include "mm_io.h" - #include "xml_element_parser.h" reverted: --- mkvtoolnix-2.6.0/debian/patches/10-manpage-error +++ mkvtoolnix-2.6.0.orig/debian/patches/10-manpage-error @@ -1,55 +0,0 @@ -#Fixing errors in manpages -Index: mkvtoolnix-2.4.1-repack1/doc/mkvmerge.1 -=================================================================== ---- mkvtoolnix-2.4.1-repack1.orig/doc/mkvmerge.1 2008-12-06 22:23:12.000000000 +0100 -+++ mkvtoolnix-2.4.1-repack1/doc/mkvmerge.1 2008-12-06 22:53:43.000000000 +0100 -@@ -218,8 +218,8 @@ - MIME type of the following attachment. Applies to the next - \fB\-\-attach\-file\fR or \fB\-\-attach\-file\-once\fR command. - A list of officially recognized MIME types can be found e.g. at --.UR http://www.iana.org/\:assignments/\:media-types/ --.UE -+.UR http://www.iana.org/\:assignments/\:media-types/ -+ - The MIME type is mandatory for an attachment. - .TP - \fB\-\-attachment\-name\fR <\fIname\fR> -@@ -1133,8 +1133,8 @@ - .br - All following lines contain three numbers separated by commas: the - start frame (0 is the first frame), the end frame and the number of --frames in this range. The FPS is a floating point number with the dot --'.' as the decimal point. The ranges can contain gaps for which the -+frames in this range. The FPS is a floating point number with the dot '.' -+ as the decimal point. The ranges can contain gaps for which the - default FPS is used. Example: - .br - \fB800,1000,25\fR -@@ -1289,3 +1289,2 @@ - The newest version can always be found at - .UR http://www.bunkus.org/\:videotools/\:mkvtoolnix/ --.UE -Index: mkvtoolnix-2.4.1-repack1/doc/mkvextract.1 -=================================================================== ---- mkvtoolnix-2.4.1-repack1.orig/doc/mkvextract.1 2008-12-06 22:23:12.000000000 +0100 -+++ mkvtoolnix-2.4.1-repack1/doc/mkvextract.1 2008-12-06 22:52:40.000000000 +0100 -@@ -296,3 +296,2 @@ - The newest version can always be found at - .UR http://www.bunkus.org/\:videotools/\:mkvtoolnix/ --.UE -Index: mkvtoolnix-2.4.1-repack1/doc/mkvinfo.1 -=================================================================== ---- mkvtoolnix-2.4.1-repack1.orig/doc/mkvinfo.1 2008-12-06 22:23:12.000000000 +0100 -+++ mkvtoolnix-2.4.1-repack1/doc/mkvinfo.1 2008-12-06 22:52:40.000000000 +0100 -@@ -87,3 +87,2 @@ - The newest version can always be found at - .UR http://www.bunkus.org/\:videotools/\:mkvtoolnix/ --.UE -Index: mkvtoolnix-2.4.1-repack1/doc/mmg.1 -=================================================================== ---- mkvtoolnix-2.4.1-repack1.orig/doc/mmg.1 2008-12-06 22:23:12.000000000 +0100 -+++ mkvtoolnix-2.4.1-repack1/doc/mmg.1 2008-12-06 22:52:40.000000000 +0100 -@@ -48,3 +48,2 @@ - The newest version can always be found at - .UR http://www.bunkus.org/\:videotools/\:mkvtoolnix/ --.UE only in patch2: unchanged: --- mkvtoolnix-2.6.0.orig/debian/patches/10-manpage-error.patch +++ mkvtoolnix-2.6.0/debian/patches/10-manpage-error.patch @@ -0,0 +1,55 @@ +#Fixing errors in manpages +Index: mkvtoolnix-2.4.1-repack1/doc/mkvmerge.1 +=================================================================== +--- mkvtoolnix-2.4.1-repack1.orig/doc/mkvmerge.1 2008-12-06 22:23:12.000000000 +0100 ++++ mkvtoolnix-2.4.1-repack1/doc/mkvmerge.1 2008-12-06 22:53:43.000000000 +0100 +@@ -218,8 +218,8 @@ + MIME type of the following attachment. Applies to the next + \fB\-\-attach\-file\fR or \fB\-\-attach\-file\-once\fR command. + A list of officially recognized MIME types can be found e.g. at +-.UR http://www.iana.org/\:assignments/\:media-types/ +-.UE ++.UR http://www.iana.org/\:assignments/\:media-types/ ++ + The MIME type is mandatory for an attachment. + .TP + \fB\-\-attachment\-name\fR <\fIname\fR> +@@ -1133,8 +1133,8 @@ + .br + All following lines contain three numbers separated by commas: the + start frame (0 is the first frame), the end frame and the number of +-frames in this range. The FPS is a floating point number with the dot +-'.' as the decimal point. The ranges can contain gaps for which the ++frames in this range. The FPS is a floating point number with the dot '.' ++ as the decimal point. The ranges can contain gaps for which the + default FPS is used. Example: + .br + \fB800,1000,25\fR +@@ -1289,3 +1289,2 @@ + The newest version can always be found at + .UR http://www.bunkus.org/\:videotools/\:mkvtoolnix/ +-.UE +Index: mkvtoolnix-2.4.1-repack1/doc/mkvextract.1 +=================================================================== +--- mkvtoolnix-2.4.1-repack1.orig/doc/mkvextract.1 2008-12-06 22:23:12.000000000 +0100 ++++ mkvtoolnix-2.4.1-repack1/doc/mkvextract.1 2008-12-06 22:52:40.000000000 +0100 +@@ -296,3 +296,2 @@ + The newest version can always be found at + .UR http://www.bunkus.org/\:videotools/\:mkvtoolnix/ +-.UE +Index: mkvtoolnix-2.4.1-repack1/doc/mkvinfo.1 +=================================================================== +--- mkvtoolnix-2.4.1-repack1.orig/doc/mkvinfo.1 2008-12-06 22:23:12.000000000 +0100 ++++ mkvtoolnix-2.4.1-repack1/doc/mkvinfo.1 2008-12-06 22:52:40.000000000 +0100 +@@ -87,3 +87,2 @@ + The newest version can always be found at + .UR http://www.bunkus.org/\:videotools/\:mkvtoolnix/ +-.UE +Index: mkvtoolnix-2.4.1-repack1/doc/mmg.1 +=================================================================== +--- mkvtoolnix-2.4.1-repack1.orig/doc/mmg.1 2008-12-06 22:23:12.000000000 +0100 ++++ mkvtoolnix-2.4.1-repack1/doc/mmg.1 2008-12-06 22:52:40.000000000 +0100 +@@ -48,3 +48,2 @@ + The newest version can always be found at + .UR http://www.bunkus.org/\:videotools/\:mkvtoolnix/ +-.UE only in patch2: unchanged: --- mkvtoolnix-2.6.0.orig/debian/patches/40-gcc-4.3.patch +++ mkvtoolnix-2.6.0/debian/patches/40-gcc-4.3.patch @@ -0,0 +1,26 @@ +#Description : Fix FTBFS with gcc 4.3 by adding missing #include +Index: mkvtoolnix-2.4.1-repack1/src/common/random.h +=================================================================== +--- mkvtoolnix-2.4.1-repack1.orig/src/common/random.h 2008-12-06 20:38:20.000000000 +0100 ++++ mkvtoolnix-2.4.1-repack1/src/common/random.h 2008-12-06 20:49:05.000000000 +0100 +@@ -18,6 +18,8 @@ + + #include "os.h" + ++#include <memory> /* auto_ptr */ ++ + #include "mm_io.h" + #include "smart_pointers.h" + +Index: mkvtoolnix-2.4.1-repack1/src/common/xml_element_writer.h +=================================================================== +--- mkvtoolnix-2.4.1-repack1.orig/src/common/xml_element_writer.h 2008-12-06 20:38:20.000000000 +0100 ++++ mkvtoolnix-2.4.1-repack1/src/common/xml_element_writer.h 2008-12-06 20:49:05.000000000 +0100 +@@ -19,6 +19,7 @@ + #include "os.h" + + #include <expat.h> ++#include <memory> /* auto_ptr */ + + #include "mm_io.h" + #include "xml_element_parser.h"
signature.asc
Description: Dies ist ein digital signierter Nachrichtenteil
