summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Nixon2017-07-30 17:41:01 -0500
committerChris Nixon2017-07-30 17:41:47 -0500
commit5a9350227c4d7403a0c1a5dbeb1ac283d86a8298 (patch)
tree0f7f8db97a12ef3db9591ee397a07172eeaa66b1
parent72372a18f3897a88361b99908e936df0605e2120 (diff)
downloadaur-5a9350227c4d7403a0c1a5dbeb1ac283d86a8298.tar.gz
fix conflicts with emacs package
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD6
2 files changed, 8 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 06669e42a12..a3c1c7f100b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
pkgbase = remacs-git
- pkgdesc = GNU Emacs. Master development branch.
- pkgver = 26.0.50.128338
+ pkgdesc = Development branch of REmacs, a fork of GNU Emacs with components rewritten in Rust
+ pkgver = 26.0.50.128380
pkgrel = 1
- url = http://www.gnu.org/software/emacs/
+ url = https://github.com/Wilfred/remacs.git
arch = i686
arch = x86_64
license = GPL
diff --git a/PKGBUILD b/PKGBUILD
index bcfbbeae836..ccd09520c6b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -170,7 +170,11 @@ package() {
# remove conflict with ctags package
mv "$pkgdir"/usr/bin/{ctags,ctags.remacs}
- mv "$pkgdir"/usr/share/man/man2/{ctags.1.gz,ctags.remacs.1.gz}
+ mv "$pkgdir"/usr/share/man/man1/{ctags.1.gz,ctags.remacs.1.gz}
+ mv "$pkgdir"/usr/share/man/man1/{etags.1.gz,etags.remacs.1.gz}
+ mv "$pkgdir"/usr/share/man/man1/{ebrowse.1.gz,ebrowse.remacs.1.gz}
+ mv "$pkgdir"/usr/share/man/man1/{emacs.1.gz,remacs.1.gz}
+ mv "$pkgdir"/usr/share/man/man1/{emacsclient.1.gz,remacsclient.1.gz}
mv "$pkgdir"/usr/bin/{etags,etags.remacs}
mv "$pkgdir"/usr/bin/{ebrowse,ebrowse.remacs}