Merge pull request #182 from infirit/master

Use GTK_API_VERSION for GIR and correct typo

8 files changed, 6 insertions, 74 deletions

diff --git a/HACKING b/HACKING
index 57f3a599..4d767567 100644
--- a/HACKING
+++ b/HACKING
@@ -2,7 +2,7 @@ Hacking on Caja
 -------------------
 
 The Caja source tree is available from MATE git
-(https://github.com/mate-desktop/mate-file-manager) and
+(https://github.com/mate-desktop/caja) and
 in releases on the MATE FTP site (http://pub.mate-desktop.org/).
 
 See also http://wiki.mate-desktop.org/applications:caja .
diff --git a/README b/README
index 38a8b47a..d269e934 100644
--- a/README
+++ b/README
@@ -11,4 +11,4 @@ How to report bugs
 ==================
 
 Bugs should be reported in GitHub
-https://github.com/mate-desktop/mate-file-manager/issues
+https://github.com/mate-desktop/caja/issues
diff --git a/autogen.sh b/autogen.sh
index 81818c92..aad095ca 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,7 +4,7 @@
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-PKG_NAME="mate-file-manager"
+PKG_NAME="caja"
 
 (test -f $srcdir/configure.ac) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
diff --git a/configure.ac b/configure.ac
index f4cab8fe..38b602c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,6 +50,7 @@ case "$with_gtk" in
        GAIL_API_VERSION=-3.0
        ;;
 esac
+AC_SUBST([GTK_API_VERSION])
 
 dnl ===========================================================================
 
diff --git a/distro/archlinux/PKGBUILD b/distro/archlinux/PKGBUILD
deleted file mode 100644
index 8a70e9fd..00000000
--- a/distro/archlinux/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-pkgname=mate-file-manager
-pkgver=1.3.1
-pkgrel=1
-pkgdesc="The MATE shell and file manager"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libexif' 'exempi' 'mate-icon-theme' 'shared-mime-info'
-         'desktop-file-utils' 'gvfs' 'libunique' 'mate-desktop')
-makedepends=('pkgconfig' 'intltool' 'mate-common')
-url="http://matsusoft.com.ar/projects/mate/"
-options=('!libtool' '!emptydirs')
-install=mate-file-manager.install
-source=()
-sha256sums=()
-groups=('mate')
-
-build() {
-	cd "${srcdir}/../../../"
-
-	./autogen.sh \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--disable-static \
-		--libexecdir=/usr/lib/caja \
-		--enable-unique \
-		--disable-update-mimedb || return 1
-
-	make || return 1
-}
-
-package() {
-	cd "${srcdir}/../../../"
-
-	make MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
-
-	install -m755 -d ${pkgdir}/usr/share/mateconf/schemas
-
-	mateconf-merge-schema ${pkgdir}/usr/share/mateconf/schemas/${pkgname}.schemas --domain ${pkgname} ${pkgdir}/etc/mateconf/schemas/*.schemas || return 1
-	rm -f ${pkgdir}/etc/mateconf/schemas/*.schemas
-}
diff --git a/distro/archlinux/mate-file-manager.install b/distro/archlinux/mate-file-manager.install
deleted file mode 100644
index 3956000b..00000000
--- a/distro/archlinux/mate-file-manager.install
+++ /dev/null
@@ -1,28 +0,0 @@
-pkgname=mate-file-manager
-
-post_install() {
-	usr/sbin/mateconfpkg --install ${pkgname}
-	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-
-	update-desktop-database -q
-
-	update-mime-database usr/share/mime > /dev/null
-}
-
-pre_upgrade() {
-	pre_remove $1
-}
-
-post_upgrade() {
-	post_install $1
-}
-
-pre_remove() {
-	usr/sbin/mateconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-	update-desktop-database -q
-	update-mime-database usr/share/mime > /dev/null
-}
diff --git a/libcaja-extension/Makefile.am b/libcaja-extension/Makefile.am
index 94be10e6..97134728 100644
--- a/libcaja-extension/Makefile.am
+++ b/libcaja-extension/Makefile.am
@@ -70,7 +70,7 @@ introspection_files = \
 	$(libcaja_extension_include_HEADERS) \
 	$(libcaja_extension_la_SOURCES)
 Caja-2.0.gir: libcaja-extension.la Makefile
-Caja_2_0_gir_INCLUDES = Gtk-2.0 Gio-2.0 GLib-2.0
+Caja_2_0_gir_INCLUDES = Gtk-${GTK_API_VERSION} Gio-2.0 GLib-2.0
 Caja_2_0_gir_CFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_builddir) \
diff --git a/po/lv.po b/po/lv.po
index 2499e6e5..2a590420 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -6384,7 +6384,7 @@ msgstr "caja: --geometry nevar tikt izmantots ar vairāk kā vienu URI.\n"
 #: ../src/caja-main.c:555
 #, c-format
 msgid "caja: set erroneously as default application for '%s' content type.\n"
-msgstr "caja: kļūdaini uzstādīja noklusēto lietotni priekš \"%s\" satura tipam.\\n"
+msgstr "caja: kļūdaini uzstādīja noklusēto lietotni priekš \"%s\" satura tipam.\n"
 
 #: ../src/caja-navigation-window-menus.c:127
 msgid "Are you sure you want to clear the list of locations you have visited?"