[Pkg-xfce-commits] r7251 - in desktop/branches/experimental/mousepad/debian: . patches
Yves-Alexis Perez
corsac at alioth.debian.org
Sun Dec 30 02:41:12 UTC 2012
Author: corsac
Date: 2012-12-30 14:41:12 +0000 (Sun, 30 Dec 2012)
New Revision: 7251
Removed:
desktop/branches/experimental/mousepad/debian/patches/00_resensitize-find-button.patch
desktop/branches/experimental/mousepad/debian/patches/01_fix-first-replace.patch
desktop/branches/experimental/mousepad/debian/patches/02_fix-typos-in-test.patch
desktop/branches/experimental/mousepad/debian/patches/series
Modified:
desktop/branches/experimental/mousepad/debian/changelog
desktop/branches/experimental/mousepad/debian/control
Log:
* debian/patches:
- 02_fix-typos-in-test, 01_fix-first-replace,
00_resensitize-find-button dropped, included upstream.
* debian/control:
- drop build-dep on libxfcegui4-dev.
- add build-dep on libgtksourceview2.0-dev and libdbus-glib-1-dev.
Modified: desktop/branches/experimental/mousepad/debian/changelog
===================================================================
--- desktop/branches/experimental/mousepad/debian/changelog 2012-12-30 13:48:55 UTC (rev 7250)
+++ desktop/branches/experimental/mousepad/debian/changelog 2012-12-30 14:41:12 UTC (rev 7251)
@@ -1,6 +1,12 @@
mousepad (0.3.0-1) UNRELEASED; urgency=low
* New upstream release.
+ * debian/patches:
+ - 02_fix-typos-in-test, 01_fix-first-replace,
+ 00_resensitize-find-button dropped, included upstream.
+ * debian/control:
+ - drop build-dep on libxfcegui4-dev.
+ - add build-dep on libgtksourceview2.0-dev and libdbus-glib-1-dev.
-- Yves-Alexis Perez <corsac at debian.org> Sun, 30 Dec 2012 14:48:40 +0100
Modified: desktop/branches/experimental/mousepad/debian/control
===================================================================
--- desktop/branches/experimental/mousepad/debian/control 2012-12-30 13:48:55 UTC (rev 7250)
+++ desktop/branches/experimental/mousepad/debian/control 2012-12-30 14:41:12 UTC (rev 7251)
@@ -5,8 +5,8 @@
Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
Yves-Alexis Perez <corsac at debian.org>
Build-Depends: debhelper (>= 7.0.50~),
- libxfcegui4-dev (>= 4.6.0), pkg-config, libxml-parser-perl, intltool,
- hardening-includes
+ pkg-config, libxml-parser-perl, intltool,
+ hardening-includes, libgtksourceview2.0-dev, libdbus-glib-1-dev
Standards-Version: 3.9.3
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/mousepad/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/mousepad/
Deleted: desktop/branches/experimental/mousepad/debian/patches/00_resensitize-find-button.patch
===================================================================
--- desktop/branches/experimental/mousepad/debian/patches/00_resensitize-find-button.patch 2012-12-30 13:48:55 UTC (rev 7250)
+++ desktop/branches/experimental/mousepad/debian/patches/00_resensitize-find-button.patch 2012-12-30 14:41:12 UTC (rev 7251)
@@ -1,32 +0,0 @@
-Description: Fix find and replace with gtk+ >= 2.18
-Origin: upstream, http://git.xfce.org/apps/mousepad/commit/?id=80819d447df5661ee6c9e9cd22f501cee612da8b
-Bug: https://bugzilla.xfce.org/show_bug.cgi?id=5831
-
---- mousepad-0.2.16.orig/src/search.c
-+++ mousepad-0.2.16/src/search.c
-@@ -210,8 +210,11 @@
- G_CALLBACK(toggle_sensitivity), NULL);
- g_signal_connect(G_OBJECT(entry_find), "delete-text",
- G_CALLBACK(toggle_sensitivity), NULL);
-- if (sd->search.string_find)
-+ if (sd->search.string_find) {
- gtk_entry_set_text(GTK_ENTRY(entry_find), sd->search.string_find);
-+ gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog),
-+ GTK_RESPONSE_OK, TRUE);
-+ }
-
- gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
- gtk_entry_set_activates_default(GTK_ENTRY(entry_find), TRUE);
-@@ -275,8 +278,11 @@
- G_CALLBACK(toggle_sensitivity), NULL);
- g_signal_connect(G_OBJECT(entry_find), "delete-text",
- G_CALLBACK(toggle_sensitivity), NULL);
-- if (sd->search.string_find)
-+ if (sd->search.string_find) {
- gtk_entry_set_text(GTK_ENTRY(entry_find), sd->search.string_find);
-+ gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog),
-+ GTK_RESPONSE_OK, TRUE);
-+ }
- label_replace = gtk_label_new_with_mnemonic(_("Re_place with: "));
- gtk_misc_set_alignment(GTK_MISC(label_replace), 0, 0.5);
- gtk_table_attach_defaults(GTK_TABLE(table), label_replace, 0, 1, 1, 2);
Deleted: desktop/branches/experimental/mousepad/debian/patches/01_fix-first-replace.patch
===================================================================
--- desktop/branches/experimental/mousepad/debian/patches/01_fix-first-replace.patch 2012-12-30 13:48:55 UTC (rev 7250)
+++ desktop/branches/experimental/mousepad/debian/patches/01_fix-first-replace.patch 2012-12-30 14:41:12 UTC (rev 7251)
@@ -1,40 +0,0 @@
-Description: fix Find function
-Origin: upstream, http://git.xfce.org/apps/mousepad/commit/?id=a6383ccf4e3ba425ffb6489a795785e6a626c048
-Bug: https://bugzilla.xfce.org/show_bug.cgi?id=6544
-
-diff -Naur mousepad-svn-r29637/src/search.c mousepad/src/search.c
---- mousepad-svn-r29637/src/search.c 2007-11-16 05:20:21.000000000 +0500
-+++ mousepad/src/search.c 2009-03-01 13:03:38.000000000 +0500
-@@ -78,7 +78,7 @@
- static gint document_replace_real(StructData *sd)
- {
- GtkTextIter iter, match_start, match_end;
-- GtkTextMark *mark_init = NULL;
-+ GtkTextMark *mark_init = NULL, *mark_start, *mark_end;
- gboolean res;
- gint num = 0;
- GtkWidget *q_dialog = NULL;
-@@ -113,6 +113,11 @@
- if (num == 0 && q_dialog == NULL)
- q_dialog = create_dialog_message_question(
- gtk_widget_get_toplevel(sd->mainwin->textview), _("Replace?"));
-+
-+ gtk_text_buffer_get_selection_bounds(textbuffer, &match_start, &match_end);
-+ mark_start = gtk_text_buffer_create_mark(textbuffer, NULL, &match_start, FALSE);
-+ mark_end = gtk_text_buffer_create_mark(textbuffer, NULL, &match_end, FALSE);
-+
- switch (gtk_dialog_run(GTK_DIALOG(q_dialog))) {
- case GTK_RESPONSE_CANCEL:
- res = 0;
-@@ -122,6 +127,11 @@
- case GTK_RESPONSE_NO:
- continue;
- }
-+
-+ gtk_text_buffer_get_iter_at_mark(textbuffer, &match_start, mark_start);
-+ gtk_text_buffer_get_iter_at_mark(textbuffer, &match_end, mark_end);
-+ gtk_text_buffer_move_mark_by_name(textbuffer, "selection_bound", &match_start);
-+ gtk_text_buffer_move_mark_by_name(textbuffer, "insert", &match_end);
- }
- gtk_text_buffer_delete_selection(textbuffer, TRUE, TRUE);
- undo_set_sequency(TRUE);
Deleted: desktop/branches/experimental/mousepad/debian/patches/02_fix-typos-in-test.patch
===================================================================
--- desktop/branches/experimental/mousepad/debian/patches/02_fix-typos-in-test.patch 2012-12-30 13:48:55 UTC (rev 7250)
+++ desktop/branches/experimental/mousepad/debian/patches/02_fix-typos-in-test.patch 2012-12-30 14:41:12 UTC (rev 7251)
@@ -1,37 +0,0 @@
-diff --git a/src/keyevent.c b/src/keyevent.c
-index ee6389c..549db21 100644
---- a/src/keyevent.c
-+++ b/src/keyevent.c
-@@ -36,7 +36,7 @@ guint keyevent_getval(void)
- gchar flag = 0;
-
- gdk_window_get_pointer(gdkwin, NULL, NULL, &mask);
-- if (mask &= GDK_CONTROL_MASK)
-+ if (mask & GDK_CONTROL_MASK)
- flag = 1;
-
- return keyval + 0x10000 * flag;
-@@ -89,19 +89,19 @@ static gboolean cb_key_press_event(GtkWidget *text_view, GdkEventKey *event)
- case GDK_Return:
- if (check_preedit(text_view))
- return FALSE;
-- if ((indent_get_state() && !(event->state &= GDK_SHIFT_MASK)) ||
-- (!indent_get_state() && (event->state &= GDK_SHIFT_MASK))) {
-+ if ((indent_get_state() && !(event->state & GDK_SHIFT_MASK)) ||
-+ (!indent_get_state() && (event->state & GDK_SHIFT_MASK))) {
- indent_real(text_view);
- return TRUE;
- }
- break;
- case GDK_Tab:
-- if (event->state &= GDK_CONTROL_MASK) {
-+ if (event->state & GDK_CONTROL_MASK) {
- indent_toggle_tab_width(text_view);
- return TRUE;
- }
- case GDK_ISO_Left_Tab:
-- if (event->state &= GDK_SHIFT_MASK) {
-+ if (event->state & GDK_SHIFT_MASK) {
- keyval = 0;
- indent_multi_line_unindent(buffer);
- } else if (!check_selection_bound(buffer))
Deleted: desktop/branches/experimental/mousepad/debian/patches/series
===================================================================
--- desktop/branches/experimental/mousepad/debian/patches/series 2012-12-30 13:48:55 UTC (rev 7250)
+++ desktop/branches/experimental/mousepad/debian/patches/series 2012-12-30 14:41:12 UTC (rev 7251)
@@ -1,3 +0,0 @@
-00_resensitize-find-button.patch
-01_fix-first-replace.patch
-02_fix-typos-in-test.patch
More information about the Pkg-xfce-commits
mailing list