Merge branch 1.0.2 into trunk (33:34)

git-svn-id: https://svn.outlyer.net/svn/pub/nautilus-follow-symlink/trunk@35 da2faf11-d50b-4b07-92cd-6070d1bd8887

ChangeLog

@@ -1,7 +1,10 @@
-1.0.1:
+1.0.2: (2007-05-12)
+	* BUGFIX: Fixed icon location, was broken on newer systems
+
+1.0.1: (2006-12-14)
 	* BUGFIX: Show correctly file names with underscores
 	* BUGFIX: Fixed compilation on 64bits archs (__unused can't be defined)
 	* BUGFIX: Require automake 1.9, which was actually used
 
-1.0: Initial public release
+1.0: Initial public release (2006-11-10)
 

configure.in

@@ -1,6 +1,6 @@
 
 AC_INIT(src/follow-symlink.c)
-AM_INIT_AUTOMAKE([ 1.9 libnautilus-follow-symlink ], "1.0.1")
+AM_INIT_AUTOMAKE([ 1.9 libnautilus-follow-symlink ], "1.0.2")
 AC_CONFIG_HEADER(src/config.h)
 
 dnl default FLAGS
@@ -9,7 +9,7 @@ CFLAGS="$CFLAGS -O -Wall -Werror -Winline"
 LDFLAGS="$LDFLAGS -Wl,--as-needed"
 
 # FIXME: Make this better
-FSL_ICON="/usr/share/icons/gnome/48x48/emblems/emblem-symbolic-link.png"
+FSL_ICON="/usr/share/icons/gnome/16x16/emblems/emblem-symbolic-link.png"
 AC_SUBST(FSL_ICON)
 AC_DEFINE_UNQUOTED(FSL_ICON, "$FSL_ICON", [follow-symlink menu icon])
 

debian/changelog

@@ -1,3 +1,9 @@
+nautilus-follow-symlink (1.0.2-out.1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Toni Corvera <outlyer@outlyer.net>  Sat, 12 May 2007 21:35:32 +0200
+
 nautilus-follow-symlink (1.0.1-out.1) unstable; urgency=low
 
   * New upstream version

dist

@@ -2,7 +2,7 @@
 
 # $Id$
 
-UPSTREAM_URL=http://proyectos.outlyer.net/nautilus-follow-symlink
+UPSTREAM_URL=http://p.outlyer.net/nautilus-follow-symlink
 
 dist: gen