[SCM] laditools/master: Install ladilog_ui.ui instead of ladilog_ui.glade.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Fri Apr 22 12:07:09 UTC 2011


The following commit has been merged in the master branch:
commit 676d583ec92ef2cae100bf11bf10eebb2317bab9
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Apr 22 14:06:16 2011 +0200

    Install ladilog_ui.ui instead of ladilog_ui.glade.

diff --git a/debian/patches/1002-libglade_to_gtkbuilder.patch b/debian/patches/1002-libglade_to_gtkbuilder.patch
index 87500f8..01521c9 100644
--- a/debian/patches/1002-libglade_to_gtkbuilder.patch
+++ b/debian/patches/1002-libglade_to_gtkbuilder.patch
@@ -4,7 +4,8 @@ Forwarded: no
 ---
  data/ladilog_ui.ui |   92 +++++++++++++++++++++++++++++++++++++++++++++++++++++
  ladilog            |   10 ++---
- 2 files changed, 97 insertions(+), 5 deletions(-)
+ setup.py           |    2 -
+ 3 files changed, 98 insertions(+), 6 deletions(-)
 
 --- laditools.orig/ladilog
 +++ laditools/ladilog
@@ -145,3 +146,14 @@ Forwarded: no
 +    </child>
 +  </object>
 +</interface>
+--- laditools.orig/setup.py
++++ laditools/setup.py
+@@ -34,7 +34,7 @@ setup(name='laditools',
+ 	('share/applications', ['data/laditray.desktop']),
+ 	('share/applications', ['data/ladiconf.desktop']),
+         ('share/laditools/data', ['data/laditools_logo.svg',
+-        'data/ladilog_ui.glade',
++        'data/ladilog_ui.ui',
+         'data/started.svg',
+         'data/starting.svg',
+         'data/stopped.svg'])]

-- 
laditools packaging



More information about the pkg-multimedia-commits mailing list