Merge branch 1.2-pre.1 into trunk (42:43)
git-svn-id: https://svn.outlyer.net/svn/pub/nautilus-follow-symlink/trunk@44 da2faf11-d50b-4b07-92cd-6070d1bd8887
This commit is contained in:
commit
a496b9e8c9
|
@ -1,3 +1,7 @@
|
||||||
|
2011-04-07: Release 1.2.0-pre.1
|
||||||
|
* Compatibility:
|
||||||
|
- Refresh to build against GNOME 3, preliminary support
|
||||||
|
|
||||||
2009-04-30: Release 1.1.0
|
2009-04-30: Release 1.1.0
|
||||||
* Bugfix:
|
* Bugfix:
|
||||||
- Use stock icon instead of hard-wired icon location
|
- Use stock icon instead of hard-wired icon location
|
||||||
|
|
|
@ -19,8 +19,8 @@ DISTCLEANFILES = \
|
||||||
|
|
||||||
harshtest:
|
harshtest:
|
||||||
make
|
make
|
||||||
sudo cp src/.libs/libnautilus-follow-symlink.so /usr/lib/nautilus/extensions-2.0/
|
sudo cp src/.libs/libnautilus-follow-symlink.so /usr/lib/nautilus/extensions-3.0/
|
||||||
killall -9 nautilus
|
-killall -9 nautilus
|
||||||
|
|
||||||
#ACLOCAL_AMFLAGS = -I m4
|
#ACLOCAL_AMFLAGS = -I m4
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
dnl $Id$
|
dnl $Id$
|
||||||
|
|
||||||
AC_INIT(nautilus-follow-symlink, [1.1])
|
AC_INIT(nautilus-follow-symlink, [1.2-pre.1])
|
||||||
AC_CONFIG_SRCDIR([src/follow-symlink.c])
|
AC_CONFIG_SRCDIR([src/follow-symlink.c])
|
||||||
|
|
||||||
dnl Cross-compilation
|
dnl Cross-compilation
|
||||||
|
@ -63,6 +63,8 @@ PKG_CHECK_MODULES(NAUTILUS_EXTENSION, [libnautilus-extension])
|
||||||
dnl Incorporate the result of tests
|
dnl Incorporate the result of tests
|
||||||
CFLAGS="$CFLAGS $GLIB_CFLAGS $NAUTILUS_EXTENSION_CFLAGS"
|
CFLAGS="$CFLAGS $GLIB_CFLAGS $NAUTILUS_EXTENSION_CFLAGS"
|
||||||
LIBS="$LIBS $GLIB_LIBS $NAUTILUS_EXTENSION_LIBS"
|
LIBS="$LIBS $GLIB_LIBS $NAUTILUS_EXTENSION_LIBS"
|
||||||
|
dnl GTK-3 migration safeguard <http://live.gnome.org/GnomeGoals/UseGseal>
|
||||||
|
CFLAGS="$CFLAGS -DGSEAL_ENABLE"
|
||||||
|
|
||||||
cat <<EOF
|
cat <<EOF
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,9 @@
|
||||||
|
nautilus-follow-symlink (1.2.0+pre.1-upstream.1) unstable; urgency=low
|
||||||
|
|
||||||
|
* Preliminary support for GNOME3.
|
||||||
|
|
||||||
|
-- Toni Corvera <outlyer@gmail.com> Thu, 07 Apr 2011 03:24:23 +0200
|
||||||
|
|
||||||
nautilus-follow-symlink (1.1.0-upstream.1) unstable; urgency=low
|
nautilus-follow-symlink (1.1.0-upstream.1) unstable; urgency=low
|
||||||
|
|
||||||
* New release.
|
* New release.
|
||||||
|
|
|
@ -8,7 +8,7 @@ Homepage: http://p.outlyer.net/nautilus-follow-symlink/
|
||||||
|
|
||||||
Package: nautilus-follow-symlink
|
Package: nautilus-follow-symlink
|
||||||
Architecture: any
|
Architecture: any
|
||||||
Depends: ${shlibs:Depends}, ${misc:Depends}, nautilus (>= 2.21)
|
Depends: ${shlibs:Depends}, ${misc:Depends}, nautilus (>= 2.91)
|
||||||
Description: nautilus plugin to open the location pointed by a symlink
|
Description: nautilus plugin to open the location pointed by a symlink
|
||||||
This extension adds a context menu option to symbolic links to
|
This extension adds a context menu option to symbolic links to
|
||||||
folders which opens the pointed folder instead of the symbolic link.
|
folders which opens the pointed folder instead of the symbolic link.
|
||||||
|
|
|
@ -66,7 +66,7 @@ make %{?_smp_mflags}
|
||||||
|
|
||||||
%install
|
%install
|
||||||
make install DESTDIR=%buildroot
|
make install DESTDIR=%buildroot
|
||||||
rm -f $RPM_BUILD_ROOT/%{_libdir}/nautilus/extensions-2.0/*.{l,}a
|
rm -f $RPM_BUILD_ROOT/%{_libdir}/nautilus/extensions-3.0/*.{l,}a
|
||||||
|
|
||||||
# create %{name}.lang with the locale data. To be included by %files
|
# create %{name}.lang with the locale data. To be included by %files
|
||||||
%find_lang %{name}
|
%find_lang %{name}
|
||||||
|
@ -78,7 +78,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/nautilus/extensions-2.0/*.{l,}a
|
||||||
%files -f %{name}.lang
|
%files -f %{name}.lang
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%doc AUTHORS ChangeLog
|
%doc AUTHORS ChangeLog
|
||||||
%_libdir/nautilus/extensions-2.0/*.so
|
%_libdir/nautilus/extensions-3.0/*.so
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
|
|
@ -26,7 +26,6 @@
|
||||||
#include "follow-symlink.h"
|
#include "follow-symlink.h"
|
||||||
|
|
||||||
#include <gio/gio.h>
|
#include <gio/gio.h>
|
||||||
#include <gtk/gtkicontheme.h>
|
|
||||||
|
|
||||||
// Symbolic name of the icon, use to be in /usr/share/icons/gnome/[16x16]/emblems/
|
// Symbolic name of the icon, use to be in /usr/share/icons/gnome/[16x16]/emblems/
|
||||||
#define FSL_ICON_NAME "emblem-symbolic-link"
|
#define FSL_ICON_NAME "emblem-symbolic-link"
|
||||||
|
|
Loading…
Reference in New Issue