add replaces:eb-library and .gitignore file

3 files changed, 8 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 662e19a4a9b8..6f0112455d1f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = libeb
 	pkgdesc = C library for accessing CD-ROM books. Supports EB, EBG, EBXA, EBXA-C, S-EBXA and EPWING formats.
 	pkgver = 4.4.3
-	pkgrel = 3
+	pkgrel = 4
 	url = http://www.mistys-internet.website/eb/index-en.html
 	arch = i686
 	arch = x86_64
@@ -12,6 +12,7 @@ pkgbase = libeb
 	provides = libeb.so
 	provides = eb-library
 	conflicts = eb-library
+	replaces = eb-library
 	source = https://github.com/mistydemeo/eb/releases/download/v4.4.3/eb-4.4.3.tar.bz2
 	source = eb-fix_bmp_size_header.patch::https://github.com/eb4j/eb/commit/8292c7814e2c65d0809bb8a401c00b593aefec43.patch
 	sha256sums = abe710a77c6fc3588232977bb2f30a2e69ddfbe9fa8d0b05b0d67d95e36f4b5f
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..05c6d4d4c97b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!.gitignore
+!.SRCINFO
+!PKGBUILD
diff --git a/PKGBUILD b/PKGBUILD
index c0592f0835dd..427bece74113 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=libeb
 _pkgname=eb
 pkgver=4.4.3
-pkgrel=3
+pkgrel=4
 epoch=
 pkgdesc='C library for accessing CD-ROM books. Supports EB, EBG, EBXA, EBXA-C, S-EBXA and EPWING formats.'
 arch=('i686' 'x86_64')
@@ -14,6 +14,7 @@ depends=('libnsl'
          'zlib')
 provides=('libeb.so' 'eb-library')
 conflicts=('eb-library')
+replaces=('eb-library')  # Has been deleted from AUR and merged into this package
 _patch1_name="${_pkgname}-fix_bmp_size_header.patch"
 _patch1_source="https://github.com/eb4j/${_pkgname}/commit/8292c7814e2c65d0809bb8a401c00b593aefec43.patch"
 source=("https://github.com/mistydemeo/eb/releases/download/v${pkgver}/${_pkgname}-${pkgver}.tar.bz2"