Package: mkvtoolnix
Version: 5.8.0-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch

Dear Maintainer,

*** /tmp/tmpMzWkD9/bug_body

In Ubuntu, the attached patch was applied to achieve the following:

  * debian/control:
   - Add a Replaces for mkvtoolnix (LP: #848252)
  * debian/patches:
   - Apply rename-text-exec-desktop.patch
  * debian/mkvtoolnix-gui.install:
   - Add icons in GUI packet (LP: #939582).

rename-text-exec-desktop.patch replace the executable name by the one use in 
the packaging.

Changes to debian/mkvtoolnix-gui.install install some icons to appears in the 
menu and context menu.

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers quantal-updates
  APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 
'quantal-proposed'), (500, 'quantal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.5.0-17-generic (SMP w/8 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru mkvtoolnix-5.8.0/debian/changelog mkvtoolnix-5.8.0/debian/changelog
diff -Nru mkvtoolnix-5.8.0/debian/control mkvtoolnix-5.8.0/debian/control
--- mkvtoolnix-5.8.0/debian/control	2012-04-07 16:59:48.000000000 +0200
+++ mkvtoolnix-5.8.0/debian/control	2012-11-23 23:55:31.000000000 +0100
@@ -14,6 +14,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: mkvtoolnix-gui
+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.
diff -Nru mkvtoolnix-5.8.0/debian/mkvtoolnix-gui.install mkvtoolnix-5.8.0/debian/mkvtoolnix-gui.install
--- mkvtoolnix-5.8.0/debian/mkvtoolnix-gui.install	2011-11-29 14:27:33.000000000 +0100
+++ mkvtoolnix-5.8.0/debian/mkvtoolnix-gui.install	2012-11-23 20:40:12.000000000 +0100
@@ -3,3 +3,5 @@
 share/desktop/mkvmergeGUI.desktop	usr/share/applications
 share/desktop/mkvinfo.desktop		usr/share/applications
 usr/share/doc/mkvtoolnix-gui
+share/icons/64x64/mkvinfo.png usr/share/pixmaps
+share/icons/64x64/mkvmergeGUI.png usr/share/pixmaps
diff -Nru mkvtoolnix-5.8.0/debian/patches/rename-text-exec-desktop.patch mkvtoolnix-5.8.0/debian/patches/rename-text-exec-desktop.patch
--- mkvtoolnix-5.8.0/debian/patches/rename-text-exec-desktop.patch	1970-01-01 01:00:00.000000000 +0100
+++ mkvtoolnix-5.8.0/debian/patches/rename-text-exec-desktop.patch	2012-11-18 10:52:41.000000000 +0100
@@ -0,0 +1,18 @@
+# Rename the executable to follow the packaging
+---
+# share/desktop/mkvinfo.desktop |    2 +-
+# 1 file changed, 1 insertion(+), 1 deletion(-)
+#
+Index: mkvtoolnix-5.1.0/share/desktop/mkvinfo.desktop
+===================================================================
+--- mkvtoolnix-5.1.0.orig/share/desktop/mkvinfo.desktop	2011-11-28 23:51:07.000000000 +0100
++++ mkvtoolnix-5.1.0/share/desktop/mkvinfo.desktop	2012-02-01 12:21:25.123819571 +0100
+@@ -7,7 +7,7 @@
+ GenericName[zh_CN]=显示 MKV 文件的信息
+ GenericName[zh_TW]=顯示 MKV 檔資訊
+ Icon=mkvinfo
+-Exec=mkvinfo -g
++Exec=mkvinfo-text -g
+ Terminal=false
+ MimeType=video/x-matroska;audio/x-matroska;
+ Categories=AudioVideo;AudioVideoEditing;
diff -Nru mkvtoolnix-5.8.0/debian/patches/series mkvtoolnix-5.8.0/debian/patches/series
--- mkvtoolnix-5.8.0/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ mkvtoolnix-5.8.0/debian/patches/series	2012-11-18 10:52:41.000000000 +0100
@@ -0,0 +1 @@
+rename-text-exec-desktop.patch

Reply via email to