From a5960ce1cd2c436f3583afa4d4b10fa26244346a Mon Sep 17 00:00:00 2001
From: Mikhail Osipov <mike.osipov@gmail.com>
Date: Thu, 26 Dec 2019 16:56:55 +0300
Subject: rename xfce4-terminal to terminal

---
 terminal/PKGBUILD           | 45 +++++++++++++++++++++++++++++++++++++++++++++
 terminal/hotkey.patch       | 12 ++++++++++++
 xfce4-terminal/PKGBUILD     | 45 ---------------------------------------------
 xfce4-terminal/hotkey.patch | 12 ------------
 4 files changed, 57 insertions(+), 57 deletions(-)
 create mode 100644 terminal/PKGBUILD
 create mode 100644 terminal/hotkey.patch
 delete mode 100644 xfce4-terminal/PKGBUILD
 delete mode 100644 xfce4-terminal/hotkey.patch

diff --git a/terminal/PKGBUILD b/terminal/PKGBUILD
new file mode 100644
index 0000000..59bc2ef
--- /dev/null
+++ b/terminal/PKGBUILD
@@ -0,0 +1,45 @@
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: tobias <tobias funnychar archlinux.org>
+# Contributor: Aurelien Foret <orelien@chez.com>
+
+_pkgname_=xfce4-terminal
+pkgname=terminal
+pkgver=0.8.8
+pkgrel=2
+pkgdesc="A modern terminal emulator primarily for the Xfce desktop environment"
+arch=('x86_64')
+url="https://www.xfce.org/"
+license=('GPL2')
+groups=('xfce4')
+depends=('libxfce4ui' 'vte3' 'hicolor-icon-theme')
+makedepends=('intltool')
+conflicts=('xfce4-terminal')
+replaces=('xfce4-terminal')
+provides=('xfce4-terminal')
+source=(https://archive.xfce.org/src/apps/$_pkgname_/0.8/$_pkgname_-$pkgver.tar.bz2 hotkey.patch)
+sha256sums=('8fba6a60d3a0fee07417ad7c36bf78cc45be1b27f0759e125051aa73f08487fd' 'SKIP')
+
+prepare() {
+  cd "$srcdir/$_pkgname_-$pkgver"
+  patch -p1 -i "$srcdir/hotkey.patch"
+}
+
+build() {
+  cd "$srcdir/$_pkgname_-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib/xfce4 \
+    --localstatedir=/var \
+    --disable-static \
+    --disable-debug
+  make
+}
+
+package() {
+  cd "$srcdir/$_pkgname_-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/terminal/hotkey.patch b/terminal/hotkey.patch
new file mode 100644
index 0000000..3f0853b
--- /dev/null
+++ b/terminal/hotkey.patch
@@ -0,0 +1,12 @@
+diff -ruN xfce4-terminal-0.8.6/terminal/terminal-window.c xfce4-terminal-0.8.6.new/terminal/terminal-window.c
+--- xfce4-terminal-0.8.6/terminal/terminal-window.c	2017-07-06 01:57:57.000000000 +0300
++++ xfce4-terminal-0.8.6.new/terminal/terminal-window.c	2018-01-24 15:05:10.660780618 +0300
+@@ -325,7 +325,7 @@
+     { "zoom-in", "zoom-in", N_ ("Zoom _In"), "<control>plus", N_ ("Zoom in with larger font"), G_CALLBACK (terminal_window_action_zoom_in), },
+     { "zoom-out", "zoom-out", N_ ("Zoom _Out"), "<control>minus", N_ ("Zoom out with smaller font"), G_CALLBACK (terminal_window_action_zoom_out), },
+     { "zoom-reset", "zoom-original", N_ ("_Normal Size"), "<control>0", N_ ("Zoom to default size"), G_CALLBACK (terminal_window_action_zoom_reset), },
+-  { "terminal-menu", NULL, N_ ("_Terminal"), NULL, NULL, NULL, },
++  { "terminal-menu", NULL, N_ ("Terminal"), NULL, NULL, NULL, },
+     { "set-title", NULL, N_ ("_Set Title..."), "<control><shift>s", NULL, G_CALLBACK (terminal_window_action_set_title), },
+     { "search", "edit-find", N_ ("_Find..."), "<control><shift>f", N_ ("Search terminal contents"), G_CALLBACK (terminal_window_action_search), },
+     { "search-next", NULL, N_ ("Find Ne_xt"), NULL, NULL, G_CALLBACK (terminal_window_action_search_next), },
diff --git a/xfce4-terminal/PKGBUILD b/xfce4-terminal/PKGBUILD
deleted file mode 100644
index beb9def..0000000
--- a/xfce4-terminal/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor: tobias <tobias funnychar archlinux.org>
-# Contributor: Aurelien Foret <orelien@chez.com>
-
-_pkgname=xfce4-terminal
-pkgname=xfce4-terminal-fixed
-pkgver=0.8.7.4
-pkgrel=1
-pkgdesc="A modern terminal emulator primarily for the Xfce desktop environment"
-arch=('x86_64')
-url="http://www.xfce.org/"
-license=('GPL2')
-groups=('xfce4')
-depends=('libxfce4ui' 'vte3' 'hicolor-icon-theme')
-makedepends=('intltool')
-conflicts=('xfce4-terminal' 'terminal')
-replaces=('xfce4-terminal' 'terminal')
-provides=('xfce4-terminal')
-source=(https://archive.xfce.org/src/apps/$_pkgname/0.8/$_pkgname-$pkgver.tar.bz2 hotkey.patch)
-sha256sums=('a88f98af4da72394f2cfbd7f14b0f053ec0a3b58a4f6a577836357c60a6c42ab' 'SKIP')
-
-prepare() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  patch -p1 -i "$srcdir/hotkey.patch"
-}
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib/xfce4 \
-    --localstatedir=/var \
-    --disable-static \
-    --disable-debug
-  make
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/xfce4-terminal/hotkey.patch b/xfce4-terminal/hotkey.patch
deleted file mode 100644
index 3f0853b..0000000
--- a/xfce4-terminal/hotkey.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN xfce4-terminal-0.8.6/terminal/terminal-window.c xfce4-terminal-0.8.6.new/terminal/terminal-window.c
---- xfce4-terminal-0.8.6/terminal/terminal-window.c	2017-07-06 01:57:57.000000000 +0300
-+++ xfce4-terminal-0.8.6.new/terminal/terminal-window.c	2018-01-24 15:05:10.660780618 +0300
-@@ -325,7 +325,7 @@
-     { "zoom-in", "zoom-in", N_ ("Zoom _In"), "<control>plus", N_ ("Zoom in with larger font"), G_CALLBACK (terminal_window_action_zoom_in), },
-     { "zoom-out", "zoom-out", N_ ("Zoom _Out"), "<control>minus", N_ ("Zoom out with smaller font"), G_CALLBACK (terminal_window_action_zoom_out), },
-     { "zoom-reset", "zoom-original", N_ ("_Normal Size"), "<control>0", N_ ("Zoom to default size"), G_CALLBACK (terminal_window_action_zoom_reset), },
--  { "terminal-menu", NULL, N_ ("_Terminal"), NULL, NULL, NULL, },
-+  { "terminal-menu", NULL, N_ ("Terminal"), NULL, NULL, NULL, },
-     { "set-title", NULL, N_ ("_Set Title..."), "<control><shift>s", NULL, G_CALLBACK (terminal_window_action_set_title), },
-     { "search", "edit-find", N_ ("_Find..."), "<control><shift>f", N_ ("Search terminal contents"), G_CALLBACK (terminal_window_action_search), },
-     { "search-next", NULL, N_ ("Find Ne_xt"), NULL, NULL, G_CALLBACK (terminal_window_action_search_next), },
-- 
cgit v1.2.3-70-g09d2