]> git.pld-linux.org Git - packages/captive.git/commitdiff
projects / packages / captive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 33c1e54)
- updated for 1.1.6.1
authortommat <tommat@pld-linux.org>
Thu, 26 Jan 2006 12:17:00 +0000 (12:17 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    captive-non_root_install.patch -> 1.2
    captive-popt_link.patch -> 1.2

captive-non_root_install.patch patch | blob | blame | history
captive-popt_link.patch patch | blob | blame | history

diff --git a/captive-non_root_install.patch b/captive-non_root_install.patch
index 08e473f00ae15d9dcc597728df11bc0e6a62bdc8..35a4f84922db4033869343e7f3504c9476a92a3d 100644 (file)
--- a/captive-non_root_install.patch
+++ b/captive-non_root_install.patch
@@ -1,24 +1,22 @@
-diff -burN captive-1.1.5.orig/src/client/sandbox-server/Makefile.am captive-1.1.5/src/client/sandbox-server/Makefile.am
---- captive-1.1.5.orig/src/client/sandbox-server/Makefile.am   2004-09-07 14:07:06.000000000 +0200
-+++ captive-1.1.5/src/client/sandbox-server/Makefile.am        2004-09-07 14:09:43.000000000 +0200
+--- captive-1.1.6.1/src/client/sandbox-server/Makefile.am.orig 2006-01-12 11:42:12.725321000 +0100
++++ captive-1.1.6.1/src/client/sandbox-server/Makefile.am      2006-01-12 11:44:37.135321000 +0100
 @@ -23,7 +23,7 @@
- captive_sandbox_server_CFLAGS=$(ORBIT_CFLAGS) $(LINC_CFLAGS)
- captive_sandbox_server_LDADD =$(ORBIT_LIBS)   $(LINC_LIBS)   $(captive_library) $(INTLLIBS)
- sbin_PROGRAMS+=captive-sandbox-server
--sbinPROGRAMS_INSTALL=${INSTALL} -o root -g root -m 4755
-+sbinPROGRAMS_INSTALL=${INSTALL}
+ captive_sandbox_server_CFLAGS=$(ORBIT_CFLAGS) $(LINC_CFLAGS) $(GNOME_VFS_CFLAGS) $(LIBXML_CFLAGS) 
+ captive_sandbox_server_LDADD =$(ORBIT_LIBS)   $(LINC_LIBS)   $(GNOME_VFS_LIBS)   $(LIBXML_LIBS)   $(captive_library) $(INTLLIBS)
+ libexec_PROGRAMS=captive-sandbox-server
+-libexecPROGRAMS_INSTALL=${INSTALL} -o root -g root -m 4755
++libexecPROGRAMS_INSTALL=${INSTALL}
  EXTRA_DIST+=.gdbinit
  
  install-data-hook:
-diff -burN captive-1.1.5.orig/src/client/sandbox-server/Makefile.in captive-1.1.5/src/client/sandbox-server/Makefile.in
---- captive-1.1.5.orig/src/client/sandbox-server/Makefile.in   2004-09-07 14:07:06.000000000 +0200
-+++ captive-1.1.5/src/client/sandbox-server/Makefile.in        2004-09-07 14:43:27.369974344 +0200
-@@ -304,7 +304,7 @@
+--- captive-1.1.6.1/src/client/sandbox-server/Makefile.in.orig 2005-12-29 05:27:21.000000000 +0100
++++ captive-1.1.6.1/src/client/sandbox-server/Makefile.in      2006-01-12 11:45:05.065321000 +0100
+@@ -401,7 +401,7 @@
  
- captive_sandbox_server_CFLAGS = $(ORBIT_CFLAGS) $(LINC_CFLAGS)
- captive_sandbox_server_LDADD = $(ORBIT_LIBS)   $(LINC_LIBS)   $(captive_library) $(INTLLIBS)
--sbinPROGRAMS_INSTALL = ${INSTALL} -o root -g root -m 4755
-+sbinPROGRAMS_INSTALL = ${INSTALL}
+ captive_sandbox_server_CFLAGS = $(ORBIT_CFLAGS) $(LINC_CFLAGS) $(GNOME_VFS_CFLAGS) $(LIBXML_CFLAGS) 
+ captive_sandbox_server_LDADD = $(ORBIT_LIBS)   $(LINC_LIBS)   $(GNOME_VFS_LIBS)   $(LIBXML_LIBS)   $(captive_library) $(INTLLIBS)
+-libexecPROGRAMS_INSTALL = ${INSTALL} -o root -g root -m 4755
++libexecPROGRAMS_INSTALL = ${INSTALL}
  @ENABLE_MAN_PAGES_TRUE@captive_sandbox_server_man_cond = captive-sandbox-server.1
  man_MANS = $(captive_sandbox_server_man_cond)
- subdir = ./src/client/sandbox-server
+ all: $(BUILT_SOURCES)
diff --git a/captive-popt_link.patch b/captive-popt_link.patch
index 8fc6f6c61a791e51debc55ed9f3d91d9279a8b23..4a110b50019d82861087301956dff961db1bbed7 100644 (file)
--- a/captive-popt_link.patch
+++ b/captive-popt_link.patch
@@ -1,24 +1,33 @@
-diff -burN captive-1.1.5.orig/src/client/cmdline/Makefile.in captive-1.1.5/src/client/cmdline/Makefile.in
---- captive-1.1.5.orig/src/client/cmdline/Makefile.in  2005-08-07 20:25:25.000000000 +0000
-+++ captive-1.1.5/src/client/cmdline/Makefile.in       2005-08-07 21:30:33.000000000 +0000
-@@ -346,7 +346,7 @@
+--- captive-1.1.6.1/src/client/cmdline/Makefile.am.orig        2006-01-25 19:06:11.657593000 +0100
++++ captive-1.1.6.1/src/client/cmdline/Makefile.am     2006-01-25 19:06:30.497593000 +0100
+@@ -64,7 +64,7 @@
+               utf8.c \
                utf8.h
+ captive_cmdline_CFLAGS=                   $(GNOME_VFS_CFLAGS) $(LIBXML_CFLAGS) 
+-captive_cmdline_LDADD =$(captive_library) $(GNOME_VFS_LIBS)   $(LIBXML_LIBS)   $(READLINE_LIBS) $(INTLLIBS)
++captive_cmdline_LDADD =$(captive_library) $(GNOME_VFS_LIBS)   $(LIBXML_LIBS)   $(READLINE_LIBS) $(INTLLIBS) $(POPT_LIBS)
+ captive_cmdline_LDFLAGS=$(READLINE_LDFLAGS)
+ bin_PROGRAMS+=captive-cmdline
  
- captive_cmdline_CFLAGS = $(GNOME_VFS_CFLAGS)
--captive_cmdline_LDADD = $(captive_library) $(GNOME_VFS_LIBS)   $(READLINE_LIBS) $(INTLLIBS)
-+captive_cmdline_LDADD = $(captive_library) $(GNOME_VFS_LIBS)   $(READLINE_LIBS) $(INTLLIBS) $(POPT_LIBS)
- captive_cmdline_LDFLAGS = $(READLINE_LDFLAGS)
- @ENABLE_MAN_PAGES_TRUE@captive_cmdline_man_cond = captive-cmdline.1
- man_MANS = $(captive_cmdline_man_cond)
-diff -burN captive-1.1.5.orig/src/client/sandbox-server/Makefile.in captive-1.1.5/src/client/sandbox-server/Makefile.in
---- captive-1.1.5.orig/src/client/sandbox-server/Makefile.in   2005-08-07 20:25:25.000000000 +0000
-+++ captive-1.1.5/src/client/sandbox-server/Makefile.in        2005-08-07 21:31:14.000000000 +0000
-@@ -303,7 +303,7 @@
+--- captive-1.1.6.1/src/client/sandbox-server/Makefile.am.orig 2006-01-25 19:06:58.687593000 +0100
++++ captive-1.1.6.1/src/client/sandbox-server/Makefile.am      2006-01-25 19:07:08.547593000 +0100
+@@ -21,7 +21,7 @@
+ captive_sandbox_server_SOURCES= \
                main.c
+ captive_sandbox_server_CFLAGS=$(ORBIT_CFLAGS) $(LINC_CFLAGS) $(GNOME_VFS_CFLAGS) $(LIBXML_CFLAGS) 
+-captive_sandbox_server_LDADD =$(ORBIT_LIBS)   $(LINC_LIBS)   $(GNOME_VFS_LIBS)   $(LIBXML_LIBS)   $(captive_library) $(INTLLIBS)
++captive_sandbox_server_LDADD =$(ORBIT_LIBS)   $(LINC_LIBS)   $(GNOME_VFS_LIBS)   $(LIBXML_LIBS)   $(captive_library) $(INTLLIBS) $(POPT_LIBS)
+ libexec_PROGRAMS=captive-sandbox-server
+ libexecPROGRAMS_INSTALL=${INSTALL}
+ EXTRA_DIST+=.gdbinit
+--- captive-1.1.6.1/src/client/fuse/Makefile.am.orig   2006-01-26 12:16:41.567593000 +0100
++++ captive-1.1.6.1/src/client/fuse/Makefile.am        2006-01-26 12:16:58.597593000 +0100
+@@ -65,7 +65,7 @@
+               main.c \
+               main.h
+ mount_captive_CFLAGS=                   $(GNOME_VFS_CFLAGS) $(LIBXML_CFLAGS) $(FUSE_CFLAGS)
+-mount_captive_LDADD =$(captive_library) $(GNOME_VFS_LIBS)   $(LIBXML_LIBS)   $(FUSE_LIBS)   $(INTLLIBS)
++mount_captive_LDADD =$(captive_library) $(GNOME_VFS_LIBS)   $(LIBXML_LIBS)   $(FUSE_LIBS)   $(INTLLIBS) $(POPT_LIBS)
+ mount_captive_LDFLAGS=$(READLINE_LDFLAGS)
  
- captive_sandbox_server_CFLAGS = $(ORBIT_CFLAGS) $(LINC_CFLAGS)
--captive_sandbox_server_LDADD = $(ORBIT_LIBS)   $(LINC_LIBS)   $(captive_library) $(INTLLIBS)
-+captive_sandbox_server_LDADD = $(ORBIT_LIBS)   $(LINC_LIBS)   $(captive_library) $(INTLLIBS) $(POPT_LIBS)
- sbinPROGRAMS_INSTALL = ${INSTALL}
- @ENABLE_MAN_PAGES_TRUE@captive_sandbox_server_man_cond = captive-sandbox-server.1
- man_MANS = $(captive_sandbox_server_man_cond)
+ mount_captive_CFLAGS+=-DLIBEXECDIR="$(libexecdir)"
Captive - NTFS read/write filesystem for Linux
This page took 0.09804 seconds and 4 git commands to generate.