Commit e1ccf632 authored by Sven Eckelmann's avatar Sven Eckelmann

Move patches to alternative DEP-3 format and manage them with gbp pq

parent bfa0765f
......@@ -2,6 +2,8 @@ libg3d (0.0.8-21) UNRELEASED; urgency=medium
* Upgraded to policy 3.9.6, no changes required
* Update years in debian/copyright
* debian/patches:
- Move patches to alternative DEP-3 format and manage them with gbp pq
-- Sven Eckelmann <sven@narfation.org> Sat, 20 Sep 2014 11:03:57 +0200
......
Description: Add AC_PROG_CXX for tests/Makefile.am
Author: Sven Eckelmann <sven@narfation.org>
From: Sven Eckelmann <sven@narfation.org>
Date: Sat, 21 Nov 2009 21:18:15 +0100
Subject: Add AC_PROG_CXX for tests/Makefile.am
---
configure.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/configure.in b/configure.in
index 4d1f6393abd0b9b202cbc824f773a7270bce4945..43312a30d9a355ffa7817c249f94e0a8712c5041 100644
index 4d1f639..43312a3 100644
--- a/configure.in
+++ b/configure.in
@@ -28,6 +28,7 @@ AC_SUBST(LTVERSION)
......
Description: Allow libtool to update their files to keep them consistent
Author: Sven Eckelmann <sven@narfation.org>
From: Sven Eckelmann <sven@narfation.org>
Date: Sat, 21 Nov 2009 22:45:54 +0100
Subject: Allow libtool to update their files to keep them consistent
---
Makefile.am | 1 +
configure.in | 1 +
2 files changed, 2 insertions(+)
diff --git a/Makefile.am b/Makefile.am
index 07057052fa509dd08131f813abf998489723a7e7..b73a5b2befe78c7ed5bed4eece06225c3b5a46ac 100644
index 0705705..b73a5b2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,4 @@
......@@ -12,7 +17,7 @@ index 07057052fa509dd08131f813abf998489723a7e7..b73a5b2befe78c7ed5bed4eece06225c
pkgconfigdir=${libdir}/pkgconfig
diff --git a/configure.in b/configure.in
index 43312a30d9a355ffa7817c249f94e0a8712c5041..f0170809dd130fd000d1406a967be97ffa42649c 100644
index 43312a3..f017080 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,7 @@
......
Description: Fix build with automake 1.11.3
Author: Sven Eckelmann <sven@narfation.org>
From: Sven Eckelmann <sven@narfation.org>
Date: Sun, 19 Feb 2012 02:00:14 +0100
Subject: Fix build with automake 1.11.3
---
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index b73a5b2befe78c7ed5bed4eece06225c3b5a46ac..dd8d9513901662c800cb581690e6668684c55aa3 100644
index b73a5b2..dd8d951 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = . doc m4 include src plugins programs tests
......
Description: Fix implicit declarations of functions
Author: Sven Eckelmann <sven@narfation.org>
From: Sven Eckelmann <sven@narfation.org>
Date: Mon, 9 Jan 2012 21:33:17 +0100
Subject: Fix implicit declarations of functions
---
plugins/import/imp_vrml/imp_vrml_v1.c | 1 +
src/object.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/plugins/import/imp_vrml/imp_vrml_v1.c b/plugins/import/imp_vrml/imp_vrml_v1.c
index 74c21301f37c2deedb206a023e7c0a3b1f7adb45..895efc7abe04e1dc8cffa044574f73ef9f21ee83 100644
index 74c2130..895efc7 100644
--- a/plugins/import/imp_vrml/imp_vrml_v1.c
+++ b/plugins/import/imp_vrml/imp_vrml_v1.c
@@ -17,6 +17,7 @@
......@@ -15,7 +20,7 @@ index 74c21301f37c2deedb206a023e7c0a3b1f7adb45..895efc7abe04e1dc8cffa044574f73ef
#include <string.h>
#include <errno.h>
diff --git a/src/object.c b/src/object.c
index 42afe7cc4f3e34424b3e44fb2516f85107fb581e..485ef8da0a2909e9ba8c48a7ad65cba27cd40c2f 100644
index 42afe7c..485ef8d 100644
--- a/src/object.c
+++ b/src/object.c
@@ -29,6 +29,7 @@
......
Description: Fix memory leaks
From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?=
<picca@synchrotron-soleil.fr>
Date: Mon, 16 Aug 2010 21:29:29 +0200
Subject: Fix memory leaks
Forwarded: https://mail.gna.org/public/libg3d-devel/2010-08/msg00000.html
Author: Picca Frédéric-Emmanuel <picca@synchrotron-soleil.fr>
Bug-Debian: http://bugs.debian.org/593209
---
src/face.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/face.c b/src/face.c
index d012f57bd4b9b854871bd75807c467a56f0d9317..f14c941b819c8d70f780b3d42d0b218bf57095ac 100644
index d012f57..f14c941 100644
--- a/src/face.c
+++ b/src/face.c
@@ -30,6 +30,8 @@ void g3d_face_free(G3DFace *face)
......
Description: Fix memory leaks in dae plugin
From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?=
<picca@synchrotron-soleil.fr>
Date: Mon, 16 Aug 2010 21:29:29 +0200
Subject: Fix memory leaks in dae plugin
Forwarded: https://mail.gna.org/public/libg3d-devel/2010-08/msg00000.html
Author: Picca Frédéric-Emmanuel <picca@synchrotron-soleil.fr>
Bug-Debian: http://bugs.debian.org/593209
---
plugins/import/imp_dae/imp_dae_cb.c | 4 ++++
plugins/import/imp_dae/imp_dae_library.c | 1 +
2 files changed, 5 insertions(+)
diff --git a/plugins/import/imp_dae/imp_dae_cb.c b/plugins/import/imp_dae/imp_dae_cb.c
index 5981fb0cc916036333ba23ae757961a2b6418d8f..eabdda7562aca6c7d1b2419353e90bbea5ab7502 100644
index 5981fb0..eabdda7 100644
--- a/plugins/import/imp_dae/imp_dae_cb.c
+++ b/plugins/import/imp_dae/imp_dae_cb.c
@@ -806,6 +806,10 @@ gboolean dae_cb_vertices__input(DaeGlobalData *global, DaeLocalData *local)
......@@ -20,7 +26,7 @@ index 5981fb0cc916036333ba23ae757961a2b6418d8f..eabdda7562aca6c7d1b2419353e90bbe
object->vertex_data = g_new0(gfloat, 3 * object->vertex_count);
diff --git a/plugins/import/imp_dae/imp_dae_library.c b/plugins/import/imp_dae/imp_dae_library.c
index dd103513cb46def1a6d160a7a216421584e67266..9312a60dc013532b541cecb78a84686f415246f7 100644
index dd10351..9312a60 100644
--- a/plugins/import/imp_dae/imp_dae_library.c
+++ b/plugins/import/imp_dae/imp_dae_library.c
@@ -158,6 +158,7 @@ void dae_library_cleanup(DaeLibrary *library)
......
Description: Fix memory leaks in plugins
Bug: https://mail.gna.org/public/libg3d-devel/2009-02/msg00000.html
Author: Sven Eckelmann <sven@narfation.org>
From: Sven Eckelmann <sven@narfation.org>
Date: Sat, 12 Sep 2009 15:23:40 +0200
Subject: Fix memory leaks in plugins
Bug: https://mail.gna.org/public/libg3d-devel/2009-02/msg00000.html
---
plugins/import/imp_ac3d/imp_ac3d.c | 13 +++++++------
plugins/import/imp_dpm/imp_dpm.c | 6 ++++++
plugins/import/imp_flt/imp_flt.c | 1 +
plugins/import/imp_md3/imp_md3.c | 1 +
plugins/import/imp_obj/imp_obj.c | 6 +++++-
5 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/plugins/import/imp_ac3d/imp_ac3d.c b/plugins/import/imp_ac3d/imp_ac3d.c
index 3653b07a13868de11777854cdf7f726a3764aad9..46b48002fe7667b4eaa9f1a085daf643d4ccc9ae 100644
index 3653b07..46b4800 100644
--- a/plugins/import/imp_ac3d/imp_ac3d.c
+++ b/plugins/import/imp_ac3d/imp_ac3d.c
@@ -32,6 +32,7 @@
......@@ -55,7 +63,7 @@ index 3653b07a13868de11777854cdf7f726a3764aad9..46b48002fe7667b4eaa9f1a085daf643
} /* not .acc */
else
diff --git a/plugins/import/imp_dpm/imp_dpm.c b/plugins/import/imp_dpm/imp_dpm.c
index 7f616e8143fa1434601838c351c352a7add23f68..a70450555b1af77406c3ad49049bd53583821d2b 100644
index 7f616e8..a704505 100644
--- a/plugins/import/imp_dpm/imp_dpm.c
+++ b/plugins/import/imp_dpm/imp_dpm.c
@@ -26,6 +26,7 @@
......@@ -81,7 +89,7 @@ index 7f616e8143fa1434601838c351c352a7add23f68..a70450555b1af77406c3ad49049bd535
}
diff --git a/plugins/import/imp_flt/imp_flt.c b/plugins/import/imp_flt/imp_flt.c
index 847b881a4800ad7f6ca9a1b233c41ddf2eaaaf48..4ceee2720e40c8ecfc0292d784534bed07d1435c 100644
index 847b881..4ceee27 100644
--- a/plugins/import/imp_flt/imp_flt.c
+++ b/plugins/import/imp_flt/imp_flt.c
@@ -64,6 +64,7 @@ gboolean plugin_load_model_from_stream(G3DContext *context, G3DStream *stream,
......@@ -93,7 +101,7 @@ index 847b881a4800ad7f6ca9a1b233c41ddf2eaaaf48..4ceee2720e40c8ecfc0292d784534bed
}
diff --git a/plugins/import/imp_md3/imp_md3.c b/plugins/import/imp_md3/imp_md3.c
index 7bacf5a473937872bf00a1b0d9a5fdfa275d8a80..0f407b30cb6d3a50661f18824e5f31de7ad37353 100644
index 7bacf5a..0f407b3 100644
--- a/plugins/import/imp_md3/imp_md3.c
+++ b/plugins/import/imp_md3/imp_md3.c
@@ -253,6 +253,7 @@ gboolean md3_read_mesh(G3DStream *stream, G3DContext *context, G3DModel *model)
......@@ -105,7 +113,7 @@ index 7bacf5a473937872bf00a1b0d9a5fdfa275d8a80..0f407b30cb6d3a50661f18824e5f31de
}
diff --git a/plugins/import/imp_obj/imp_obj.c b/plugins/import/imp_obj/imp_obj.c
index e131afdb362080441fd455d1a0fe2079ffe4c706..466754e7a16bc3441cf19b39a88b0fe1f433b3ae 100644
index e131afd..466754e 100644
--- a/plugins/import/imp_obj/imp_obj.c
+++ b/plugins/import/imp_obj/imp_obj.c
@@ -29,6 +29,7 @@
......
Description: Fix memory leaks
From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?=
<picca@synchrotron-soleil.fr>
Date: Tue, 16 Feb 2010 12:38:34 +0100
Subject: Fix memory leaks
Forwarded: https://mail.gna.org/public/libg3d-devel/2010-02/msg00000.html
Author: Picca Frédéric-Emmanuel <picca@synchrotron-soleil.fr>
Bug-Debian: http://bugs.debian.org/570084
---
plugins/image/img_gdkpixbuf.c | 15 ++++++++++++---
plugins/import/imp_ldraw/imp_ldraw_color.c | 15 +++++++++++++++
plugins/import/imp_ldraw/imp_ldraw_color.h | 1 +
plugins/import/imp_ldraw/imp_ldraw_library.c | 1 +
plugins/import/imp_obj/imp_obj.c | 2 ++
src/material.c | 1 +
src/object.c | 4 +++-
src/plugins.c | 11 +++++------
8 files changed, 40 insertions(+), 10 deletions(-)
diff --git a/plugins/image/img_gdkpixbuf.c b/plugins/image/img_gdkpixbuf.c
index 931c9fdf9c19059bc01570985ee29189e5f2fae0..5a4984d8242c49029fa66e2914623582c9d622a4 100644
index 931c9fd..5a4984d 100644
--- a/plugins/image/img_gdkpixbuf.c
+++ b/plugins/image/img_gdkpixbuf.c
@@ -108,16 +108,23 @@ gchar **plugin_extensions(G3DContext *context)
......@@ -45,7 +57,7 @@ index 931c9fdf9c19059bc01570985ee29189e5f2fae0..5a4984d8242c49029fa66e2914623582
}
diff --git a/plugins/import/imp_ldraw/imp_ldraw_color.c b/plugins/import/imp_ldraw/imp_ldraw_color.c
index 269f6c6d6a418b3a68cb474c8092cac427838d39..7623f5edb8747a2840eeb9df7b4337731b160cd7 100644
index 269f6c6..7623f5e 100644
--- a/plugins/import/imp_ldraw/imp_ldraw_color.c
+++ b/plugins/import/imp_ldraw/imp_ldraw_color.c
@@ -103,6 +103,21 @@ gboolean ldraw_color_init(LDrawLibrary *lib)
......@@ -71,7 +83,7 @@ index 269f6c6d6a418b3a68cb474c8092cac427838d39..7623f5edb8747a2840eeb9df7b433773
{
G3DMaterial *material;
diff --git a/plugins/import/imp_ldraw/imp_ldraw_color.h b/plugins/import/imp_ldraw/imp_ldraw_color.h
index e5844de6c81b6b61fa88e70a07b15c49af1dfff1..941d0c10db6754018df6212f3a67e21903e1f6d5 100644
index e5844de..941d0c1 100644
--- a/plugins/import/imp_ldraw/imp_ldraw_color.h
+++ b/plugins/import/imp_ldraw/imp_ldraw_color.h
@@ -25,6 +25,7 @@
......@@ -83,7 +95,7 @@ index e5844de6c81b6b61fa88e70a07b15c49af1dfff1..941d0c10db6754018df6212f3a67e219
#endif /* _IMP_LDRAW_COLOR_H */
diff --git a/plugins/import/imp_ldraw/imp_ldraw_library.c b/plugins/import/imp_ldraw/imp_ldraw_library.c
index aa07cdb52a45e8a7db380a8bba9ae7ffaf96433f..7e12128e7222eadcf16c952cea6ba0109d90b834 100644
index aa07cdb..7e12128 100644
--- a/plugins/import/imp_ldraw/imp_ldraw_library.c
+++ b/plugins/import/imp_ldraw/imp_ldraw_library.c
@@ -114,6 +114,7 @@ void ldraw_library_cleanup(LDrawLibrary *lib)
......@@ -95,7 +107,7 @@ index aa07cdb52a45e8a7db380a8bba9ae7ffaf96433f..7e12128e7222eadcf16c952cea6ba010
}
diff --git a/plugins/import/imp_obj/imp_obj.c b/plugins/import/imp_obj/imp_obj.c
index 466754e7a16bc3441cf19b39a88b0fe1f433b3ae..6d7fe2f20dc5adccdfccb163e88170800a6d09c2 100644
index 466754e..6d7fe2f 100644
--- a/plugins/import/imp_obj/imp_obj.c
+++ b/plugins/import/imp_obj/imp_obj.c
@@ -164,6 +164,7 @@ gboolean plugin_load_model_from_stream(G3DContext *context, G3DStream *stream,
......@@ -115,7 +127,7 @@ index 466754e7a16bc3441cf19b39a88b0fe1f433b3ae..6d7fe2f20dc5adccdfccb163e8817080
}
diff --git a/src/material.c b/src/material.c
index ad03d62b8bc355ad213d7404c16328f9625a4f1e..e9f529ee606ae7e4dfeab69546d1ca37a465f4dc 100644
index ad03d62..e9f529e 100644
--- a/src/material.c
+++ b/src/material.c
@@ -36,5 +36,6 @@ G3DMaterial *g3d_material_new(void)
......@@ -126,7 +138,7 @@ index ad03d62b8bc355ad213d7404c16328f9625a4f1e..e9f529ee606ae7e4dfeab69546d1ca37
g_free(material);
}
diff --git a/src/object.c b/src/object.c
index 202fbfa58151eaff1493984b900b822760fa87ae..42afe7cc4f3e34424b3e44fb2516f85107fb581e 100644
index 202fbfa..42afe7c 100644
--- a/src/object.c
+++ b/src/object.c
@@ -44,6 +44,7 @@ void g3d_object_free(G3DObject *object)
......@@ -148,7 +160,7 @@ index 202fbfa58151eaff1493984b900b822760fa87ae..42afe7cc4f3e34424b3e44fb2516f851
}
diff --git a/src/plugins.c b/src/plugins.c
index f8d282ba28519e84cbcab97f38b94634d93c6a72..044950df7296bd9c470c610df43a98ac1650462b 100644
index f8d282b..044950d 100644
--- a/src/plugins.c
+++ b/src/plugins.c
@@ -32,13 +32,12 @@
......
Description: Identify modules by the ending .so instead of .la
.la files were stripped of the debs to fulfill the release goal
http://wiki.debian.org/ReleaseGoals/LAFileRemoval but the plugin loader of
libg3d tries to identify plugins by their libtool archive.
Author: Sven Eckelmann <sven@narfation.org>
From: Sven Eckelmann <sven@narfation.org>
Date: Mon, 8 Feb 2010 10:33:54 +0100
Subject: Identify modules by the ending .so instead of .la
.la files were stripped of the debs to fulfill the release goal
http://wiki.debian.org/ReleaseGoals/LAFileRemoval but the plugin loader of
libg3d tries to identify plugins by their libtool archive.
---
src/plugins.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/plugins.c b/src/plugins.c
index 31624e31e50298a057aafde2f433e322187da951..f8d282ba28519e84cbcab97f38b94634d93c6a72 100644
index 31624e3..f8d282b 100644
--- a/src/plugins.c
+++ b/src/plugins.c
@@ -89,7 +89,7 @@ static gboolean plugins_loaddirectory(G3DContext *context,
......
Description: Only require glib2.0 for header files
Programs linked against libg3d doesn't need to link to glib2.0 when they don't
use it directly. Pkg-config allows us to use Require.private in such
situations.
Author: Sven Eckelmann <sven@narfation.org>
From: Sven Eckelmann <sven@narfation.org>
Date: Mon, 24 May 2010 10:16:21 +0200
Subject: Only require glib2.0 for header files
Programs linked against libg3d doesn't need to link to glib2.0 when they don't
use it directly. Pkg-config allows us to use Require.private in such
situations.
---
libg3d.pc.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libg3d.pc.in b/libg3d.pc.in
index 5c0205b41afc5ef5bf6276d35ddd0b4d02f66163..41849fa26880c0c27c36eb3cf0d30c7fc22bad16 100644
index 5c0205b..41849fa 100644
--- a/libg3d.pc.in
+++ b/libg3d.pc.in
@@ -6,7 +6,7 @@ includedir=@includedir@
......
Description: fix possible endless loop in g3d_stream_seek
Origin: upstream, http://svn.gna.org/viewcvs/libg3d/trunk/src/stream.c?rev=426&r1=402&r2=426
Author: Eric Sesterhenn <SnakeByte@gmx.de>
From: Eric Sesterhenn <SnakeByte@gmx.de>
Date: Sat, 12 Sep 2009 15:23:40 +0200
Subject: fix possible endless loop in g3d_stream_seek
Origin: upstream, http://svn.gna.org/viewcvs/libg3d/trunk/src/stream.c?rev=426&r1=402&r2=426
---
src/stream.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/stream.c b/src/stream.c
index 48de709a9084a72dbcf94b7856a26983d283d9e8..75948f3fa0a8c569e7eec0d8b3e4969288f32d7d 100644
index 48de709..75948f3 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -82,7 +82,7 @@ gint g3d_stream_skip(G3DStream *stream, goffset offset)
......
fix-memory-leaks.patch
endless-seek.patch
configure-cxx.patch
autoreconf-libtool.patch
load-so-modules.patch
fix-memory-leaks-2.patch
pc-glib2-private.patch
fix-memory-leaks-3.patch
fix-memory-leaks-dae.patch
pkglib_data.patch
implicit_declaration.patch
Fix-memory-leaks-in-plugins.patch
fix-possible-endless-loop-in-g3d_stream_seek.patch
Add-AC_PROG_CXX-for-tests-Makefile.am.patch
Allow-libtool-to-update-their-files-to-keep-them-con.patch
Identify-modules-by-the-ending-.so-instead-of-.la.patch
Fix-memory-leaks.patch
Only-require-glib2.0-for-header-files.patch
Fix-memory-leaks-7.patch
Fix-memory-leaks-in-dae-plugin.patch
Fix-build-with-automake-1.11.3.patch
Fix-implicit-declarations-of-functions.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment