disk-manager/disk-manager-1.0.1-3.diff

   1 diff -Naur disk-manager-1.0.1~/configure disk-manager-1.0.1/configure
   2 --- disk-manager-1.0.1~/configure       2009-01-18 13:05:41.000000000 -0600
   3 +++ disk-manager-1.0.1/configure        2009-01-18 13:05:45.000000000 -0600
   4 @@ -752,6 +752,7 @@
   5  INTLTOOL_MSGMERGE
   6  INTLTOOL_XGETTEXT
   7  ALL_LINGUAS
   8 +PYTHON2_7
   9  PYTHON2_4
  10  PYTHON
  11  PYTHON2_5
  12 @@ -6370,6 +6371,91 @@
  13
  14
  15    if test -z "$PYTHON"; then
  16 +    # Extract the first word of "python2.7", so it can be a program name with args.
  17 +set dummy python2.7; ac_word=$2
  18 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
  19 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  20 +if test "${ac_cv_path_PYTHON2_7+set}" = set; then
  21 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  22 +else
  23 +  case $PYTHON2_7 in
  24 +  [\\/]* | ?:[\\/]*)
  25 +  ac_cv_path_PYTHON2_7="$PYTHON2_7" # Let the user override the test with a path.
  26 +  ;;
  27 +  *)
  28 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  29 +for as_dir in $PATH
  30 +do
  31 +  IFS=$as_save_IFS
  32 +  test -z "$as_dir" && as_dir=.
  33 +  for ac_exec_ext in '' $ac_executable_extensions; do
  34 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  35 +    ac_cv_path_PYTHON2_7="$as_dir/$ac_word$ac_exec_ext"
  36 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  37 +    break 2
  38 +  fi
  39 +done
  40 +done
  41 +IFS=$as_save_IFS
  42 +
  43 +  ;;
  44 +esac
  45 +fi
  46 +PYTHON2_7=$ac_cv_path_PYTHON2_7
  47 +if test -n "$PYTHON2_7"; then
  48 +  { echo "$as_me:$LINENO: result: $PYTHON2_7" >&5
  49 +echo "${ECHO_T}$PYTHON2_7" >&6; }
  50 +else
  51 +  { echo "$as_me:$LINENO: result: no" >&5
  52 +echo "${ECHO_T}no" >&6; }
  53 +fi
  54 +
  55 +
  56 +  else
  57 +    PYTHON2_7="$PYTHON"
  58 +  fi
  59 +
  60 +  PYTHON="$PYTHON2_7"
  61 +
  62 +
  63 +  if test -n "$PYTHON"; then
  64 +
  65 +
  66 +            { echo "$as_me:$LINENO: checking whether $PYTHON version is >= 2.7.0" >&5
  67 +echo $ECHO_N "checking whether $PYTHON version is >= 2.7.0... $ECHO_C" >&6; }
  68 +      prog="import sys, string
  69 +# split strings by '.' and convert to numeric.  Append some zeros
  70 +# because we need at least 4 digits for the hex conversion.
  71 +minver = map(int, string.split('2.7.0', '.')) + [0, 0, 0]
  72 +minverhex = 0
  73 +for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i]
  74 +sys.exit(sys.hexversion < minverhex)"
  75 +  if { echo "$as_me:$LINENO: $PYTHON -c "$prog"" >&5
  76 +   ($PYTHON -c "$prog") >&5 2>&5
  77 +   ac_status=$?
  78 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
  79 +   (exit $ac_status); }; then
  80 +  { echo "$as_me:$LINENO: result: yes" >&5
  81 +echo "${ECHO_T}yes" >&6; }
  82 +else
  83 +  { echo "$as_me:$LINENO: result: no" >&5
  84 +echo "${ECHO_T}no" >&6; }; PYTHON=""
  85 +fi
  86 +
  87 +
  88 +
  89 +  fi
  90 +
  91 +  if test -z "$PYTHON"; then
  92 +
  93 +        PYTHON="$_python_save"
  94 +
  95 +
  96 +  _python_save="$PYTHON"
  97 +
  98 +
  99 +
 100 +  if test -z "$PYTHON"; then
 101      # Extract the first word of "python2.4", so it can be a program name with args.
 102  set dummy python2.4; ac_word=$2
 103  { echo "$as_me:$LINENO: checking for $ac_word" >&5
 104 @@ -6608,6 +6694,7 @@
 105
 106
 107    fi
 108 +  fi
 109
 110
 111
 112 diff -Naur disk-manager-1.0.1~/Makefile.in disk-manager-1.0.1/Makefile.in
 113 --- disk-manager-1.0.1~/Makefile.in     2009-01-18 13:05:41.000000000 -0600
 114 +++ disk-manager-1.0.1/Makefile.in      2009-01-18 13:05:45.000000000 -0600
 115 @@ -581,6 +581,8 @@
 116  info-am:
 117
 118  install-data-am:
 119 +       $(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps
 120 +       ln -sf ../icons/hicolor/scalable/apps/@PACKAGE@.svg $(DESTDIR)$(datadir)/pixmaps
 121
 122  install-exec-am: install-binSCRIPTS install-sbinSCRIPTS
 123
 124 diff -Naur disk-manager-1.0.1~/data/disk-manager-check.desktop.in.in disk-manager-1.0.1/data/disk-manager-check.desktop.in.in
 125 --- disk-manager-1.0.1~/data/disk-manager-check.desktop.in.in   2009-01-18 13:05:41.000000000 -0600
 126 +++ disk-manager-1.0.1/data/disk-manager-check.desktop.in.in    2009-01-18 13:06:16.000000000 -0600
 127 @@ -1,12 +1,9 @@
 128  [Desktop Entry]
 129  Version=1.0
 130 -Encoding=UTF-8
 131 -Name=Aucun nom
 132 -_Name=Disk manager
 133 +_Name=Disk Manager
 134  _Comment=Check for new partitions
 135  Icon=disk-manager
 136  Exec=@prefix@/bin/disk-manager --check
 137  Terminal=false
 138  Type=Application
 139 -Categories=
 140 -GenericName[fr_FR]=
 141 +Categories=System;Filesystem;
 142 diff -Naur disk-manager-1.0.1~/data/disk-manager.desktop.in.in disk-manager-1.0.1/data/disk-manager.desktop.in.in
 143 --- disk-manager-1.0.1~/data/disk-manager.desktop.in.in 2009-01-18 13:05:41.000000000 -0600
 144 +++ disk-manager-1.0.1/data/disk-manager.desktop.in.in  2009-01-18 13:05:45.000000000 -0600
 145 @@ -1,12 +1,9 @@
 146  [Desktop Entry]
 147  Version=1.0
 148 -Encoding=UTF-8
 149 -Name=Aucun nom
 150  _Name=Disk Manager
 151  _Comment=Manage filesystem configuration
 152  Icon=disk-manager
 153  Exec=@prefix@@EXEC_PATH@/disk-manager-root
 154  Terminal=false
 155  Type=Application
 156 -Categories=Application;System;Settings
 157 -GenericName[fr_FR]=
 158 +Categories=System;Filesystem;