[med-svn] r10145 - trunk/packages/gwyddion/trunk/debian/patches
Andreas Tille
tille at alioth.debian.org
Thu Mar 29 12:18:31 UTC 2012
Author: tille
Date: 2012-03-29 12:18:30 +0000 (Thu, 29 Mar 2012)
New Revision: 10145
Modified:
trunk/packages/gwyddion/trunk/debian/patches/fix-manpage-section-for-debian.diff
trunk/packages/gwyddion/trunk/debian/patches/fix-rpath-issue.patch
trunk/packages/gwyddion/trunk/debian/patches/glib-single-include.patch
Log:
Patch reviewed by upstream (+ refreshed old patches)
Modified: trunk/packages/gwyddion/trunk/debian/patches/fix-manpage-section-for-debian.diff
===================================================================
--- trunk/packages/gwyddion/trunk/debian/patches/fix-manpage-section-for-debian.diff 2012-03-29 11:53:42 UTC (rev 10144)
+++ trunk/packages/gwyddion/trunk/debian/patches/fix-manpage-section-for-debian.diff 2012-03-29 12:18:30 UTC (rev 10145)
@@ -10,7 +10,7 @@
--- gwyddion-2.26.orig/perl/Makefile.in
+++ gwyddion-2.26/perl/Makefile.in
-@@ -317,7 +317,7 @@
+@@ -314,7 +314,7 @@
EXTRA_DIST = $(Gwyddion_PERL)
perllibdir = $(pkglibdir)/perl/Gwyddion
@HAVE_PERL_TRUE at man3dir = $(mandir)/man3
@@ -19,9 +19,9 @@
@HAVE_PERL_TRUE at perllib_DATA = $(Gwyddion_PERL)
@HAVE_PERL_TRUE at man3_pages = \
@HAVE_PERL_TRUE@ Gwyddion::dump.3pm
---- gwyddion-2.22.orig/perl/Makefile.am
-+++ gwyddion-2.22/perl/Makefile.am
-@@ -12,7 +12,7 @@
+--- gwyddion-2.26.orig/perl/Makefile.am
++++ gwyddion-2.26/perl/Makefile.am
+@@ -9,7 +9,7 @@
if HAVE_PERL
man3dir = $(mandir)/man3
Modified: trunk/packages/gwyddion/trunk/debian/patches/fix-rpath-issue.patch
===================================================================
--- trunk/packages/gwyddion/trunk/debian/patches/fix-rpath-issue.patch 2012-03-29 11:53:42 UTC (rev 10144)
+++ trunk/packages/gwyddion/trunk/debian/patches/fix-rpath-issue.patch 2012-03-29 12:18:30 UTC (rev 10145)
@@ -2,9 +2,9 @@
Forwarded: no
Author: Jan Beyer <jan at beathovn.de>
---- gwyddion-2.22.orig/configure
-+++ gwyddion-2.22/configure
-@@ -10640,7 +10640,7 @@
+--- gwyddion-2.26.orig/configure
++++ gwyddion-2.26/configure
+@@ -11303,7 +11303,7 @@
version_type=linux
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}'
-@@ -10824,16 +10824,16 @@
+@@ -11546,16 +11546,16 @@
;;
freebsd3.[01]* | freebsdelf3.[01]*)
shlibpath_overrides_runpath=yes
@@ -33,7 +33,7 @@
;;
esac
;;
-@@ -10845,7 +10845,7 @@
+@@ -11567,7 +11567,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
@@ -42,7 +42,7 @@
;;
haiku*)
-@@ -10870,7 +10870,7 @@
+@@ -11592,7 +11592,7 @@
case $host_cpu in
ia64*)
shrext_cmds='.so'
@@ -51,7 +51,7 @@
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-@@ -10885,7 +10885,7 @@
+@@ -11607,7 +11607,7 @@
;;
hppa*64*)
shrext_cmds='.sl'
@@ -60,7 +60,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.
-@@ -10918,7 +10918,7 @@
+@@ -11640,7 +11640,7 @@
dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -69,7 +69,7 @@
;;
irix5* | irix6* | nonstopux*)
-@@ -10955,7 +10955,7 @@
+@@ -11677,7 +11677,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}"
@@ -78,7 +78,7 @@
;;
# No shared lib support for Linux oldld, aout, or coff.
-@@ -11011,7 +11011,7 @@
+@@ -11733,7 +11733,7 @@
# This implies no fast_install, which is unacceptable.
# Some rework will be needed to allow for fast_install
# before this can be enabled.
@@ -87,7 +87,7 @@
# Add ABI-specific directories to the system library path.
sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-@@ -11047,7 +11047,7 @@
+@@ -11769,7 +11769,7 @@
fi
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
@@ -96,7 +96,7 @@
;;
newsos6)
-@@ -11065,7 +11065,7 @@
+@@ -11787,7 +11787,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -105,7 +105,7 @@
dynamic_linker='ldqnx.so'
;;
-@@ -11127,7 +11127,7 @@
+@@ -11849,7 +11849,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
@@ -114,7 +114,7 @@
# ldd complains unless libraries are executable
postinstall_cmds='chmod +x $lib'
;;
-@@ -11184,7 +11184,7 @@
+@@ -11906,7 +11906,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
@@ -123,7 +123,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
-@@ -11206,7 +11206,7 @@
+@@ -11928,7 +11928,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
@@ -132,7 +132,7 @@
;;
uts4*)
-@@ -14309,7 +14309,7 @@
+@@ -15142,7 +15142,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
@@ -141,7 +141,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}'
-@@ -14491,16 +14491,16 @@
+@@ -15383,16 +15383,16 @@
;;
freebsd3.[01]* | freebsdelf3.[01]*)
shlibpath_overrides_runpath=yes
@@ -161,7 +161,7 @@
;;
esac
;;
-@@ -14512,7 +14512,7 @@
+@@ -15404,7 +15404,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
@@ -170,7 +170,7 @@
;;
haiku*)
-@@ -14537,7 +14537,7 @@
+@@ -15429,7 +15429,7 @@
case $host_cpu in
ia64*)
shrext_cmds='.so'
@@ -179,7 +179,7 @@
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-@@ -14552,7 +14552,7 @@
+@@ -15444,7 +15444,7 @@
;;
hppa*64*)
shrext_cmds='.sl'
@@ -188,7 +188,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.
-@@ -14585,7 +14585,7 @@
+@@ -15477,7 +15477,7 @@
dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -197,7 +197,7 @@
;;
irix5* | irix6* | nonstopux*)
-@@ -14622,7 +14622,7 @@
+@@ -15514,7 +15514,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}"
@@ -206,7 +206,7 @@
;;
# No shared lib support for Linux oldld, aout, or coff.
-@@ -14678,7 +14678,7 @@
+@@ -15570,7 +15570,7 @@
# This implies no fast_install, which is unacceptable.
# Some rework will be needed to allow for fast_install
# before this can be enabled.
@@ -215,7 +215,7 @@
# Add ABI-specific directories to the system library path.
sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-@@ -14714,7 +14714,7 @@
+@@ -15606,7 +15606,7 @@
fi
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
@@ -224,7 +224,7 @@
;;
newsos6)
-@@ -14732,7 +14732,7 @@
+@@ -15624,7 +15624,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -233,7 +233,7 @@
dynamic_linker='ldqnx.so'
;;
-@@ -14794,7 +14794,7 @@
+@@ -15686,7 +15686,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
@@ -242,7 +242,7 @@
# ldd complains unless libraries are executable
postinstall_cmds='chmod +x $lib'
;;
-@@ -14851,7 +14851,7 @@
+@@ -15743,7 +15743,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
@@ -251,7 +251,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
-@@ -14873,7 +14873,7 @@
+@@ -15765,7 +15765,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
Modified: trunk/packages/gwyddion/trunk/debian/patches/glib-single-include.patch
===================================================================
--- trunk/packages/gwyddion/trunk/debian/patches/glib-single-include.patch 2012-03-29 11:53:42 UTC (rev 10144)
+++ trunk/packages/gwyddion/trunk/debian/patches/glib-single-include.patch 2012-03-29 12:18:30 UTC (rev 10145)
@@ -1,17 +1,25 @@
Author: Andreas Tille <tille at debian.org>
+Reviewed: "David Nečas (Yeti)" <yeti at gwyddion.net> (upstream)
Date: Thu, 29 Mar 2012 08:47:46 +0200
+Bug-Fixed: http://bugs.debian.org/665554
+Description: do not use individual glib headers
+ - A first version of the patch was created using
+ http://people.debian.org/~biebl/fix-glib-includes.sh
+ - This patch was provided upstream who applied
+ some cosmetical changes (remove included headers from
+ *.c files if just included in *.h file)
---- gwyddion-2.26.orig/app/glmaterial-editor.h
-+++ gwyddion-2.26/app/glmaterial-editor.h
-@@ -21,7 +21,7 @@
- #ifndef __GWY_APP_GL_MATERIAL_EDITOR_H__
- #define __GWY_APP_GL_MATERIAL_EDITOR_H__
+--- gwyddion-2.26.orig/app/gwymoduleutils-file.h
++++ gwyddion-2.26/app/gwymoduleutils-file.h
+@@ -22,7 +22,7 @@
+ #define __GWY_MODULEUTILS_FILE_H__
--#include <glib/gmacros.h>
+ #include <string.h>
+-#include <glib/gutils.h>
+#include <glib.h>
+ #include <libgwyddion/gwycontainer.h>
+ #include <libprocess/datafield.h>
- G_BEGIN_DECLS
-
--- gwyddion-2.26.orig/app/gradient-editor.h
+++ gwyddion-2.26/app/gradient-editor.h
@@ -21,7 +21,7 @@
@@ -23,17 +31,6 @@
G_BEGIN_DECLS
---- gwyddion-2.26.orig/app/gwymoduleutils-file.h
-+++ gwyddion-2.26/app/gwymoduleutils-file.h
-@@ -22,7 +22,7 @@
- #define __GWY_MODULEUTILS_FILE_H__
-
- #include <string.h>
--#include <glib/gutils.h>
-+#include <glib.h>
- #include <libgwyddion/gwycontainer.h>
- #include <libprocess/datafield.h>
-
--- gwyddion-2.26.orig/app/settings.h
+++ gwyddion-2.26/app/settings.h
@@ -22,7 +22,7 @@
@@ -45,17 +42,50 @@
G_BEGIN_DECLS
---- gwyddion-2.26.orig/libdraw/gwydrawenums.h
-+++ gwyddion-2.26/libdraw/gwydrawenums.h
+--- gwyddion-2.26.orig/app/glmaterial-editor.h
++++ gwyddion-2.26/app/glmaterial-editor.h
@@ -21,7 +21,7 @@
- #ifndef __GWY_DRAW_ENUMS_H__
- #define __GWY_DRAW_ENUMS_H__
+ #ifndef __GWY_APP_GL_MATERIAL_EDITOR_H__
+ #define __GWY_APP_GL_MATERIAL_EDITOR_H__
-#include <glib/gmacros.h>
+#include <glib.h>
- #include <libgwyddion/gwyenum.h>
G_BEGIN_DECLS
+
+--- gwyddion-2.26.orig/libgwymodule/gwymoduleenums.h
++++ gwyddion-2.26/libgwymodule/gwymoduleenums.h
+@@ -21,7 +21,7 @@
+ #ifndef __GWY_MODULE_ENUMS_H__
+ #define __GWY_MODULE_ENUMS_H__
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+
+ G_BEGIN_DECLS
+
+--- gwyddion-2.26.orig/modules/file/err.h
++++ gwyddion-2.26/modules/file/err.h
+@@ -21,7 +21,7 @@
+ #define __GWY_FILE_ERR_H__
+
+ #include <errno.h>
+-#include <glib/gutils.h>
++#include <glib.h>
+ #include <libgwymodule/gwymodule-file.h>
+
+ /* I/O Errors */
+--- gwyddion-2.26.orig/modules/file/gwytiff.h
++++ gwyddion-2.26/modules/file/gwytiff.h
+@@ -18,7 +18,7 @@
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+-#include <glib/gutils.h>
++#include <glib.h>
+
+ /*
+ * This is a rudimentary built-in TIFF reader.
--- gwyddion-2.26.orig/libgwyddion/gwyddionenums.h
+++ gwyddion-2.26/libgwyddion/gwyddionenums.h
@@ -21,7 +21,7 @@
@@ -67,6 +97,17 @@
G_BEGIN_DECLS
+--- gwyddion-2.26.orig/libgwyddion/gwyversion.h.in
++++ gwyddion-2.26/libgwyddion/gwyversion.h.in
+@@ -21,7 +21,7 @@
+ #ifndef __GWY_VERSION_H__
+ #define __GWY_VERSION_H__
+
+-#include <glib/gtypes.h>
++#include <glib.h>
+
+ G_BEGIN_DECLS
+
--- gwyddion-2.26.orig/libgwyddion/gwyexpr.h
+++ gwyddion-2.26/libgwyddion/gwyexpr.h
@@ -21,7 +21,7 @@
@@ -91,43 +132,21 @@
--- gwyddion-2.26.orig/libgwyddion/gwyserializable.c
+++ gwyddion-2.26/libgwyddion/gwyserializable.c
-@@ -21,7 +21,7 @@
+@@ -20,8 +20,6 @@
+
#include "config.h"
#include <string.h>
- #include <glib-object.h>
+-#include <glib-object.h>
-#include <glib/gutils.h>
-+#include <glib.h>
#include <libgwyddion/gwymacros.h>
#include <libgwyddion/gwyutils.h>
---- gwyddion-2.26.orig/libgwyddion/gwyversion.h
-+++ gwyddion-2.26/libgwyddion/gwyversion.h
+--- gwyddion-2.26.orig/libdraw/gwydrawenums.h
++++ gwyddion-2.26/libdraw/gwydrawenums.h
@@ -21,7 +21,7 @@
- #ifndef __GWY_VERSION_H__
- #define __GWY_VERSION_H__
+ #ifndef __GWY_DRAW_ENUMS_H__
+ #define __GWY_DRAW_ENUMS_H__
--#include <glib/gtypes.h>
-+#include <glib.h>
-
- G_BEGIN_DECLS
-
---- gwyddion-2.26.orig/libgwyddion/gwyversion.h.in
-+++ gwyddion-2.26/libgwyddion/gwyversion.h.in
-@@ -21,7 +21,7 @@
- #ifndef __GWY_VERSION_H__
- #define __GWY_VERSION_H__
-
--#include <glib/gtypes.h>
-+#include <glib.h>
-
- G_BEGIN_DECLS
-
---- gwyddion-2.26.orig/libgwydgets/gwydgetenums.h
-+++ gwyddion-2.26/libgwydgets/gwydgetenums.h
-@@ -21,7 +21,7 @@
- #ifndef __GWY_GWYDGET_ENUMS_H__
- #define __GWY_GWYDGET_ENUMS_H__
-
-#include <glib/gmacros.h>
+#include <glib.h>
#include <libgwyddion/gwyenum.h>
@@ -144,17 +163,17 @@
G_BEGIN_DECLS
---- gwyddion-2.26.orig/libgwymodule/gwymoduleenums.h
-+++ gwyddion-2.26/libgwymodule/gwymoduleenums.h
+--- gwyddion-2.26.orig/libgwydgets/gwydgetenums.h
++++ gwyddion-2.26/libgwydgets/gwydgetenums.h
@@ -21,7 +21,7 @@
- #ifndef __GWY_MODULE_ENUMS_H__
- #define __GWY_MODULE_ENUMS_H__
+ #ifndef __GWY_GWYDGET_ENUMS_H__
+ #define __GWY_GWYDGET_ENUMS_H__
-#include <glib/gmacros.h>
+#include <glib.h>
+ #include <libgwyddion/gwyenum.h>
G_BEGIN_DECLS
-
--- gwyddion-2.26.orig/libprocess/gwyprocessenums.h
+++ gwyddion-2.26/libprocess/gwyprocessenums.h
@@ -21,7 +21,7 @@
@@ -166,25 +185,3 @@
#include <libgwyddion/gwyenum.h>
G_BEGIN_DECLS
---- gwyddion-2.26.orig/modules/file/err.h
-+++ gwyddion-2.26/modules/file/err.h
-@@ -21,7 +21,7 @@
- #define __GWY_FILE_ERR_H__
-
- #include <errno.h>
--#include <glib/gutils.h>
-+#include <glib.h>
- #include <libgwymodule/gwymodule-file.h>
-
- /* I/O Errors */
---- gwyddion-2.26.orig/modules/file/gwytiff.h
-+++ gwyddion-2.26/modules/file/gwytiff.h
-@@ -18,7 +18,7 @@
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
--#include <glib/gutils.h>
-+#include <glib.h>
-
- /*
- * This is a rudimentary built-in TIFF reader.
More information about the debian-med-commit
mailing list