Codebase list eiciel / 11373e8
Merge branch 'experimental' Conflicts: debian/gbp.conf Michael Biebl 15 years ago
6 changed file(s) with 83 addition(s) and 8 deletion(s). Raw diff Collapse all Expand all
+17
-0
debian/changelog less more
0 eiciel (0.9.6.1-2exp1) experimental; urgency=low
1
2 * debian/control
3 - Build against libnautilus-extension-dev from experimental.
4 - Add Build-Depends on cvs. Apparently autopoint (part of gettext, called
5 by autoreconf) needs it.
6 * debian/rules
7 - Run "autoreconf -vfi" instead of calling libtoolize et al. individually.
8 Closes: #506563
9 * debian/patches/02-gio.patch
10 - Port eiciel to GIO to get rid of the GnomeVFS dependency.
11 Thanks to Andreas Henriksson for the patch.
12 * debian/patches/01-makefile_am.patch
13 - Drop gnomevfs-2 from LDFLAGS.
14
15 -- Michael Biebl <biebl@debian.org> Sat, 06 Dec 2008 12:39:08 +0100
16
017 eiciel (0.9.6.1-2) unstable; urgency=low
118
219 * debian/control
+1
-1
debian/control less more
11 Section: gnome
22 Priority: optional
33 Maintainer: Michael Biebl <biebl@debian.org>
4 Build-Depends: cdbs, debhelper (>= 5.0.0), automake1.9, autoconf, libtool, libacl1-dev, libattr1-dev, libgtkmm-2.4-dev, libnautilus-extension-dev, libgnome2-dev, libgnomeui-dev, libgnomevfs2-dev, pkg-config, quilt
4 Build-Depends: cdbs, debhelper (>= 5.0.0), automake, autoconf, libtool, cvs, libacl1-dev, libattr1-dev, libgtkmm-2.4-dev, libnautilus-extension-dev (>= 2.22), libgnome2-dev, libgnomeui-dev, libgnomevfs2-dev, pkg-config, quilt
55 Standards-Version: 3.8.0
66 Vcs-Git: git://git.debian.org/git/users/biebl/eiciel.git
77 Vcs-Browser: http://git.debian.org/?p=users/biebl/eiciel.git;a=summary
+2
-2
debian/patches/01-makefile_am.patch less more
66 eiciel_CPPFLAGS = -I@top_srcdir@/lib -DDATADIR="\"$(datadir)\"" -DPKGDATADIR="\"$(pkgdatadir)\""
77 eiciel_CXXFLAGS = @GTKMM_CFLAGS@ -Wall
88 -eiciel_LDFLAGS = @GTKMM_LIBS@ @llibreria_acl@
9 +eiciel_LDFLAGS = -lgnomevfs-2 -lgnome-2 -lgnomeui-2 -lgtkmm-2.4 -lnautilus-extension @llibreria_acl@
9 +eiciel_LDFLAGS = -lgnome-2 -lgnomeui-2 -lgtkmm-2.4 -lnautilus-extension @llibreria_acl@
1010 eiciel_SOURCES = \
1111 eiciel_main_controler.cpp \
1212 eiciel_main_controler.hpp \
1515 libeiciel_nautilus_la_CPPFLAGS = -I@top_srcdir@/lib -DDATADIR="\"$(datadir)\"" -DPKGDATADIR="\"$(pkgdatadir)\""
1616 libeiciel_nautilus_la_CXXFLAGS = @GTKMM_CFLAGS@ -Wall
1717 -libeiciel_nautilus_la_LDFLAGS = @GTKMM_LIBS@ @llibreria_acl@ -module -avoid-version
18 +libeiciel_nautilus_la_LDFLAGS = -lgnomevfs-2 -lgnome-2 -lgtkmm-2.4 -lnautilus-extension @llibreria_acl@ -module -avoid-version
18 +libeiciel_nautilus_la_LDFLAGS = -lgnome-2 -lgtkmm-2.4 -lnautilus-extension @llibreria_acl@ -module -avoid-version
1919 libeiciel_nautilus_la_SOURCES = \
2020 eiciel_nautilus_page.cpp \
2121 eiciel_nautilus_page.hpp \
+61
-0
debian/patches/02-gio.patch less more
0 --- eiciel-0.9.6.orig/src/eiciel_nautilus_page.cpp
1 +++ eiciel-0.9.6/src/eiciel_nautilus_page.cpp
2 @@ -23,7 +23,7 @@
3 #include <gtk/gtklabel.h>
4 #include <libnautilus-extension/nautilus-property-page.h>
5 #include <libnautilus-extension/nautilus-property-page-provider.h>
6 -#include <libgnomevfs/gnome-vfs.h>
7 +#include <gio/gio.h>
8 #include <gettext.h>
9
10 #include "eiciel_main_controler.hpp"
11 @@ -98,23 +98,18 @@
12 return NULL;
13 }
14
15 - GnomeVFSURI* guri = gnome_vfs_uri_new(uri);
16 + GFile *guri = g_file_new_for_uri (uri);
17
18 - if (guri == NULL)
19 - {
20 - return NULL;
21 - }
22 // i comprovem que és local
23 - const gchar* scheme = gnome_vfs_uri_get_scheme(guri);
24 - if (strcmp(scheme, "file") != 0)
25 + if (!g_file_has_uri_scheme (guri, "file"))
26 {
27 - g_free(guri);
28 + g_object_unref (guri);
29 return NULL;
30 }
31
32 // Si és local obtenim el path del fitxer
33 - local_file = gnome_vfs_get_local_path_from_uri(uri);
34 - g_free(guri);
35 + local_file = g_file_get_path (guri);
36 + g_object_unref (guri);
37
38 // Alguns fitxers son locals pero no corresponen a un fitxer real
39 if (local_file == NULL)
40 --- eiciel-0.9.6.orig/src/eiciel_container.hpp
41 +++ eiciel-0.9.6/src/eiciel_container.hpp
42 @@ -18,7 +18,6 @@
43 */
44 #include <config.hpp>
45 #include <gtkmm.h>
46 -#include <libgnomevfs/gnome-vfs.h>
47 #include <libgnome/libgnome.h>
48 #include <gettext.h>
49
50 --- eiciel-0.9.6.orig/configure.ac 2008-04-13 18:51:18.000000000 +0200
51 +++ eiciel-0.9.6/configure.ac 2008-04-12 19:18:53.000000000 +0200
52 @@ -38,7 +38,7 @@
53 AC_PROG_LIBTOOL
54
55 dnl Comprovem si hi ha la llibreria gtkmm-2.0
56 -PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 >= 2.4.0 libgnome-2.0 >= 2.10.0 libgnomeui-2.0 >= 2.10.0 gnome-vfs-2.0 >= 2.10.0 libnautilus-extension >= 2.10.0)
57 +PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 >= 2.4.0 libgnome-2.0 >= 2.10.0 libgnomeui-2.0 >= 2.10.0 libnautilus-extension >= 2.10.0)
58
59 AC_MSG_CHECKING([for nautilus extensions directory])
60
+1
-0
debian/patches/series less more
00 01-makefile_am.patch
1 02-gio.patch
+1
-5
debian/rules less more
66 DEB_DH_MAKESHLIBS_ARGS_eiciel := -Xlibeiciel-nautilus
77 DEB_INSTALL_DOCS_eiciel := -XNEWS
88
9
109 post-patches:: debian/stamp-bootstrap
1110
1211 # Update libtool files and regenerate autotools files afterwards.
1312 # config.(guess|sub) is updated by cdbs automatically.
1413 debian/stamp-bootstrap:
15 libtoolize --copy --force
16 aclocal-1.9
17 automake-1.9
18 autoconf
14 autoreconf -vfi
1915 touch debian/stamp-bootstrap
2016
2117 binary-install/eiciel::