[med-svn] r15819 - in trunk/packages/gwyddion/trunk/debian: . patches
Jan Beyer
beathovn-guest at moszumanska.debian.org
Sat Jan 18 21:46:43 UTC 2014
Author: beathovn-guest
Date: 2014-01-18 21:46:43 +0000 (Sat, 18 Jan 2014)
New Revision: 15819
Added:
trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.34-it-translation-spaces.patch
Removed:
trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.34-it-translation-spaces.patch
Modified:
trunk/packages/gwyddion/trunk/debian/changelog
trunk/packages/gwyddion/trunk/debian/patches/fix-rpath-issue.patch
Log:
Now we remove po/stamp-po to enable recreation of the translations during package build process. This should hopefully enable the corrected italian localization and fix #734614 for real. I also refreshed the rpath-patch. Uploaded as 2.34-3.
Modified: trunk/packages/gwyddion/trunk/debian/changelog
===================================================================
--- trunk/packages/gwyddion/trunk/debian/changelog 2014-01-18 15:57:37 UTC (rev 15818)
+++ trunk/packages/gwyddion/trunk/debian/changelog 2014-01-18 21:46:43 UTC (rev 15819)
@@ -1,9 +1,9 @@
gwyddion (2.34-3) unstable; urgency=medium
- * Actually add patch, which somehow didn't make it into the
- binaries last time
+ * Enable compilation of patched italian translation, to
+ actually fix the crash in italian localization
- -- Jan Beyer <jan at beathovn.de> Thu, 16 Jan 2014 21:37:45 +0100
+ -- Jan Beyer <jan at beathovn.de> Sat, 18 Jan 2014 22:30:25 +0100
gwyddion (2.34-2) unstable; urgency=medium
Modified: trunk/packages/gwyddion/trunk/debian/patches/fix-rpath-issue.patch
===================================================================
--- trunk/packages/gwyddion/trunk/debian/patches/fix-rpath-issue.patch 2014-01-18 15:57:37 UTC (rev 15818)
+++ trunk/packages/gwyddion/trunk/debian/patches/fix-rpath-issue.patch 2014-01-18 21:46:43 UTC (rev 15819)
@@ -2,9 +2,9 @@
Forwarded: no
Author: Jan Beyer <jan at beathovn.de>
---- gwyddion-2.30.orig/configure
-+++ gwyddion-2.30/configure
-@@ -11496,7 +11496,7 @@
+--- a/configure
++++ b/configure
+@@ -11556,7 +11556,7 @@
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
@@ -13,7 +13,7 @@
if test "$host_cpu" = ia64; then
# AIX 5 supports IA64
library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-@@ -11735,16 +11735,16 @@
+@@ -11795,16 +11795,16 @@
;;
freebsd3.[01]* | freebsdelf3.[01]*)
shlibpath_overrides_runpath=yes
@@ -33,7 +33,7 @@
;;
esac
;;
-@@ -11757,7 +11757,7 @@
+@@ -11817,7 +11817,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -42,7 +42,7 @@
;;
haiku*)
-@@ -11770,7 +11770,7 @@
+@@ -11830,7 +11830,7 @@
shlibpath_var=LIBRARY_PATH
shlibpath_overrides_runpath=yes
sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
@@ -51,7 +51,7 @@
;;
hpux9* | hpux10* | hpux11*)
-@@ -11782,7 +11782,7 @@
+@@ -11842,7 +11842,7 @@
case $host_cpu in
ia64*)
shrext_cmds='.so'
@@ -60,7 +60,7 @@
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-@@ -11797,7 +11797,7 @@
+@@ -11857,7 +11857,7 @@
;;
hppa*64*)
shrext_cmds='.sl'
@@ -69,7 +69,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-@@ -11830,7 +11830,7 @@
+@@ -11890,7 +11890,7 @@
dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -78,7 +78,7 @@
;;
irix5* | irix6* | nonstopux*)
-@@ -11867,7 +11867,7 @@
+@@ -11927,7 +11927,7 @@
shlibpath_overrides_runpath=no
sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
@@ -87,7 +87,7 @@
;;
# No shared lib support for Linux oldld, aout, or coff.
-@@ -11923,7 +11923,7 @@
+@@ -11983,7 +11983,7 @@
# This implies no fast_install, which is unacceptable.
# Some rework will be needed to allow for fast_install
# before this can be enabled.
@@ -96,7 +96,7 @@
# Add ABI-specific directories to the system library path.
sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-@@ -11959,7 +11959,7 @@
+@@ -12019,7 +12019,7 @@
fi
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
@@ -105,7 +105,7 @@
;;
newsos6)
-@@ -11977,7 +11977,7 @@
+@@ -12037,7 +12037,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -114,7 +114,7 @@
dynamic_linker='ldqnx.so'
;;
-@@ -12039,7 +12039,7 @@
+@@ -12099,7 +12099,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
@@ -123,7 +123,7 @@
# ldd complains unless libraries are executable
postinstall_cmds='chmod +x $lib'
;;
-@@ -12096,7 +12096,7 @@
+@@ -12156,7 +12156,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
@@ -132,7 +132,7 @@
if test "$with_gnu_ld" = yes; then
sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
else
-@@ -12118,7 +12118,7 @@
+@@ -12178,7 +12178,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -141,7 +141,7 @@
;;
uts4*)
-@@ -15333,7 +15333,7 @@
+@@ -15393,7 +15393,7 @@
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
@@ -150,7 +150,7 @@
if test "$host_cpu" = ia64; then
# AIX 5 supports IA64
library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-@@ -15570,16 +15570,16 @@
+@@ -15630,16 +15630,16 @@
;;
freebsd3.[01]* | freebsdelf3.[01]*)
shlibpath_overrides_runpath=yes
@@ -170,7 +170,7 @@
;;
esac
;;
-@@ -15592,7 +15592,7 @@
+@@ -15652,7 +15652,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -179,7 +179,7 @@
;;
haiku*)
-@@ -15605,7 +15605,7 @@
+@@ -15665,7 +15665,7 @@
shlibpath_var=LIBRARY_PATH
shlibpath_overrides_runpath=yes
sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
@@ -188,7 +188,7 @@
;;
hpux9* | hpux10* | hpux11*)
-@@ -15617,7 +15617,7 @@
+@@ -15677,7 +15677,7 @@
case $host_cpu in
ia64*)
shrext_cmds='.so'
@@ -197,7 +197,7 @@
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-@@ -15632,7 +15632,7 @@
+@@ -15692,7 +15692,7 @@
;;
hppa*64*)
shrext_cmds='.sl'
@@ -206,7 +206,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-@@ -15665,7 +15665,7 @@
+@@ -15725,7 +15725,7 @@
dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -215,7 +215,7 @@
;;
irix5* | irix6* | nonstopux*)
-@@ -15702,7 +15702,7 @@
+@@ -15762,7 +15762,7 @@
shlibpath_overrides_runpath=no
sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
@@ -224,7 +224,7 @@
;;
# No shared lib support for Linux oldld, aout, or coff.
-@@ -15758,7 +15758,7 @@
+@@ -15818,7 +15818,7 @@
# This implies no fast_install, which is unacceptable.
# Some rework will be needed to allow for fast_install
# before this can be enabled.
@@ -233,7 +233,7 @@
# Add ABI-specific directories to the system library path.
sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-@@ -15794,7 +15794,7 @@
+@@ -15854,7 +15854,7 @@
fi
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
@@ -242,7 +242,7 @@
;;
newsos6)
-@@ -15812,7 +15812,7 @@
+@@ -15872,7 +15872,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -251,7 +251,7 @@
dynamic_linker='ldqnx.so'
;;
-@@ -15874,7 +15874,7 @@
+@@ -15934,7 +15934,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
@@ -260,7 +260,7 @@
# ldd complains unless libraries are executable
postinstall_cmds='chmod +x $lib'
;;
-@@ -15931,7 +15931,7 @@
+@@ -15991,7 +15991,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
@@ -269,7 +269,7 @@
if test "$with_gnu_ld" = yes; then
sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
else
-@@ -15953,7 +15953,7 @@
+@@ -16013,7 +16013,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
Deleted: trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.34-it-translation-spaces.patch
===================================================================
--- trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.34-it-translation-spaces.patch 2014-01-18 15:57:37 UTC (rev 15818)
+++ trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.34-it-translation-spaces.patch 2014-01-18 21:46:43 UTC (rev 15819)
@@ -1,104 +0,0 @@
-Description: Fixes a problem in the Italian translation causing
- Gwyddion to crash when run in Italian.
-Forwarded: not-needed
-Author: David Necas <yeti at gwyddion.net>
-
---- gwyddion-2.34.orig/po/it.po
-+++ gwyddion-2.34/po/it.po
-@@ -13,7 +13,7 @@
- "Project-Id-Version: it\n"
- "Report-Msgid-Bugs-To: yeti at gwyddion.net\n"
- "POT-Creation-Date: 2013-12-15 14:29+0100\n"
--"PO-Revision-Date: 2013-12-10 14:04+0100\n"
-+"PO-Revision-Date: 2013-12-16 14:56+0100\n"
- "Last-Translator: Yeti <yeti at gwyddion.net>\n"
- "Language-Team: Italian <kde-i18n-it at kde.org>\n"
- "Language: \n"
-@@ -1711,7 +1711,7 @@
-
- #: app/gwyappfilechooser.c:696
- msgid "Row-level previewed data"
--msgstr " "
-+msgstr ""
-
- #: app/gwyappfilechooser.c:805
- msgid "…"
-@@ -10297,7 +10297,7 @@
-
- #: modules/process/superresolution.c:103
- msgid "/M_ultidata/_Super-resolution..."
--msgstr "/Multidati/Super-risoluzione"
-+msgstr "/Multidati/Super-risoluzione..."
-
- #: modules/process/superresolution.c:107
- msgid "Super resolution of multiple images of same object"
-@@ -10489,7 +10489,7 @@
-
- #: modules/process/tip_blind.c:427
- msgid "Plot size _graph"
--msgstr " "
-+msgstr ""
-
- #: modules/process/tip_blind.c:437
- msgid "Create tip i_mages"
-@@ -10707,7 +10707,7 @@
-
- #: modules/process/xydenoise.c:84
- msgid "/M_ultidata/_XY denoise..."
--msgstr " "
-+msgstr ""
-
- #: modules/process/xydenoise.c:88
- msgid "Denoises horizontal/vertical measurement."
-@@ -11820,27 +11820,27 @@
-
- #: modules/volume/volume_extract.c:272
- msgid "X cross-section"
--msgstr " "
-+msgstr ""
-
- #: modules/volume/volume_extract.c:273
- msgid "Y cross-section"
--msgstr " "
-+msgstr ""
-
- #: modules/volume/volume_extract.c:274
- msgid "Z cross-section"
--msgstr " "
-+msgstr ""
-
- #: modules/volume/volume_extract.c:275 modules/volume/volume_extract.c:697
- msgid "X direction sum"
--msgstr " "
-+msgstr ""
-
- #: modules/volume/volume_extract.c:276 modules/volume/volume_extract.c:699
- msgid "Y direction sum"
--msgstr " "
-+msgstr ""
-
- #: modules/volume/volume_extract.c:277 modules/volume/volume_extract.c:701
- msgid "Z direction sum"
--msgstr " "
-+msgstr ""
-
- #: modules/volume/volume_extract.c:280
- msgid "X direction"
-@@ -11864,7 +11864,7 @@
-
- #: modules/volume/volume_extract.c:338
- msgid "_Extract projection"
--msgstr " "
-+msgstr ""
-
- #: modules/volume/volume_extract.c:355
- msgid "Projections"
-@@ -11884,7 +11884,7 @@
-
- #: modules/volume/volume_extract.c:410
- msgid "Shown cut direction:"
--msgstr " "
-+msgstr ""
-
- #: modules/volume/volume_extract.c:420 modules/volume/volume_extract.c:500
- msgid "Show mode:"
Added: trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.34-it-translation-spaces.patch
===================================================================
--- trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.34-it-translation-spaces.patch (rev 0)
+++ trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.34-it-translation-spaces.patch 2014-01-18 21:46:43 UTC (rev 15819)
@@ -0,0 +1,108 @@
+Description: Fixes a problem in the Italian translation causing
+ Gwyddion to crash when run in Italian.
+Forwarded: not-needed
+Author: David Necas <yeti at gwyddion.net>
+
+--- a/po/it.po
++++ b/po/it.po
+@@ -13,7 +13,7 @@
+ "Project-Id-Version: it\n"
+ "Report-Msgid-Bugs-To: yeti at gwyddion.net\n"
+ "POT-Creation-Date: 2013-12-15 14:29+0100\n"
+-"PO-Revision-Date: 2013-12-10 14:04+0100\n"
++"PO-Revision-Date: 2013-12-16 14:56+0100\n"
+ "Last-Translator: Yeti <yeti at gwyddion.net>\n"
+ "Language-Team: Italian <kde-i18n-it at kde.org>\n"
+ "Language: \n"
+@@ -1711,7 +1711,7 @@
+
+ #: app/gwyappfilechooser.c:696
+ msgid "Row-level previewed data"
+-msgstr " "
++msgstr ""
+
+ #: app/gwyappfilechooser.c:805
+ msgid "…"
+@@ -10297,7 +10297,7 @@
+
+ #: modules/process/superresolution.c:103
+ msgid "/M_ultidata/_Super-resolution..."
+-msgstr "/Multidati/Super-risoluzione"
++msgstr "/Multidati/Super-risoluzione..."
+
+ #: modules/process/superresolution.c:107
+ msgid "Super resolution of multiple images of same object"
+@@ -10489,7 +10489,7 @@
+
+ #: modules/process/tip_blind.c:427
+ msgid "Plot size _graph"
+-msgstr " "
++msgstr ""
+
+ #: modules/process/tip_blind.c:437
+ msgid "Create tip i_mages"
+@@ -10707,7 +10707,7 @@
+
+ #: modules/process/xydenoise.c:84
+ msgid "/M_ultidata/_XY denoise..."
+-msgstr " "
++msgstr ""
+
+ #: modules/process/xydenoise.c:88
+ msgid "Denoises horizontal/vertical measurement."
+@@ -11820,27 +11820,27 @@
+
+ #: modules/volume/volume_extract.c:272
+ msgid "X cross-section"
+-msgstr " "
++msgstr ""
+
+ #: modules/volume/volume_extract.c:273
+ msgid "Y cross-section"
+-msgstr " "
++msgstr ""
+
+ #: modules/volume/volume_extract.c:274
+ msgid "Z cross-section"
+-msgstr " "
++msgstr ""
+
+ #: modules/volume/volume_extract.c:275 modules/volume/volume_extract.c:697
+ msgid "X direction sum"
+-msgstr " "
++msgstr ""
+
+ #: modules/volume/volume_extract.c:276 modules/volume/volume_extract.c:699
+ msgid "Y direction sum"
+-msgstr " "
++msgstr ""
+
+ #: modules/volume/volume_extract.c:277 modules/volume/volume_extract.c:701
+ msgid "Z direction sum"
+-msgstr " "
++msgstr ""
+
+ #: modules/volume/volume_extract.c:280
+ msgid "X direction"
+@@ -11864,7 +11864,7 @@
+
+ #: modules/volume/volume_extract.c:338
+ msgid "_Extract projection"
+-msgstr " "
++msgstr ""
+
+ #: modules/volume/volume_extract.c:355
+ msgid "Projections"
+@@ -11884,7 +11884,7 @@
+
+ #: modules/volume/volume_extract.c:410
+ msgid "Shown cut direction:"
+-msgstr " "
++msgstr ""
+
+ #: modules/volume/volume_extract.c:420 modules/volume/volume_extract.c:500
+ msgid "Show mode:"
+--- a/po/stamp-po
++++ /dev/null
+@@ -1 +0,0 @@
+-timestamp
More information about the debian-med-commit
mailing list