Re: [inkscape] Impossible to change font if ttf-bitstream-vera is not installed.
Le Wed, Oct 22, 2008 at 07:21:44PM +0200, Thomas Viehmann a écrit :
> Adeodato Simó wrote:
> > Charles, if the fix for this bug is simply adding a depends on
> > ttf-bitstream-vera, then the fix is suitable for lenny, and we'll
> > happily unblock it.
> >
> Can we have a proper fix, though, please?
> Bug #461308 will not be ready for action before squeeze, but I don't
> think we should add recommends and depends on that now, in particular
> Charles, if you don't know how to properly fix it yourself, please at
> least let others have a look, say until the weekend.
Hi all,
I prepared a NMU, that I propose to upload on DELAYED/10. Unless the
release is to happen in 20 days, it will ensure long time for the
maintainer to react, for hackers to solve the problem more smartly, and
for users to test the package.
While reviewing the BTS page of inkscape, I found two other bugs that
can be resolved by the addition of dependancies, in that case of the
"Suggests" level. For one of them, it is also necessary to include a
patch to take into acount the renaming of the "uniconv" program in
Debian. This patch is present in Ubuntu and does not seem to be
problematic. Lastly, I fixed the menu entry.
I attached the debdiff. As you can see, it is inflated by two
Autoconf/make files:
aqwa『tmp』$ lsdiff inkscape_0.46-2.1_0.46.2.2_debdiff.txt
inkscape-0.46/configure
inkscape-0.46/debian/inkscape.menu
inkscape-0.46/debian/control
inkscape-0.46/debian/changelog
inkscape-0.46/aclocal.m4
inkscape-0.46/debian/patches/02_uniconvertor_binary_name.dpatch
Have a nice day,
--
Charles Plessy
Tsurumi, Kanagawa, Japan
diff -u inkscape-0.46/configure inkscape-0.46/configure
--- inkscape-0.46/configure
+++ inkscape-0.46/configure
@@ -680,6 +680,9 @@
AMTAR
am__tar
am__untar
+INTLTOOL_UPDATE
+INTLTOOL_MERGE
+INTLTOOL_EXTRACT
INTLTOOL_DESKTOP_RULE
INTLTOOL_DIRECTORY_RULE
INTLTOOL_KEYS_RULE
@@ -702,9 +705,6 @@
XGETTEXT
MSGMERGE
MSGFMT
-INTLTOOL_EXTRACT
-INTLTOOL_MERGE
-INTLTOOL_UPDATE
INTLTOOL_PERL
ALL_LINGUAS
CC
@@ -3718,8 +3718,8 @@
echo $ECHO_N "checking for intltool >= 0.22... $ECHO_C" >&6; }
INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.22 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
- INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
- INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
+ INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+ INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
{ echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; }
@@ -3729,6 +3729,132 @@
{ (exit 1); exit 1; }; }
fi
+# Extract the first word of "intltool-update", so it can be a program name with args.
+set dummy intltool-update; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $INTLTOOL_UPDATE in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_INTLTOOL_UPDATE="$INTLTOOL_UPDATE" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
+if test -n "$INTLTOOL_UPDATE"; then
+ { echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
+echo "${ECHO_T}$INTLTOOL_UPDATE" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+# Extract the first word of "intltool-merge", so it can be a program name with args.
+set dummy intltool-merge; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $INTLTOOL_MERGE in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_INTLTOOL_MERGE="$INTLTOOL_MERGE" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
+if test -n "$INTLTOOL_MERGE"; then
+ { echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
+echo "${ECHO_T}$INTLTOOL_MERGE" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+# Extract the first word of "intltool-extract", so it can be a program name with args.
+set dummy intltool-extract; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $INTLTOOL_EXTRACT in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_INTLTOOL_EXTRACT="$INTLTOOL_EXTRACT" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
+if test -n "$INTLTOOL_EXTRACT"; then
+ { echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
+echo "${ECHO_T}$INTLTOOL_EXTRACT" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
+ { { echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
+echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
@@ -3904,14 +4030,6 @@
{ (exit 1); exit 1; }; }
fi
-# Use the tools built into the package, not the ones that are installed.
-INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
-
-INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
-
-INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
-
-
# Extract the first word of "perl", so it can be a program name with args.
set dummy perl; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -4124,10 +4242,6 @@
-ac_config_commands="$ac_config_commands intltool"
-
-
-
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
@@ -14620,6 +14734,12 @@
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
+ case "$host_cpu" in
+ mips|mipsel)
+ CXXFLAGS="$CXXFLAGS -Wa,-xgot"
+ CFLAGS="$CFLAGS -Wa,-xgot"
+ ;;
+ esac
fi
done
@@ -14714,12 +14834,6 @@
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
- case "$host_cpu" in
- mips|mipsel)
- CXXFLAGS="$CXXFLAGS -Wa,-xgot"
- CFLAGS="$CFLAGS -Wa,-xgot"
- ;;
- esac
fi
done
@@ -18773,9 +18887,6 @@
# INIT-COMMANDS
#
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
-prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
-INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}'
_ACEOF
@@ -18788,7 +18899,6 @@
case $ac_config_target in
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
- "intltool") CONFIG_COMMANDS="$CONFIG_COMMANDS intltool" ;;
"default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
@@ -18983,6 +19093,9 @@
AMTAR!$AMTAR$ac_delim
am__tar!$am__tar$ac_delim
am__untar!$am__untar$ac_delim
+INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
+INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
+INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim
INTLTOOL_DIRECTORY_RULE!$INTLTOOL_DIRECTORY_RULE$ac_delim
INTLTOOL_KEYS_RULE!$INTLTOOL_KEYS_RULE$ac_delim
@@ -19005,9 +19118,6 @@
XGETTEXT!$XGETTEXT$ac_delim
MSGMERGE!$MSGMERGE$ac_delim
MSGFMT!$MSGFMT$ac_delim
-INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
-INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
-INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim
ALL_LINGUAS!$ALL_LINGUAS$ac_delim
CC!$CC$ac_delim
@@ -19775,23 +19885,6 @@
done
done
;;
- "intltool":C)
-
-for file in intltool-extract intltool-merge intltool-update; do
- sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
- -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
- -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
- < ${ac_aux_dir}/${file}.in > ${file}.out
- if cmp -s ${file} ${file}.out 2>/dev/null; then
- rm -f ${file}.out
- else
- mv -f ${file}.out ${file}
- fi
- chmod ugo+x ${file}
- chmod u+w ${file}
-done
-
- ;;
"default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*)
sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
esac ;;
diff -u inkscape-0.46/debian/inkscape.menu inkscape-0.46/debian/inkscape.menu
--- inkscape-0.46/debian/inkscape.menu
+++ inkscape-0.46/debian/inkscape.menu
@@ -1,4 +1,4 @@
-?package(inkscape): needs="X11" section="Apps/Graphics"\
+?package(inkscape): needs="X11" section="Applications/Graphics"\
hints="Vector"\
title="Inkscape" command="/usr/bin/inkscape"\
icon="/usr/share/pixmaps/inkscape.xpm"\
diff -u inkscape-0.46/debian/control inkscape-0.46/debian/control
--- inkscape-0.46/debian/control
+++ inkscape-0.46/debian/control
@@ -8,8 +8,9 @@
Package: inkscape
Architecture: any
Depends: ${shlibs:Depends}
-Suggests: dia | dia-gnome, ruby, libxml-xql-perl, python, python-numpy, python-lxml, skencil
-Recommends: libwmf-bin, pstoedit, imagemagick, perlmagick
+Suggests: dia | dia-gnome, ruby, libxml-xql-perl, python, python-numpy, python-uniconvertor, python-lxml, skencil, libgnomevfs2-extra
+Recommends: libwmf-bin, pstoedit, imagemagick, perlmagick, ttf-bitstream-vera
+# ttf-bitstream-vera is there to temporarly solve #496784; you can remove it when the issue is fixed upstream.
Description: vector-based drawing program
Inkscape loads and saves a subset of the SVG (Scalable Vector Graphics)
format, a standard maintained by the WWW consortium.
@@ -27,6 +28,7 @@
dia, libwmf-bin, pstoedit, skencil, imagemagick, and perlmagick.
.
- Other extensions use ruby, libxml-xql-perl, python-numpy, and python-lxml.
- You must have these packages to make full use of all extensions and effects.
+ Other extensions use ruby, libxml-xql-perl, python-numpy, python-lxml, and
+ libgnomevfs2-extra. You must have these packages to make full use of all
+ extensions and effects.
.
Homepage: http://www.inkscape.org/
diff -u inkscape-0.46/debian/changelog inkscape-0.46/debian/changelog
--- inkscape-0.46/debian/changelog
+++ inkscape-0.46/debian/changelog
@@ -1,3 +1,25 @@
+inkscape (0.46-2.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/inkscape.menu: updated to latest Menu sub-policy
+ (Apps -> Applications).
+ * The 'uniconv' program is renamed 'uniconvertor' in Debian.
+ - Closes: #471109, thanks to the patch of Andreas Wenning <awen@awen.dk>.
+ - Added 02_uniconvertor_binary_name.dpatch to rename uniconv in the
+ upstream sources of Inkscape.
+ - Added python-uniconvertor to the list of suggested packages (in contrary
+ to the original patch of A. Wenning, that adds python-uniconvertor to the
+ recommended packages, as I noticed that all python packages are only
+ suggested).
+ * Other changes in debian/control:
+ - Recommended ttf-bitstream-vera, otherwise it is not possible to use other
+ fonts (Closes: #496784). Please remove this dependancy when the bug is
+ fixed upstream, as it is only an ugly workaround.
+ - Suggested libgnomevfs2-extra to import from open clip art library,
+ and updated description to reflect this (Closes: #496785).
+
+ -- Charles Plessy <plessy@debian.org> Sat, 25 Oct 2008 16:01:52 +0900
+
inkscape (0.46-2.1) unstable; urgency=low
* Non-maintainer upload.
only in patch2:
unchanged:
--- inkscape-0.46.orig/aclocal.m4
+++ inkscape-0.46/aclocal.m4
@@ -454,7 +454,7 @@
dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-# serial 36 IT_PROG_INTLTOOL
+# serial 40 IT_PROG_INTLTOOL
AC_DEFUN([IT_PROG_INTLTOOL],
[AC_PREREQ([2.50])dnl
@@ -470,14 +470,21 @@
AC_MSG_CHECKING([for intltool >= $1])
INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
- INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
- [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
+ INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+ [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
]
AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.])
fi
+AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
+AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
+AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
+if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
+ AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
+fi
+
INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
@@ -532,12 +539,7 @@
AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
fi
-# Use the tools built into the package, not the ones that are installed.
-AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
-AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge')
-AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update')
-
-AC_PATH_PROG(INTLTOOL_PERL, perl)
+AC_PATH_PROG(INTLTOOL_PERL, [perl])
if test -z "$INTLTOOL_PERL"; then
AC_MSG_ERROR([perl not found; required for intltool])
fi
@@ -583,42 +585,6 @@
IT_PO_SUBDIR([po])
-dnl The following is very similar to
-dnl
-dnl AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update])
-dnl
-dnl with the following slight differences:
-dnl - the *.in files are in ac_aux_dir,
-dnl - if the file haven't changed upon reconfigure, it's not touched,
-dnl - the evaluation of the third parameter enables a hack which computes
-dnl the actual value of $libdir,
-dnl - the user sees "executing intltool commands", instead of
-dnl "creating intltool-extract" and such.
-dnl
-dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were
-dnl a reason for it.
-
-AC_CONFIG_COMMANDS([intltool], [
-
-for file in intltool-extract intltool-merge intltool-update; do
- sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
- -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
- -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
- < ${ac_aux_dir}/${file}.in > ${file}.out
- if cmp -s ${file} ${file}.out 2>/dev/null; then
- rm -f ${file}.out
- else
- mv -f ${file}.out ${file}
- fi
- chmod ugo+x ${file}
- chmod u+w ${file}
-done
-
-],
-[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
-prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
-INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}'])
-
])
only in patch2:
unchanged:
--- inkscape-0.46.orig/debian/patches/02_uniconvertor_binary_name.dpatch
+++ inkscape-0.46/debian/patches/02_uniconvertor_binary_name.dpatch
@@ -0,0 +1,44 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_uniconvertor_binary_name.dpatch by Andreas Wenning <awen@awen.dk>
+## See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=471109
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad inkscape-0.46~/share/extensions/cdr2svg.sh inkscape-0.46/share/extensions/cdr2svg.sh
+--- inkscape-0.46~/share/extensions/cdr2svg.sh 2008-03-11 05:21:10.000000000 +0100
++++ inkscape-0.46/share/extensions/cdr2svg.sh 2008-05-12 17:13:50.000000000 +0200
+@@ -4,7 +4,7 @@
+ TEMPFILENAME=`mktemp 2>/dev/null || echo "$TMPDIR/$$"`
+ TEMPFILENAME=${TEMPFILENAME}.svg
+
+-uniconv "$1" "${TEMPFILENAME}" > /dev/null 2>&1 || rc=1
++uniconvertor "$1" "${TEMPFILENAME}" > /dev/null 2>&1 || rc=1
+
+ cat < "${TEMPFILENAME}" || rc=1
+ rm -f "${TEMPFILENAME}"
+diff -urNad inkscape-0.46~/share/extensions/cdr_input.inx inkscape-0.46/share/extensions/cdr_input.inx
+--- inkscape-0.46~/share/extensions/cdr_input.inx 2008-03-11 05:21:07.000000000 +0100
++++ inkscape-0.46/share/extensions/cdr_input.inx 2008-05-12 17:13:35.000000000 +0200
+@@ -1,7 +1,7 @@
+ <inkscape-extension>
+ <_name>Corel DRAW Input</_name>
+ <id>org.inkscape.input.cdr</id>
+- <dependency type="executable" location="path">uniconv</dependency>
++ <dependency type="executable" location="path">uniconvertor</dependency>
+ <dependency type="executable" location="extensions">cdr2svg.sh</dependency>
+ <input>
+ <extension>.cdr</extension>
+diff -urNad inkscape-0.46~/share/extensions/wmf_input.inx inkscape-0.46/share/extensions/wmf_input.inx
+--- inkscape-0.46~/share/extensions/wmf_input.inx 2008-03-11 05:21:10.000000000 +0100
++++ inkscape-0.46/share/extensions/wmf_input.inx 2008-05-12 17:13:22.000000000 +0200
+@@ -1,7 +1,7 @@
+ <inkscape-extension>
+ <_name>Windows Metafile Input</_name>
+ <id>org.inkscape.input.wmf</id>
+- <dependency type="executable" location="path">uniconv</dependency>
++ <dependency type="executable" location="path">uniconvertor</dependency>
+ <dependency type="executable" location="extensions">cdr2svg.sh</dependency>
+ <input>
+ <extension>.wmf</extension>
Reply to: