WebSVN – pub – Path Comparison – / – /nautilus-follow-symlink/trunk Rev 8 and /nautilus-follow-symlink/trunk Rev 11

Ignore whitespace Rev 8 → Rev 11

 /nautilus-follow-symlink/trunk/configure.in
 ,6 → 1,6
 AC_INIT(src/follow-symlink.c)
-AM_INIT_AUTOMAKE(libnautilus-follow-symlink, "0.5.2")
+AM_INIT_AUTOMAKE(libnautilus-follow-symlink, "0.6.0")
 AC_CONFIG_HEADER(src/config.h)
 dnl default FLAGS
 ,6 → 16,14
 AC_LANG_C
 AC_PROG_CC
+# intltool
+AC_PROG_INTLTOOL(0.18)
+GETTEXT_PACKAGE=nautilus-follow-symlink
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext domain])
+ALL_LINGUAS="ca es" dnl Implied en
+AM_GLIB_GNU_GETTEXT
 # string.h and stdlib.h are used
 dnl defines STDC_HEADERS if ANSI-compliant headers are present
 AC_HEADER_STDC
 ,4 → 43,7
 CFLAGS="$CFLAGS $GLIB_CFLAGS $NAUTILUS_EXTENSION_CFLAGS"
 LIBS="$LIBS $GLIB_LIBS $NAUTILUS_EXTENSION_LIBS"
-AC_OUTPUT(Makefile src/Makefile)
+AC_OUTPUT([Makefile
+  src/Makefile
+  po/Makefile.in
+])

 /nautilus-follow-symlink/trunk/ChangeLog
 ,6 → 1,11
-Iterim milestones:
+Iterim milestones
+These private versions, the version numbering bumps just denote
+that a development milestone is achieved
-.5.2:
+.6.0:
+        * Added support for i18n, updated build-dependancies accordingly
+.5.2 (24 oct 2006):
         * INTERNAL: Corrected includes and function declarations
         * INTERNAL: Switched to the autotools build system
         * BUGFIX: Retrieve libnautilus-extension's directory for installation

 /nautilus-follow-symlink/trunk/src/follow-symlink.c
 ,8 → 132,8
     const char *name;
     const char *tooltip;
