gdiff-ext/gdiff-ext-0.3.2.diff

   1 diff -Naur diff-ext-0.3.2~/data/Makefile.in diff-ext-0.3.2/data/Makefile.in
   2 --- diff-ext-0.3.2~/data/Makefile.in    2009-10-21 14:58:22.000000000 -0500
   3 +++ diff-ext-0.3.2/data/Makefile.in     2009-10-21 14:58:32.000000000 -0500
   4 @@ -56,7 +56,7 @@
   5  am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
   6  am__installdirs = "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(schemasdir)"
   7  desktopDATA_INSTALL = $(INSTALL_DATA)
   8 -schemasDATA_INSTALL = $(INSTALL_DATA)
   9 +schemasDATA_INSTALL = gconf-merge-schema
  10  DATA = $(desktop_DATA) $(schemas_DATA)
  11  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  12  ACLOCAL = @ACLOCAL@
  13 @@ -260,7 +260,7 @@
  14         test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
  15         @list='$(desktop_DATA)'; for p in $$list; do \
  16           if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
  17 -         f=$(am__strip_dir) \
  18 +         f=g$(am__strip_dir) \
  19           echo " $(desktopDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(desktopdir)/$$f'"; \
  20           $(desktopDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(desktopdir)/$$f"; \
  21         done
  22 @@ -277,9 +277,9 @@
  23         test -z "$(schemasdir)" || $(MKDIR_P) "$(DESTDIR)$(schemasdir)"
  24         @list='$(schemas_DATA)'; for p in $$list; do \
  25           if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
  26 -         f=$(am__strip_dir) \
  27 -         echo " $(schemasDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(schemasdir)/$$f'"; \
  28 -         $(schemasDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(schemasdir)/$$f"; \
  29 +         f=g$(am__strip_dir) \
  30 +         echo " $(schemasDATA_INSTALL) '$(DESTDIR)$(schemasdir)/$$f' '$$d$$p'"; \
  31 +         $(schemasDATA_INSTALL) "$(DESTDIR)$(schemasdir)/$$f" "$$d$$p"; \
  32         done
  33
  34  uninstall-schemasDATA:
  35 diff -Naur diff-ext-0.3.2~/configure diff-ext-0.3.2/configure
  36 --- diff-ext-0.3.2~/configure   2009-10-21 14:58:22.000000000 -0500
  37 +++ diff-ext-0.3.2/configure    2009-10-21 14:58:32.000000000 -0500
  38 @@ -2324,7 +2324,7 @@
  39  fi
  40
  41    if test "${ac_cv_path_mkdir+set}" = set; then
  42 -    MKDIR_P="$ac_cv_path_mkdir -p"
  43 +    MKDIR_P="install -d -m 755"
  44    else
  45      # As a last resort, use the slow shell script.  Don't cache a
  46      # value for MKDIR_P within a source directory, because that will
  47 @@ -2448,7 +2448,7 @@
  48
  49
  50  # Define the identity of the package.
  51 - PACKAGE=diff-ext
  52 + PACKAGE=gdiff-ext
  53   VERSION=0.3.2
  54
  55
  56 @@ -11965,7 +11965,7 @@
  57  $as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
  58
  59    if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
  60 -    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
  61 +    GCONF_SCHEMA_FILE_DIR='$(datarootdir)/gconf/schemas'
  62    fi
  63
  64
  65 diff -Naur diff-ext-0.3.2~/Makefile.in diff-ext-0.3.2/Makefile.in
  66 --- diff-ext-0.3.2~/Makefile.in 2009-10-21 14:58:22.000000000 -0500
  67 +++ diff-ext-0.3.2/Makefile.in  2009-10-21 14:58:32.000000000 -0500
  68 @@ -234,10 +234,9 @@
  69  SUBDIRS = diff-ext setup po data
  70
  71  # no ${docdir} for autoconf 2.59, so replace it with ${datadir}/doc/diff-ext
  72 -diff_extdocdir = ${datadir}/doc/diff-ext
  73 +diff_extdocdir = ${datadir}/licenses/@PACKAGE@
  74  diff_extdoc_DATA = \
  75 -  AUTHORS \
  76 -  ChangeLog
  77 +  COPYING
  78
  79  EXTRA_DIST = \
  80    $(diff_extdoc_DATA) \
  81 diff -Naur diff-ext-0.3.2~/setup/Makefile.in diff-ext-0.3.2/setup/Makefile.in
  82 --- diff-ext-0.3.2~/setup/Makefile.in   2009-10-21 14:58:22.000000000 -0500
  83 +++ diff-ext-0.3.2/setup/Makefile.in    2009-10-21 14:59:25.000000000 -0500
  84 @@ -294,7 +294,7 @@
  85         test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
  86         @list='$(icons_DATA)'; for p in $$list; do \
  87           if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
  88 -         f=$(am__strip_dir) \
  89 +         f=g$(am__strip_dir) \
  90           echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
  91           $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
  92         done
  93 diff -Naur diff-ext-0.3.2~/setup/src/Makefile.in diff-ext-0.3.2/setup/src/Makefile.in
  94 --- diff-ext-0.3.2~/setup/src/Makefile.in       2009-10-21 14:58:22.000000000 -0500
  95 +++ diff-ext-0.3.2/setup/src/Makefile.in        2009-10-21 14:58:32.000000000 -0500
  96 @@ -32,7 +32,7 @@
  97  POST_UNINSTALL = :
  98  build_triplet = @build@
  99  host_triplet = @host@
 100 -bin_PROGRAMS = diff-ext-setup$(EXEEXT)
 101 +bin_PROGRAMS = gdiff-ext-setup$(EXEEXT)
 102  subdir = setup/src
 103  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 104  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 105 @@ -291,8 +291,8 @@
 106           echo " rm -f $$p $$f"; \
 107           rm -f $$p $$f ; \
 108         done
 109 -diff-ext-setup$(EXEEXT): $(diff_ext_setup_OBJECTS) $(diff_ext_setup_DEPENDENCIES)
 110 -       @rm -f diff-ext-setup$(EXEEXT)
 111 +gdiff-ext-setup$(EXEEXT): $(diff_ext_setup_OBJECTS) $(diff_ext_setup_DEPENDENCIES)
 112 +       @rm -f gdiff-ext-setup$(EXEEXT)
 113         $(LINK) $(diff_ext_setup_OBJECTS) $(diff_ext_setup_LDADD) $(LIBS)
 114
 115  mostlyclean-compile:
 116 diff -Naur diff-ext-0.3.2~/diff-ext/src/main.c diff-ext-0.3.2/diff-ext/src/main.c
 117 --- diff-ext-0.3.2~/diff-ext/src/main.c 2009-10-21 14:58:22.000000000 -0500
 118 +++ diff-ext-0.3.2/diff-ext/src/main.c  2009-10-21 14:58:32.000000000 -0500
 119 @@ -59,7 +59,7 @@
 120    if(gdk_spawn_on_screen(screen, 0, argv, 0, G_SPAWN_FILE_AND_ARGV_ZERO | G_SPAWN_SEARCH_PATH, 0, 0, 0, 0) == FALSE) {
 121      GtkWindow* parent = GTK_WINDOW(gtk_widget_get_ancestor(window, GTK_TYPE_WINDOW));
 122      GtkMessageDialog* dialog = gtk_message_dialog_new(parent, GTK_DIALOG_DESTROY_WITH_PARENT,
 123 -      GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _("Could not launch comparison tool ('%s').\nPlease run diff-ext-setup and verify comparison tool configuration"), diff_tool);
 124 +      GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _("Could not launch comparison tool ('%s').\nPlease run gdiff-ext-setup and verify comparison tool configuration"), diff_tool);
 125   /* Destroy the dialog when the user responds to it (e.g. clicks a button) */
 126       g_signal_connect_swapped(dialog, "response", G_CALLBACK(gtk_widget_destroy), dialog);
 127       gtk_widget_show_all(GTK_WIDGET(dialog));
 128 @@ -89,7 +89,7 @@
 129    if(gdk_spawn_on_screen(screen, 0, argv, 0, G_SPAWN_FILE_AND_ARGV_ZERO | G_SPAWN_SEARCH_PATH, 0, 0, 0, 0) == FALSE) {
 130      GtkWindow* parent = GTK_WINDOW(gtk_widget_get_ancestor(window, GTK_TYPE_WINDOW));
 131      GtkMessageDialog* dialog = gtk_message_dialog_new(parent, GTK_DIALOG_DESTROY_WITH_PARENT,
 132 -      GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _("Could not launch 3-way comparison tool ('%s').\nPlease run diff-ext-setup and verify 3-way comparison tool configuration"), diff3_tool);
 133 +      GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _("Could not launch 3-way comparison tool ('%s').\nPlease run gdiff-ext-setup and verify 3-way comparison tool configuration"), diff3_tool);
 134   /* Destroy the dialog when the user responds to it (e.g. clicks a button) */
 135       g_signal_connect_swapped(dialog, "response", G_CALLBACK(gtk_widget_destroy), dialog);
 136       gtk_widget_show_all(GTK_WIDGET(dialog));
 137 diff -Naur diff-ext-0.3.2~/data/diff-ext.desktop.in diff-ext-0.3.2/data/diff-ext.desktop.in
 138 --- diff-ext-0.3.2~/data/diff-ext.desktop.in    2009-10-21 14:58:22.000000000 -0500
 139 +++ diff-ext-0.3.2/data/diff-ext.desktop.in     2009-10-21 14:58:32.000000000 -0500
 140 @@ -1,8 +1,8 @@
 141  [Desktop Entry]
 142  Version=1.0
 143  Type=Application
 144 -Name=Diff-ext
 145 +Name=gdiff-ext configuration
 146  Comment=Configure diff-ext nautilus extension
 147  Exec=diff-ext-setup
 148 -Icon=de
 149 +Icon=gde
 150  Categories=Development;