[SCM] laditools/master: Drop all patches, adopted upstream.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Sat Mar 24 08:55:06 UTC 2012
The following commit has been merged in the master branch:
commit 6cdf8f5ebf72ccd688a99b0161c384be63449691
Author: Alessio Treglia <alessio at debian.org>
Date: Wed Mar 7 08:53:52 2012 +0100
Drop all patches, adopted upstream.
diff --git a/debian/patches/1001-desktop_files.patch b/debian/patches/1001-desktop_files.patch
deleted file mode 100644
index 7794271..0000000
--- a/debian/patches/1001-desktop_files.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Fix desktop files as per spec.
-Author: Alessio Treglia <alessio at debian.org>
-Forwarded: no
----
- data/ladiconf.desktop | 1 -
- data/laditray.desktop | 3 +--
- 2 files changed, 1 insertion(+), 3 deletions(-)
-
---- laditools.orig/data/ladiconf.desktop
-+++ laditools/data/ladiconf.desktop
-@@ -1,5 +1,4 @@
- [Desktop Entry]
--Encoding=UTF-8
- Name=Linux Audio Configuration
- Type=Application
- Comment=JACK and LASH control application configuration
---- laditools.orig/data/laditray.desktop
-+++ laditools/data/laditray.desktop
-@@ -1,10 +1,9 @@
- [Desktop Entry]
--Encoding=UTF-8
- Name=LADITray
- Type=Application
- Comment=JACK and LASH control tray application
- Terminal=false
- Exec=laditray
- Icon=laditray
--Categories=GTK;Application;AudioVideo
-+Categories=GTK;AudioVideo;
- GenericName=LADI Trayicon
diff --git a/debian/patches/1002-libglade_to_gtkbuilder.patch b/debian/patches/1002-libglade_to_gtkbuilder.patch
deleted file mode 100644
index 89562b1..0000000
--- a/debian/patches/1002-libglade_to_gtkbuilder.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-Subject: libglade -> gtkbuilder transition.
-Author: Alessio Treglia <alessio at debian.org>
-Forwarded: Marc-Olivier Barre <marco at marcochapeau.org>
- Nedko Arnaudov <nedko at arnaudov.name>
----
- data/ladilog_ui.ui | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++++
- ladilog | 10 ++---
- setup.py | 2 -
- 3 files changed, 98 insertions(+), 6 deletions(-)
-
---- laditools.orig/ladilog
-+++ laditools/ladilog
-@@ -31,7 +31,6 @@ try:
- import pygtk
- pygtk.require ('2.0')
- import gtk
-- import gtk.glade
- import vte
- import laditools
- except Exception, e:
-@@ -65,7 +64,7 @@ def read_last(lfile, lines):
- lfile.seek(endpos, 0)
- return backlog
-
--class ladilog (gtk.glade.XML):
-+class ladilog(object):
- def __init__ (self):
- self.log_files = [
- {
-@@ -111,20 +110,21 @@ class ladilog (gtk.glade.XML):
- max_lines_text = self.param_dict['max_lines']
- self.max_lines = int (max_lines_text)
- # Load the glade file
-- gtk.glade.XML.__init__(self, laditools.find_data_file("ladilog_ui.glade"))
-+ builder = gtk.Builder()
-+ builder.add_from_file(laditools.find_data_file("ladilog_ui.ui"))
- # Get the ui ready for action
- self.event_dict = {"on_ladilog_ui_destroy" : self.on_quit,
- "on_close_button_clicked" : self.on_quit,
- "on_clear_button_clicked" : self.on_clear_text,
- "on_purge_button_clicked" : self.on_purge}
-- self.signal_autoconnect (self.event_dict)
-+ builder.connect_signals(self.event_dict)
-
- # Create our terminal and display it
- for log in self.log_files:
- log['term'] = vte.Terminal ()
- log["tab_label"] = gtk.Label (log["name"])
-
-- self.logview_notebook = self.get_widget ("ladilog_notebook")
-+ self.logview_notebook = builder.get_object ("ladilog_notebook")
-
- for log in self.log_files:
- log['term'].show ()
---- /dev/null
-+++ laditools/data/ladilog_ui.ui
-@@ -0,0 +1,92 @@
-+<?xml version="1.0"?>
-+<!--Generated with glade3 3.4.0 on Tue Aug 5 23:08:01 2008 -->
-+<interface>
-+ <object class="GtkWindow" id="ladilog_ui">
-+ <property name="visible">True</property>
-+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-+ <property name="title" translatable="yes">LADI - Log viewer</property>
-+ <property name="icon">laditools_logo.svg</property>
-+ <signal handler="on_ladilog_ui_destroy" name="destroy"/>
-+ <child>
-+ <object class="GtkVBox" id="ladilog_vbox">
-+ <property name="visible">True</property>
-+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-+ <child>
-+ <object class="GtkImage" id="laditools_logo">
-+ <property name="visible">True</property>
-+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-+ <property name="pixbuf">laditools_logo.svg</property>
-+ </object>
-+ <packing>
-+ <property name="expand">False</property>
-+ <property name="fill">False</property>
-+ <property name="padding">5</property>
-+ </packing>
-+ </child>
-+ <child>
-+ <object class="GtkNotebook" id="ladilog_notebook">
-+ <property name="visible">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-+ </object>
-+ <packing>
-+ <property name="position">1</property>
-+ </packing>
-+ </child>
-+ <child>
-+ <object class="GtkHBox" id="button_hbox">
-+ <property name="visible">True</property>
-+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-+ <property name="border_width">10</property>
-+ <child>
-+ <object class="GtkButton" id="clear_button">
-+ <property name="visible">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="receives_default">True</property>
-+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-+ <property name="label" translatable="yes">Clear</property>
-+ <signal handler="on_clear_button_clicked" name="clicked"/>
-+ </object>
-+ <packing>
-+ <property name="fill">False</property>
-+ </packing>
-+ </child>
-+ <child>
-+ <object class="GtkButton" id="purge_button">
-+ <property name="visible">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="receives_default">True</property>
-+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-+ <property name="label" translatable="yes">Purge logs</property>
-+ <signal handler="on_purge_button_clicked" name="clicked"/>
-+ </object>
-+ <packing>
-+ <property name="fill">False</property>
-+ <property name="position">1</property>
-+ </packing>
-+ </child>
-+ <child>
-+ <object class="GtkButton" id="close_button">
-+ <property name="visible">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="receives_default">True</property>
-+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-+ <property name="label" translatable="yes">Close</property>
-+ <signal handler="on_close_button_clicked" name="clicked"/>
-+ </object>
-+ <packing>
-+ <property name="fill">False</property>
-+ <property name="position">2</property>
-+ </packing>
-+ </child>
-+ </object>
-+ <packing>
-+ <property name="expand">False</property>
-+ <property name="fill">False</property>
-+ <property name="position">2</property>
-+ </packing>
-+ </child>
-+ </object>
-+ </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'])]
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index ce82ff8..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-1001-desktop_files.patch
-1002-libglade_to_gtkbuilder.patch
--
laditools packaging
More information about the pkg-multimedia-commits
mailing list