-    name = "-> Follow symbolic _link";
-    tooltip = "Open the directory pointed by the currently selected symbolic link";
+    name = _("Follow symbolic _link");
+    tooltip = _("Open the directory pointed by the currently selected symbolic link");
     // (name, label, tip, icon)
     ret = nautilus_menu_item_new("FsymlinkExtension::follow_symlink",

 /nautilus-follow-symlink/trunk/src/nautilus-ext-follow-symlink.c
 ,5 → 1,8
 #include "nautilus-ext-follow-symlink.h"
+#include <locale.h>
+#include <libintl.h>
 #include <glib/gprintf.h>
 /* Public interface */
 ,6 → 14,10
     TRACE();
     FSL_DEBUG_INIT();
+    setlocale(LC_ALL, "");
+    bindtextdomain(GETTEXT_PACKAGE, GNOMELOCALEDIR);
+    textdomain(GETTEXT_PACKAGE);
     g_printf("Initializing nautilus-follow-symlink extension (v.%s)\n", VERSION);
     fsl_register_type(module);

/nautilus-follow-symlink/trunk/src/Makefile.am
1,4 → 1,7

# Required to correctly install the locale files
CPPFLAGS+=-DGNOMELOCALEDIR=\""$(datadir)/locale"\"

nautilus_extension_lib_LTLIBRARIES = libnautilus-follow-symlink.la

# Must be installed in nautilus' extension dir

 /nautilus-follow-symlink/trunk/src/common.h
 ,6 → 9,9
 #include <glib/gmessages.h> /* g_print() */
 #include <glib/gprintf.h>   /* g_printf() */
+#include "libintl.h"
+#define _(STR) gettext(STR)
 #ifdef HAVE_CONFIG_H
     #include "config.h"
 #endif // HAVE_CONFIG_H

 /nautilus-follow-symlink/trunk/Makefile.am
 ,5 → 1,26
-SUBDIRS = src
+SUBDIRS = po src
 # This doesn't work as expected
 libdir = @libdir@/nautilus/extensions-1.0
+EXTRA_DIST = dist
+# Extra files to get rid of when distcleaning
+DISTCLEANFILES = \
+        intltool-extract \
+        intltool-merge \
+        intltool-update \
+        \
+        intltool-extract.in \
+        intltool-merge.in \
+        intltool-update.in \
+        \
+        libtool \
+        libtool.m4 \
+        ltmain.sh \
+        ltoptions.m4 \
+        ltsugar.m4 \
+        ltversion.m4 \
+        \
+        po/Makefile.in.in

 /nautilus-follow-symlink/trunk/po/es.po
 ,0 → 1,26
+# Spanish translations for libnautilus-follow-symlink package
+# Traducciones al español para el paquete libnautilus-follow-symlink.
+# Copyright (C) 2006 THE libnautilus-follow-symlink'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the libnautilus-follow-symlink package.
+# Toni Corvera <outlyer@outlyer.net>, 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: libnautilus-follow-symlink\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-10-24 19:07+0200\n"
+"PO-Revision-Date: 2006-10-24 19:09+0200\n"
+"Last-Translator: Toni Corvera <outlyer@outlyer.net>\n"
+"Language-Team: Spanish <outlyer@outlyer.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ../src/follow-symlink.c:135
+msgid "Follow symbolic _link"
+msgstr "Seguir en_lace simbólico"
+#: ../src/follow-symlink.c:136
+msgid "Open the directory pointed by the currently selected symbolic link"
+msgstr "Abrir el directoro apuntado por el enlace simbólico seleccionado actualmente"

/nautilus-follow-symlink/trunk/po/POTFILES.in
0,0 → 1,0
src/follow-symlink.c

 /nautilus-follow-symlink/trunk/po/ca.po
 ,0 → 1,24
+# Catalan translations for libnautilus-follow-symlink package.
+# Copyright (C) 2006 THE libnautilus-follow-symlink'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the libnautilus-follow-symlink package.
+# Toni Corvera <outlyer@outlyer.net>, 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: libnautilus-follow-symlink\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-10-24 19:07+0200\n"
+"PO-Revision-Date: 2006-10-24 19:37+0200\n"
+"Last-Translator: Toni Corvera <outlyer@outlyer.net>\n"
+"Language-Team: Catalan <outlyer@outlyer.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+#: ../src/follow-symlink.c:135
+msgid "Follow symbolic _link"
+msgstr "Segueix l'en_llaç simbòlic"
+#: ../src/follow-symlink.c:136
+msgid "Open the directory pointed by the currently selected symbolic link"
+msgstr "Obre el directori apuntat per l'enllça simbòlic seleccionat"

 /nautilus-follow-symlink/trunk/po/libnautilus-follow-symlink.pot
 ,0 → 1,25
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-10-24 19:07+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+#: ../src/follow-symlink.c:135
+msgid "Follow symbolic _link"
+msgstr ""
+#: ../src/follow-symlink.c:136
+msgid "Open the directory pointed by the currently selected symbolic link"
+msgstr ""

 /nautilus-follow-symlink/trunk/BUILD
 ,11 → 6,12
         $ ./dist
 * Configure
-        $ ./configure
+        $ ./configure --prefix=/usr
-        Note that this being a nautilus extension, the --prefix is not really needed
-        as there's no real flexibility on where to install them. The appropiate place
-        will be checked on install time.
+        Note that this being a nautilus extension, the --prefix is not really used
+        at installation time as there's no real flexibility on where to install them
+        (the appropiate place will be checked on install time). BUT it should match
+        gnome's locale dir.
 * Compile
         $ make

 /nautilus-follow-symlink/trunk/debian/changelog
 ,3 → 1,12
+nautilus-follow-symlink (0.6.0-out.1) experimental; urgency=low
+  * New upstream release
+  * debian/control:
+    - Added intltool and gettext (new requirements of 0.6)
+    - Corrected Build-Depends
+ -- Toni Corvera <outlyer@outlyer.net>  Tue, 24 Oct 2006 20:25:12 +0200
 nautilus-follow-symlink (0.5.2-out.2) unstable; urgency=low
   * debian/rules: Install upstream ChangeLog

 /nautilus-follow-symlink/trunk/debian/control
 ,12 → 2,11
 Section: contrib/gnome
 Priority: extra
 Maintainer: Toni Corvera <outlyer@outlyer.net>
-Build-Depends: debhelper (>= 4.0.0)
+Build-Depends: debhelper (>= 4.0.0), gcc, libtool, pkg-config, libc6-dev, libglib2.0-dev, libnautilus-extension-dev, intltool (>= 0.18), gettext, automaken, autoconf
 Standards-Version: 3.6.2
 Package: nautilus-follow-symlink
 Architecture: any
-Build-Depends: gcc, libtool, pkg-config, libc6-dev, libglib2.0-dev, libnautilus-extension-dev
 Depends: ${shlibs:Depends}, ${misc:Depends}, nautilus
 Description: nautilus plugin to open the location pointed by a symlink
  This extension adds a context menu option to symbolic links to

 /nautilus-follow-symlink/trunk/dist
 ,6 → 10,7
 gen:
         libtoolize
+        intltoolize
         aclocal -I .
         autoconf
         autoheader
 ,5 → 27,10
         rm -f config.* depcomp install-sh missing src/config.h src/config.h.in
         rm -f aclocal.m4
         rm -f configure Makefile Makefile.in src/Makefile src/Makefile.in
+        # The following are moved thanks to Makefile.am (var DISTCLEANFILES)
+        # (kept for situations in which make distclean fails)
         # Undo libtoolize
         rm -f libtool.m4 lt*.m4 ltmain.sh libtool
+        # Undo intltoolize
+        rm -f intltool*
+        rm -f po/Makefile.in.in

Subversion Repositories pub

Compare Revisions

Ignore whitespace Rev 8 → Rev 11

/nautilus-follow-symlink/trunk/.
Property changes:
Modified: svn:mergeinfo
Merged /nautilus-follow-symlink/branches/0.6.0:r10