[onboard] 03/07: Drop all patches. Applied in new release.
Jeremy Bicha
jbicha-guest at moszumanska.debian.org
Thu Sep 1 15:52:09 UTC 2016
This is an automated email from the git hooks/post-receive script.
jbicha-guest pushed a commit to branch master
in repository onboard.
commit 0801e65a7863cedd669329fb8e276b4d580e374a
Author: Jeremy Bicha <jbicha at ubuntu.com>
Date: Sat Aug 20 23:27:01 2016 -0400
Drop all patches. Applied in new release.
---
...make-desktop-files-appropriate-for-Debian.patch | 40 ------
debian/patches/0002_build-with-gcc6.patch | 21 ----
.../0003_bump-gnome-shell-compatibility.patch | 14 ---
.../0004_fix_arrows_on_compact_layout.patch | 117 -----------------
.../0005_bzr_fix_untranslatable_buttons.patch | 139 ---------------------
debian/patches/series | 5 -
6 files changed, 336 deletions(-)
diff --git a/debian/patches/0001_make-desktop-files-appropriate-for-Debian.patch b/debian/patches/0001_make-desktop-files-appropriate-for-Debian.patch
deleted file mode 100644
index 55391e0..0000000
--- a/debian/patches/0001_make-desktop-files-appropriate-for-Debian.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: Various fixes for .desktop files
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-Forwarded: https://bazaar.launchpad.net/~onboard/onboard/trunk/revision/2159
-Abstract:
- Make the .desktop files more appropriate for MATE and
- GNOME on Debian.
-
-=== modified file 'data/onboard-settings.desktop.in'
---- data/onboard-settings.desktop.in 2011-08-28 19:15:33 +0000
-+++ data/onboard-settings.desktop.in 2016-07-31 06:15:09 +0000
-@@ -6,9 +6,6 @@
- Terminal=false
- Type=Application
- Categories=Settings;Accessibility;
--#NotShowIn=GNOME;
--#NotShowIn=GNOME;Unity;
--NoDisplay=false
- MimeType=application/x-onboardsettings;
- Icon=onboard
- X-Ubuntu-Gettext-Domain=onboard
-
-=== modified file 'data/onboard.desktop.in'
---- data/onboard.desktop.in 2011-08-28 19:15:33 +0000
-+++ data/onboard.desktop.in 2016-07-31 06:15:09 +0000
-@@ -1,14 +1,11 @@
- [Desktop Entry]
- _Name=Onboard
- _GenericName=Onboard onscreen keyboard
--_Comment=Flexible onscreen keyboard for GNOME
-+_Comment=Flexible onscreen keyboard
- Exec=onboard
- Terminal=false
- Type=Application
- Categories=Utility;Accessibility;
--#NotShowIn=GNOME;
--#NotShowIn=GNOME;Unity;
--NoDisplay=false
- MimeType=application/x-onboard;
- Icon=onboard
- X-Ubuntu-Gettext-Domain=onboard
diff --git a/debian/patches/0002_build-with-gcc6.patch b/debian/patches/0002_build-with-gcc6.patch
deleted file mode 100644
index 068e5ee..0000000
--- a/debian/patches/0002_build-with-gcc6.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Fix build with GCC 6
-Forwarded: https://bazaar.launchpad.net/~onboard/onboard/trunk/revision/2155
-Origin: https://git.archlinux.org/svntogit/community.git/tree/trunk/gcc6.diff?h=packages/onboard
-Bug-Debian: https://bugs.debian.org/812033
-
---- a/Onboard/pypredict/lm/lm_dynamic_cached.h
-+++ b/Onboard/pypredict/lm/lm_dynamic_cached.h
-@@ -224,10 +224,11 @@
- public:
- typedef _DynamicModelKN<TNGRAMS> Base;
- static const Smoothing DEFAULT_SMOOTHING = ABS_DISC_I;
-- static const double DEFAULT_LAMBDA = 0.3; // Jelinek-Mercer weights
-+ const double DEFAULT_LAMBDA; // default for Jelinek-Mercer weights
-
- public:
-- _CachedDynamicModel()
-+ _CachedDynamicModel() :
-+ DEFAULT_LAMBDA(0.3)
- {
- this->smoothing = DEFAULT_SMOOTHING;
- recency_smoothing = JELINEK_MERCER_I;
diff --git a/debian/patches/0003_bump-gnome-shell-compatibility.patch b/debian/patches/0003_bump-gnome-shell-compatibility.patch
deleted file mode 100644
index 2d6d8bf..0000000
--- a/debian/patches/0003_bump-gnome-shell-compatibility.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Mark compatible with GNOME Shell 3.20 and 3.22
-Author: Jeremy Bicha <jbicha at ubuntu.com>
-Forwarded: https://code.launchpad.net/~jbicha/onboard/fixes-from-debian/+merge/301585
-
-Index: onboard/gnome/Onboard_Indicator at onboard.org/metadata.json
-===================================================================
---- onboard.orig/gnome/Onboard_Indicator at onboard.org/metadata.json 2016-02-16 00:52:03 +0000
-+++ onboard/gnome/Onboard_Indicator at onboard.org/metadata.json 2016-07-31 06:16:08 +0000
-@@ -1,4 +1,4 @@
--{"shell-version": ["3.16", "3.18"],
-+{"shell-version": ["3.16", "3.18", "3.20", "3.22"],
- "name": "Onboard Indicator",
- "description": "Add indicator and menu for Onboard onscreen-keyboard and hide the built-in keyboard.",
- "uuid": "Onboard_Indicator at onboard.org"}
diff --git a/debian/patches/0004_fix_arrows_on_compact_layout.patch b/debian/patches/0004_fix_arrows_on_compact_layout.patch
deleted file mode 100644
index a28f571..0000000
--- a/debian/patches/0004_fix_arrows_on_compact_layout.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-Origin: https://bazaar.launchpad.net/~onboard/onboard/trunk/revision/2110
-Bug: https://launchpad.net/bugs/1550534
-Index: onboard-1.2.0/layouts/Compact-Alpha.svg
-===================================================================
---- onboard-1.2.0.orig/layouts/Compact-Alpha.svg 2016-02-18 14:31:51.000000000 +0100
-+++ onboard-1.2.0/layouts/Compact-Alpha.svg 2016-02-26 12:16:55.040434465 +0100
-@@ -89,32 +89,32 @@
- </metadata>
- <rect
- id="wordlist"
-- height="14.733308"
-+ height="15.028312"
- width="306.52832"
-- y="4.7904754"
-+ y="4.4858437"
- x="0.48584402"
- style="fill:#151530;stroke:#7f7f7f;stroke-width:0.97168803;stroke-miterlimit:4;stroke-dasharray:none" />
- <rect
- id="prediction"
-- height="14.707282"
-+ height="15"
- width="49"
-- y="4.8034878"
-- x="110.5"
-- style="color:#000000;fill:#2b2b63;fill-opacity:1;fill-rule:nonzero;stroke:#7f7f7f;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-+ y="4.5"
-+ x="71.5"
-+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2b2b63;fill-opacity:1;fill-rule:nonzero;stroke:#7f7f7f;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
- <rect
- id="correction"
-- height="14.707282"
-+ height="15"
- width="49"
-- y="4.8034878"
-- x="30.5"
-- style="color:#000000;fill:#2b2b63;fill-opacity:1;fill-rule:nonzero;stroke:#7f7f7f;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-+ y="4.5"
-+ x="1.5"
-+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2b2b63;fill-opacity:1;fill-rule:nonzero;stroke:#7f7f7f;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
- inkscape:label="#correction" />
- <rect
- id="expand-corrections"
-- height="14.707282"
-- width="17.272728"
-- y="4.8034878"
-- x="85.657127"
-+ height="14.685742"
-+ width="16.685743"
-+ y="4.6571288"
-+ x="52.657127"
- style="fill:#2b2b63;stroke:#7f7f7f;stroke-width:1.3142575;stroke-miterlimit:4;stroke-dasharray:none" />
- <rect
- id="AB01"
-@@ -711,21 +711,21 @@
- id="layer2.wordlist"
- inkscape:label="" />
- <rect
-- style="fill:#2b2b63;stroke:#7f7f7f;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
-+ style="fill:#2b2b63;stroke:#7f7f7f;stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none"
- x="285.5"
-- y="4.8034878"
-- width="18"
-- height="14.707282"
-+ y="4.5"
-+ width="17"
-+ height="15"
- id="hide.wordlist"
- inkscape:label="" />
- <rect
- inkscape:label=""
- id="language.wordlist"
-- height="14.707282"
-- width="18"
-- y="4.8034878"
-+ height="15"
-+ width="17"
-+ y="4.5"
- x="265.5"
-- style="fill:#2b2b63;stroke:#7f7f7f;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none" />
-+ style="fill:#2b2b63;stroke:#7f7f7f;stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none" />
- <g
- id="RTRN">
- <path
-@@ -744,11 +744,27 @@
- inkscape:label="#RTRN_50pct" />
- </g>
- <rect
-- style="fill:#2b2b63;stroke:#7f7f7f;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
-- x="245.5"
-- y="4.8034878"
-- width="18"
-- height="14.707282"
-- id="pause-learning.wordlist"
-+ style="fill:#2b2b63;stroke:#7f7f7f;stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none"
-+ x="225.5"
-+ y="4.5"
-+ width="17"
-+ height="15"
-+ id="next-predictions.wordlist"
- inkscape:label="" />
-+ <rect
-+ style="fill:#2b2b63;stroke:#7f7f7f;stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none"
-+ x="205.5"
-+ y="4.5"
-+ width="17"
-+ height="15"
-+ id="previous-predictions.wordlist"
-+ inkscape:label="" />
-+ <rect
-+ inkscape:label=""
-+ id="pause-learning.wordlist"
-+ height="15"
-+ width="17"
-+ y="4.5"
-+ x="245.5"
-+ style="fill:#2b2b63;stroke:#7f7f7f;stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none" />
- </svg>
diff --git a/debian/patches/0005_bzr_fix_untranslatable_buttons.patch b/debian/patches/0005_bzr_fix_untranslatable_buttons.patch
deleted file mode 100644
index ce7b47a..0000000
--- a/debian/patches/0005_bzr_fix_untranslatable_buttons.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-Origin: https://bazaar.launchpad.net/~onboard/onboard/trunk/revision/2129
-Bug: https://launchpad.net/bugs/1567301
-Index: onboard-1.2.0/settings.ui
-===================================================================
---- onboard-1.2.0.orig/settings.ui 2016-02-18 14:31:51.000000000 +0100
-+++ onboard-1.2.0/settings.ui 2016-04-15 21:27:35.187583393 +0200
-@@ -273,7 +273,7 @@
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="close_button">
-- <property name="label">_Close</property>
-+ <property name="label" translatable="yes">_Close</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
-@@ -1458,7 +1458,7 @@
- <property name="layout_style">start</property>
- <child>
- <object class="GtkButton" id="layout_new_button">
-- <property name="label">_New</property>
-+ <property name="label" translatable="yes">_New</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
-@@ -1473,7 +1473,7 @@
- </child>
- <child>
- <object class="GtkButton" id="layout_remove_button">
-- <property name="label">_Delete</property>
-+ <property name="label" translatable="yes">_Delete</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
-@@ -1503,7 +1503,7 @@
- </child>
- <child>
- <object class="GtkButton" id="layout_about_button">
-- <property name="label">_About</property>
-+ <property name="label" translatable="yes">_About</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
-@@ -1613,7 +1613,7 @@
- <property name="layout_style">start</property>
- <child>
- <object class="GtkButton" id="new_theme_button">
-- <property name="label">_New</property>
-+ <property name="label" translatable="yes">_New</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
-@@ -1628,7 +1628,7 @@
- </child>
- <child>
- <object class="GtkButton" id="delete_theme_button">
-- <property name="label">_Delete</property>
-+ <property name="label" translatable="yes">_Delete</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
-@@ -1777,7 +1777,7 @@
- <property name="layout_style">start</property>
- <child>
- <object class="GtkButton" id="snippet_add_button">
-- <property name="label">_Add</property>
-+ <property name="label" translatable="yes">_Add</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
-@@ -1792,7 +1792,7 @@
- </child>
- <child>
- <object class="GtkButton" id="snippet_remove_button">
-- <property name="label">_Remove</property>
-+ <property name="label" translatable="yes">_Remove</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
-Index: onboard-1.2.0/settings_auto_show_dialog.ui
-===================================================================
---- onboard-1.2.0.orig/settings_auto_show_dialog.ui 2016-02-18 14:31:51.000000000 +0100
-+++ onboard-1.2.0/settings_auto_show_dialog.ui 2016-04-15 21:32:07.251576063 +0200
-@@ -81,7 +81,7 @@
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="dialog_close_button">
-- <property name="label">_Close</property>
-+ <property name="label" translatable="yes">_Close</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
-Index: onboard-1.2.0/settings_docking_dialog.ui
-===================================================================
---- onboard-1.2.0.orig/settings_docking_dialog.ui 2016-02-18 14:31:51.000000000 +0100
-+++ onboard-1.2.0/settings_docking_dialog.ui 2016-04-15 21:35:13.779571038 +0200
-@@ -89,7 +89,7 @@
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="dialog_close_button">
-- <property name="label">_Close</property>
-+ <property name="label" translatable="yes">_Close</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
-Index: onboard-1.2.0/settings_scanner_dialog.ui
-===================================================================
---- onboard-1.2.0.orig/settings_scanner_dialog.ui 2016-02-18 14:31:51.000000000 +0100
-+++ onboard-1.2.0/settings_scanner_dialog.ui 2016-04-15 21:37:55.915566670 +0200
-@@ -92,7 +92,7 @@
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="dialog_close_button">
-- <property name="label">_Close</property>
-+ <property name="label" translatable="yes">_Close</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
-Index: onboard-1.2.0/settings_theme_dialog.ui
-===================================================================
---- onboard-1.2.0.orig/settings_theme_dialog.ui 2016-02-18 14:31:51.000000000 +0100
-+++ onboard-1.2.0/settings_theme_dialog.ui 2016-04-15 21:51:52.055544142 +0200
-@@ -989,7 +989,7 @@
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="revert_button">
-- <property name="label">_Revert</property>
-+ <property name="label" translatable="yes">_Revert</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
-@@ -1004,7 +1004,7 @@
- </child>
- <child>
- <object class="GtkButton" id="close_button">
-- <property name="label">_Close</property>
-+ <property name="label" translatable="yes">_Close</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
diff --git a/debian/patches/series b/debian/patches/series
index 2330123..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +0,0 @@
-0001_make-desktop-files-appropriate-for-Debian.patch
-0002_build-with-gcc6.patch
-0003_bump-gnome-shell-compatibility.patch
-0004_fix_arrows_on_compact_layout.patch
-0005_bzr_fix_untranslatable_buttons.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/onboard.git
More information about the pkg-mate-commits
mailing list