[Pkg-xfce-commits] r7261 - in desktop/tags/mousepad: . 0.3.0-1/debian 0.3.0-1/debian/patches
Yves-Alexis Perez
corsac at alioth.debian.org
Sun Dec 30 07:50:19 UTC 2012
Author: corsac
Date: 2012-12-30 19:50:19 +0000 (Sun, 30 Dec 2012)
New Revision: 7261
Added:
desktop/tags/mousepad/0.3.0-1/
desktop/tags/mousepad/0.3.0-1/debian/changelog
desktop/tags/mousepad/0.3.0-1/debian/compat
desktop/tags/mousepad/0.3.0-1/debian/control
desktop/tags/mousepad/0.3.0-1/debian/rules
Removed:
desktop/tags/mousepad/0.3.0-1/debian/changelog
desktop/tags/mousepad/0.3.0-1/debian/compat
desktop/tags/mousepad/0.3.0-1/debian/control
desktop/tags/mousepad/0.3.0-1/debian/patches/00_resensitize-find-button.patch
desktop/tags/mousepad/0.3.0-1/debian/patches/01_fix-first-replace.patch
desktop/tags/mousepad/0.3.0-1/debian/patches/02_fix-typos-in-test.patch
desktop/tags/mousepad/0.3.0-1/debian/patches/series
desktop/tags/mousepad/0.3.0-1/debian/rules
Log:
[svn-buildpackage] Tagging mousepad 0.3.0-1
Deleted: desktop/tags/mousepad/0.3.0-1/debian/changelog
===================================================================
--- desktop/branches/experimental/mousepad/debian/changelog 2012-12-30 13:48:25 UTC (rev 7249)
+++ desktop/tags/mousepad/0.3.0-1/debian/changelog 2012-12-30 19:50:19 UTC (rev 7261)
@@ -1,178 +0,0 @@
-mousepad (0.2.16-6) unstable; urgency=low
-
- [ Lionel Le Folgoc ]
- * debian/patches: add missing DEP3 headers.
-
- [ Yves-Alexis Perez ]
- * debian/patches:
- - 02_fix-typos-in-test added, fix typos in various tests, which led to
- infinite loops and freezes in some cases. closes: #631114
- * debian/rules:
- - build with --parallel
-
- -- Yves-Alexis Perez <corsac at debian.org> Sat, 30 Jun 2012 15:59:36 +0200
-
-mousepad (0.2.16-5) unstable; urgency=low
-
- * debian/control:
- - update section to editors.
- - update standards version to 3.9.2.
- - update debhelper build-dep because of overrides.
- - add build-dep on hardening-includes.
- * Switch to 3.0 (quilt) source format.
- * debian/rules:
- - drop quilt stuff.
- - switch to dh7 tiny rules.
- - pick build-flags from dpkg-buildflags
- - add hardening flags to build flags.
-
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 19 Apr 2011 17:47:56 +0200
-
-mousepad (0.2.16-4) unstable; urgency=low
-
- [ Lionel Le Folgoc ]
- * debian/rules: fix dh_quilt_unpatch call in clean.
-
- [ Stefan Ott ]
- * debian/watch edited to track Xfce archive reorganisation.
-
- [ Yves-Alexis Perez ]
- * debian/control:
- - bump standards version to 3.8.4.
-
- -- Yves-Alexis Perez <corsac at debian.org> Thu, 22 Apr 2010 23:46:18 +0200
-
-mousepad (0.2.16-3) unstable; urgency=low
-
- [ Lionel Le Folgoc ]
- * debian/patches:
- - 00_resensitize-find-button.patch: re-sensitize "Find/Replace" button
- when the dialog is shown up again (LP: #443302, closes: #549334)
- - 01_fix-first-replace.patch: really replace the first occurrence found
- with the find/Replace dialog (Xfce #4526, closes: #460440)
- - series: add these patches.
- * debian/control:
- - build-depends on quilt (>= 0.46-7)
- - bump Standards-Version to 3.8.3.
- * debian/rules: enable quilt.
-
- [ Yves-Alexis Perez ]
- * debian/rules:
- - drop deprecated dh_desktop call.
- * debian/README.source added as we use quilt.
-
- -- Yves-Alexis Perez <corsac at debian.org> Fri, 09 Oct 2009 10:28:21 +0200
-
-mousepad (0.2.16-2) unstable; urgency=low
-
- * Upload to unstable.
- * debian/rules:
- - -Wl,-z,defs -Wl,--as-needed added to LDFLAGS.
- - stop messing with config.{sub,guess}
- - replace dh_clean -k by dh_prep.
- * debian/compat bumped to 7.
- * debian/control:
- - update standards version to 3.8.1.
- - update debhelper build-dep to 7.
- - move to xfce section.
-
- -- Yves-Alexis Perez <corsac at debian.org> Sat, 04 Apr 2009 02:03:53 +0200
-
-mousepad (0.2.16-1) experimental; urgency=low
-
- * New upstream release.
- * debian/control:
- - drop Rudy Godoy and Martin Loschwitz from Uploaders.
- - bump build-deps for Xfce 4.6.
- - update standards version to 3.8.0.
- - add depends on ${misc:Depends}.
- - drop quilt from build-deps.
- - add build-dep on intltool.
- * debian/patches:
- - 01_fix-recent-items-sort dropped, merged upstream.
- * debian/rules:
- - drop quilt rules.
-
- -- Yves-Alexis Perez <corsac at debian.org> Sat, 28 Feb 2009 15:13:16 +0100
-
-mousepad (0.2.13-2) unstable; urgency=low
-
- * debian/control:
- - add build-dep on quilt
- - updated standard versions to 3.7.3.
- - updated my email address.
- * debian/rules: use quilt to patch sources at build time
- * debian/patches: 01_fix-recent-items-sort added to correct recent items
- menu. closes: #465546
- * debian/copyright: use © character to make lintian happy…
-
- -- Yves-Alexis Perez <corsac at debian.org> Wed, 13 Feb 2008 12:50:32 +0100
-
-mousepad (0.2.13-1) unstable; urgency=low
-
- [ Yves-Alexis Perez ]
- * New upstream release.
-
- [ Simon Huggins ]
- * Add Vcs-* headers to debian/control
-
- -- Simon Huggins <huggie at earth.li> Tue, 27 Nov 2007 16:39:17 +0000
-
-mousepad (0.2.12-2) unstable; urgency=low
-
- [ Yves-Alexis Perez ]
- * Corrected manpage mousepad(1) shipped with the package. closes: #355254
- * debian/menu: switch to new menu policy.
-
- [ Emanuele Rocca ]
- * debian/rules: do not ignore make clean errors in the clean target.
-
- -- Yves-Alexis Perez <corsac at corsac.net> Mon, 10 Sep 2007 21:30:22 +0200
-
-mousepad (0.2.12-1) unstable; urgency=low
-
- * New upstream release.
- * debian/control: updated build-deps to Xfce 4.4.
- * debian/copyright: updated authors and copyright holders.
-
- -- Yves-Alexis Perez <corsac at corsac.net> Sun, 15 Apr 2007 15:28:17 +0100
-
-mousepad (0.2.10-1) unstable; urgency=low
-
- * New upstream release.
- * debian/control: updated build-deps to Xfce 4.4rc2 (4.3.99.2).
-
- -- Yves-Alexis Perez <corsac at corsac.net> Thu, 16 Nov 2006 18:44:47 +0100
-
-mousepad (0.2.8-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Yves-Alexis Perez <corsac at corsac.net> Sat, 30 Sep 2006 13:14:41 +0200
-
-mousepad (0.2.6-1) unstable; urgency=low
-
- * New upstream release.
- * debian/control: updated standards version to 3.7.2.
-
- -- Yves-Alexis Perez <corsac at corsac.net> Wed, 26 Jul 2006 17:41:56 +0100
-
-mousepad (0.2.4-1) unstable; urgency=low
-
- * New upstream releaase
- * Updated standards version and FSF address
-
- -- Yves-Alexis Perez <corsac at corsac.net> Wed, 03 May 2006 19:17:15 +0100
-
-mousepad (0.2.2-2) unstable; urgency=low
-
- * Moving to unstable
-
- -- Emanuele Rocca <ema at debian.org> Mon, 20 Jun 2005 22:20:51 +0200
-
-mousepad (0.2.2-1) experimental; urgency=low
-
- * Initial Release (Closes: #308521).
-
- -- Yves-Alexis Perez <corsac at corsac.net> Sat, 23 Apr 2005 19:06:01 +0200
-
Copied: desktop/tags/mousepad/0.3.0-1/debian/changelog (from rev 7257, desktop/branches/experimental/mousepad/debian/changelog)
===================================================================
--- desktop/tags/mousepad/0.3.0-1/debian/changelog (rev 0)
+++ desktop/tags/mousepad/0.3.0-1/debian/changelog 2012-12-30 19:50:19 UTC (rev 7261)
@@ -0,0 +1,200 @@
+mousepad (0.3.0-1) experimental; urgency=low
+
+ * New upstream release.
+ - properly handle “file modified” status. closes: #508119
+ - properly handle modified files when opening recent ones. closes: #587667
+ - properly handle “search & replace”. closes: #612005
+ - “match case” setting is remembered. closes: #524963
+ * 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.
+ - update debhelper build-dep to 9.
+ * debian/compat bumped to 9.
+ * debian/rules:
+ - use debhelper 9 hardening support.
+ - use --fail-missing in dh_install.
+ - no need to ignore files in .pc anymore.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 30 Dec 2012 20:32:25 +0100
+
+mousepad (0.2.16-6) unstable; urgency=low
+
+ [ Lionel Le Folgoc ]
+ * debian/patches: add missing DEP3 headers.
+
+ [ Yves-Alexis Perez ]
+ * debian/patches:
+ - 02_fix-typos-in-test added, fix typos in various tests, which led to
+ infinite loops and freezes in some cases. closes: #631114
+ * debian/rules:
+ - build with --parallel
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 30 Jun 2012 15:59:36 +0200
+
+mousepad (0.2.16-5) unstable; urgency=low
+
+ * debian/control:
+ - update section to editors.
+ - update standards version to 3.9.2.
+ - update debhelper build-dep because of overrides.
+ - add build-dep on hardening-includes.
+ * Switch to 3.0 (quilt) source format.
+ * debian/rules:
+ - drop quilt stuff.
+ - switch to dh7 tiny rules.
+ - pick build-flags from dpkg-buildflags
+ - add hardening flags to build flags.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 19 Apr 2011 17:47:56 +0200
+
+mousepad (0.2.16-4) unstable; urgency=low
+
+ [ Lionel Le Folgoc ]
+ * debian/rules: fix dh_quilt_unpatch call in clean.
+
+ [ Stefan Ott ]
+ * debian/watch edited to track Xfce archive reorganisation.
+
+ [ Yves-Alexis Perez ]
+ * debian/control:
+ - bump standards version to 3.8.4.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Thu, 22 Apr 2010 23:46:18 +0200
+
+mousepad (0.2.16-3) unstable; urgency=low
+
+ [ Lionel Le Folgoc ]
+ * debian/patches:
+ - 00_resensitize-find-button.patch: re-sensitize "Find/Replace" button
+ when the dialog is shown up again (LP: #443302, closes: #549334)
+ - 01_fix-first-replace.patch: really replace the first occurrence found
+ with the find/Replace dialog (Xfce #4526, closes: #460440)
+ - series: add these patches.
+ * debian/control:
+ - build-depends on quilt (>= 0.46-7)
+ - bump Standards-Version to 3.8.3.
+ * debian/rules: enable quilt.
+
+ [ Yves-Alexis Perez ]
+ * debian/rules:
+ - drop deprecated dh_desktop call.
+ * debian/README.source added as we use quilt.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Fri, 09 Oct 2009 10:28:21 +0200
+
+mousepad (0.2.16-2) unstable; urgency=low
+
+ * Upload to unstable.
+ * debian/rules:
+ - -Wl,-z,defs -Wl,--as-needed added to LDFLAGS.
+ - stop messing with config.{sub,guess}
+ - replace dh_clean -k by dh_prep.
+ * debian/compat bumped to 7.
+ * debian/control:
+ - update standards version to 3.8.1.
+ - update debhelper build-dep to 7.
+ - move to xfce section.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 04 Apr 2009 02:03:53 +0200
+
+mousepad (0.2.16-1) experimental; urgency=low
+
+ * New upstream release.
+ * debian/control:
+ - drop Rudy Godoy and Martin Loschwitz from Uploaders.
+ - bump build-deps for Xfce 4.6.
+ - update standards version to 3.8.0.
+ - add depends on ${misc:Depends}.
+ - drop quilt from build-deps.
+ - add build-dep on intltool.
+ * debian/patches:
+ - 01_fix-recent-items-sort dropped, merged upstream.
+ * debian/rules:
+ - drop quilt rules.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 28 Feb 2009 15:13:16 +0100
+
+mousepad (0.2.13-2) unstable; urgency=low
+
+ * debian/control:
+ - add build-dep on quilt
+ - updated standard versions to 3.7.3.
+ - updated my email address.
+ * debian/rules: use quilt to patch sources at build time
+ * debian/patches: 01_fix-recent-items-sort added to correct recent items
+ menu. closes: #465546
+ * debian/copyright: use © character to make lintian happy…
+
+ -- Yves-Alexis Perez <corsac at debian.org> Wed, 13 Feb 2008 12:50:32 +0100
+
+mousepad (0.2.13-1) unstable; urgency=low
+
+ [ Yves-Alexis Perez ]
+ * New upstream release.
+
+ [ Simon Huggins ]
+ * Add Vcs-* headers to debian/control
+
+ -- Simon Huggins <huggie at earth.li> Tue, 27 Nov 2007 16:39:17 +0000
+
+mousepad (0.2.12-2) unstable; urgency=low
+
+ [ Yves-Alexis Perez ]
+ * Corrected manpage mousepad(1) shipped with the package. closes: #355254
+ * debian/menu: switch to new menu policy.
+
+ [ Emanuele Rocca ]
+ * debian/rules: do not ignore make clean errors in the clean target.
+
+ -- Yves-Alexis Perez <corsac at corsac.net> Mon, 10 Sep 2007 21:30:22 +0200
+
+mousepad (0.2.12-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control: updated build-deps to Xfce 4.4.
+ * debian/copyright: updated authors and copyright holders.
+
+ -- Yves-Alexis Perez <corsac at corsac.net> Sun, 15 Apr 2007 15:28:17 +0100
+
+mousepad (0.2.10-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control: updated build-deps to Xfce 4.4rc2 (4.3.99.2).
+
+ -- Yves-Alexis Perez <corsac at corsac.net> Thu, 16 Nov 2006 18:44:47 +0100
+
+mousepad (0.2.8-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Yves-Alexis Perez <corsac at corsac.net> Sat, 30 Sep 2006 13:14:41 +0200
+
+mousepad (0.2.6-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control: updated standards version to 3.7.2.
+
+ -- Yves-Alexis Perez <corsac at corsac.net> Wed, 26 Jul 2006 17:41:56 +0100
+
+mousepad (0.2.4-1) unstable; urgency=low
+
+ * New upstream releaase
+ * Updated standards version and FSF address
+
+ -- Yves-Alexis Perez <corsac at corsac.net> Wed, 03 May 2006 19:17:15 +0100
+
+mousepad (0.2.2-2) unstable; urgency=low
+
+ * Moving to unstable
+
+ -- Emanuele Rocca <ema at debian.org> Mon, 20 Jun 2005 22:20:51 +0200
+
+mousepad (0.2.2-1) experimental; urgency=low
+
+ * Initial Release (Closes: #308521).
+
+ -- Yves-Alexis Perez <corsac at corsac.net> Sat, 23 Apr 2005 19:06:01 +0200
+
Deleted: desktop/tags/mousepad/0.3.0-1/debian/compat
===================================================================
--- desktop/branches/experimental/mousepad/debian/compat 2012-12-30 13:48:25 UTC (rev 7249)
+++ desktop/tags/mousepad/0.3.0-1/debian/compat 2012-12-30 19:50:19 UTC (rev 7261)
@@ -1 +0,0 @@
-7
Copied: desktop/tags/mousepad/0.3.0-1/debian/compat (from rev 7252, desktop/branches/experimental/mousepad/debian/compat)
===================================================================
--- desktop/tags/mousepad/0.3.0-1/debian/compat (rev 0)
+++ desktop/tags/mousepad/0.3.0-1/debian/compat 2012-12-30 19:50:19 UTC (rev 7261)
@@ -0,0 +1 @@
+9
Deleted: desktop/tags/mousepad/0.3.0-1/debian/control
===================================================================
--- desktop/branches/experimental/mousepad/debian/control 2012-12-30 13:48:25 UTC (rev 7249)
+++ desktop/tags/mousepad/0.3.0-1/debian/control 2012-12-30 19:50:19 UTC (rev 7261)
@@ -1,40 +0,0 @@
-Source: mousepad
-Section: editors
-Priority: optional
-Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-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
-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/
-
-Package: mousepad
-Section: xfce
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: xfprint4
-Description: simple Xfce oriented text editor
- Mousepad is a graphical text editor for Xfce based on Leafpad.
- .
- The initial reason for Mousepad was to provide printing support, which would
- have been difficult for Leafpad for various reasons.
- .
- Although some features are under development, currently Mousepad has the
- following features:
- * Complete support for UTF-8 text
- * Cut/Copy/Paste and Select All text
- * Search and Replace
- * Font selection
- * Word Wrap
- * Character coding selection
- * Auto character coding detection (UTF-8 and some code-sets)
- * Manual code-set setting
- * Infinite Undo/Redo by word
- * Auto Indent
- * Multi-line Indent
- * Display line numbers
- * Drag and Drop
- * Printing
Copied: desktop/tags/mousepad/0.3.0-1/debian/control (from rev 7252, desktop/branches/experimental/mousepad/debian/control)
===================================================================
--- desktop/tags/mousepad/0.3.0-1/debian/control (rev 0)
+++ desktop/tags/mousepad/0.3.0-1/debian/control 2012-12-30 19:50:19 UTC (rev 7261)
@@ -0,0 +1,40 @@
+Source: mousepad
+Section: editors
+Priority: optional
+Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
+Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
+ Yves-Alexis Perez <corsac at debian.org>
+Build-Depends: debhelper (>= 9),
+ 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/
+
+Package: mousepad
+Section: xfce
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: xfprint4
+Description: simple Xfce oriented text editor
+ Mousepad is a graphical text editor for Xfce based on Leafpad.
+ .
+ The initial reason for Mousepad was to provide printing support, which would
+ have been difficult for Leafpad for various reasons.
+ .
+ Although some features are under development, currently Mousepad has the
+ following features:
+ * Complete support for UTF-8 text
+ * Cut/Copy/Paste and Select All text
+ * Search and Replace
+ * Font selection
+ * Word Wrap
+ * Character coding selection
+ * Auto character coding detection (UTF-8 and some code-sets)
+ * Manual code-set setting
+ * Infinite Undo/Redo by word
+ * Auto Indent
+ * Multi-line Indent
+ * Display line numbers
+ * Drag and Drop
+ * Printing
Deleted: desktop/tags/mousepad/0.3.0-1/debian/patches/00_resensitize-find-button.patch
===================================================================
--- desktop/branches/experimental/mousepad/debian/patches/00_resensitize-find-button.patch 2012-12-30 13:48:25 UTC (rev 7249)
+++ desktop/tags/mousepad/0.3.0-1/debian/patches/00_resensitize-find-button.patch 2012-12-30 19:50:19 UTC (rev 7261)
@@ -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/tags/mousepad/0.3.0-1/debian/patches/01_fix-first-replace.patch
===================================================================
--- desktop/branches/experimental/mousepad/debian/patches/01_fix-first-replace.patch 2012-12-30 13:48:25 UTC (rev 7249)
+++ desktop/tags/mousepad/0.3.0-1/debian/patches/01_fix-first-replace.patch 2012-12-30 19:50:19 UTC (rev 7261)
@@ -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/tags/mousepad/0.3.0-1/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:25 UTC (rev 7249)
+++ desktop/tags/mousepad/0.3.0-1/debian/patches/02_fix-typos-in-test.patch 2012-12-30 19:50:19 UTC (rev 7261)
@@ -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/tags/mousepad/0.3.0-1/debian/patches/series
===================================================================
--- desktop/branches/experimental/mousepad/debian/patches/series 2012-12-30 13:48:25 UTC (rev 7249)
+++ desktop/tags/mousepad/0.3.0-1/debian/patches/series 2012-12-30 19:50:19 UTC (rev 7261)
@@ -1,3 +0,0 @@
-00_resensitize-find-button.patch
-01_fix-first-replace.patch
-02_fix-typos-in-test.patch
Deleted: desktop/tags/mousepad/0.3.0-1/debian/rules
===================================================================
--- desktop/branches/experimental/mousepad/debian/rules 2012-12-30 13:48:25 UTC (rev 7249)
+++ desktop/tags/mousepad/0.3.0-1/debian/rules 2012-12-30 19:50:19 UTC (rev 7261)
@@ -1,27 +0,0 @@
-#!/usr/bin/make -f
-include /usr/share/hardening-includes/hardening.make
-
-CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
-CFLAGS+=$(HARDENING_CFLAGS)
-
-export CFLAGS LDFLAGS
-
-override_dh_install:
- # install menu pixmap
- install -D -m 644 $(CURDIR)/debian/mousepad.xpm \
- $(CURDIR)/debian/mousepad/usr/share/pixmaps/mousepad.xpm
- dh_install
-
-override_dh_auto_configure:
- dh_auto_configure
- find .pc -type f -name '*.c' -exec echo '{}' >> po/POTFILES.skip \;
-
-override_dh_auto_clean:
- rm -f po/POTFILES.skip
- dh_auto_clean
-
-
-%:
- dh $@ --parallel
Copied: desktop/tags/mousepad/0.3.0-1/debian/rules (from rev 7255, desktop/branches/experimental/mousepad/debian/rules)
===================================================================
--- desktop/tags/mousepad/0.3.0-1/debian/rules (rev 0)
+++ desktop/tags/mousepad/0.3.0-1/debian/rules 2012-12-30 19:50:19 UTC (rev 7261)
@@ -0,0 +1,13 @@
+#!/usr/bin/make -f
+
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1 -Wl,-z,defs
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
+
+override_dh_install:
+ # install menu pixmap
+ install -D -m 644 $(CURDIR)/debian/mousepad.xpm \
+ $(CURDIR)/debian/mousepad/usr/share/pixmaps/mousepad.xpm
+ dh_install --fail-missing
+
+%:
+ dh $@ --parallel
More information about the Pkg-xfce-commits
mailing list