[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#788615: marked as done (jessie-pu: package libgee-0.8/0.16.1-2)



Your message dated Sat, 05 Sep 2015 14:31:07 +0100
with message-id <1441459867.2151.32.camel@adam-barratt.org.uk>
and subject line Closing p-u bugs for 8.2
has caused the Debian Bug report #788615,
regarding jessie-pu: package libgee-0.8/0.16.1-2
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
788615: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=788615
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian.org@packages.debian.org
Usertags: pu

Hi,

due to bug in configure.ac, a very expensive debug option was turned on
in libgee. This went unnoticed unfortunately, so made it into jessie.
I've uploaded a fix to unstable as 0.16.1-2.
The complete debdiff is attached.

I would like to upload the same fix to jessie as well.
What's the preferred version in this case:
0.16.1-2~deb8u1 or 0.16.1-1+deb8u1 ?

Please let me know, and I'll update the debdiff accordingly (including
the upload target, which is unstable for -2).


Michael



-- System Information:
Debian Release: stretch/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (200, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.0.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff --git a/debian/changelog b/debian/changelog
index a32d69c..bb1e475 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+libgee-0.8 (0.16.1-2) unstable; urgency=medium
+
+  * Fix default value of --enable-consistency-check, otherwise a very
+    expensive debug option is turned on by default and would make a lot of
+    applications unusably slow. Patch cherry-picked from upstream Git.
+  * Fix the removal of the vala.stamp files so the C sources are regenerated.
+  * Add missing geeutils.vapi. This file is missing in the tarball but is
+    required if we want to rebuild the C source files.
+  * Drop gee_tree_set_check from symbols file. This symbol was exported by
+    accident due to the wrong default value of --enable-consistency-check. It
+    doesn't appear to be used by other applications, so it should be safe to
+    remove.
+  * Add myself to Uploaders.
+
+ -- Michael Biebl <biebl@debian.org>  Sat, 13 Jun 2015 13:35:15 +0200
+
 libgee-0.8 (0.16.1-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index f658dd8..a831aab 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,8 @@ Priority: optional
 Maintainer: Maintainers of Vala packages <pkg-vala-maintainers@lists.alioth.debian.org>
 Uploaders: Sebastian Dröge <slomo@debian.org>,
            Marc-Andre Lureau <marcandre.lureau@gmail.com>,
-           Sjoerd Simons <sjoerd@debian.org>
+           Sjoerd Simons <sjoerd@debian.org>,
+           Michael Biebl <biebl@debian.org>
 Build-Depends: cdbs (>= 0.4.93),
                debhelper (>= 9),
                dh-autoreconf,
diff --git a/debian/libgee-0.8-2.symbols b/debian/libgee-0.8-2.symbols
index ec036d1..e4b5e0e 100644
--- a/debian/libgee-0.8-2.symbols
+++ b/debian/libgee-0.8-2.symbols
@@ -433,7 +433,6 @@ libgee-0.8.so.2 libgee-0.8-2 #MINVER#
  gee_tree_multi_set_get_compare_func@Base 0.8.3
  gee_tree_multi_set_get_type@Base 0.8.3
  gee_tree_multi_set_new@Base 0.8.3
- gee_tree_set_check@Base 0.16.0
  gee_tree_set_construct@Base 0.8.3
  gee_tree_set_get_compare_func@Base 0.8.3
  gee_tree_set_get_type@Base 0.8.3
diff --git a/debian/patches/Add-missing-geeutils.vapi.patch b/debian/patches/Add-missing-geeutils.vapi.patch
new file mode 100644
index 0000000..8b509df
--- /dev/null
+++ b/debian/patches/Add-missing-geeutils.vapi.patch
@@ -0,0 +1,39 @@
+From: Michael Biebl <biebl@debian.org>
+Date: Sun, 24 May 2015 15:06:02 +0200
+Subject: Add missing geeutils.vapi
+
+This file is missing in the tarball but is required if we want to
+rebuild the C source files.
+
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=749781
+---
+ utils/geeutils.vapi | 20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)
+ create mode 100644 utils/geeutils.vapi
+
+diff --git a/utils/geeutils.vapi b/utils/geeutils.vapi
+new file mode 100644
+index 0000000..7b1472d
+--- /dev/null
++++ b/utils/geeutils.vapi
+@@ -0,0 +1,20 @@
++namespace Gee {
++	namespace Utils {
++		namespace Assume {
++			[CCode (cheader_filename = "assume.h", cname = "gee_utils_assume")]
++			public void assume(bool cond);
++		}
++		namespace Async {
++			[CCode (cheader_filename = "async.h")]
++			public async void yield_and_unlock (GLib.Mutex mutex);
++		}
++		namespace Free {
++			[CCode (cheader_filename = "free.h")]
++			public GLib.DestroyNotify? get_destroy_notify<G> ();
++		}
++		namespace Misc {
++			[CCode (cheader_filename = "misc.h", simple_generics = true)]
++			public void unused<G> (G unused);
++		}
++	}
++}
diff --git a/debian/patches/Fix-default-value-of-enable-consistency-check-fixes-.patch b/debian/patches/Fix-default-value-of-enable-consistency-check-fixes-.patch
new file mode 100644
index 0000000..759a661
--- /dev/null
+++ b/debian/patches/Fix-default-value-of-enable-consistency-check-fixes-.patch
@@ -0,0 +1,25 @@
+From: Giovanni Campagna <scampa.giovanni@gmail.com>
+Date: Thu, 12 Mar 2015 02:04:46 -0700
+Subject: Fix default value of --enable-consistency-check, fixes bug #746077
+
+The intent here was that --enable-consistency-check would default
+to disabled (because it's a very expensive debug option and would
+make a lot of applications unusably slow), but a copy paste
+mistake ended up disabling internal asserts instead.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index b1ba0fd..167acf4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -61,7 +61,7 @@ AC_ARG_ENABLE(internal-asserts, [AS_HELP_STRING([--disable-internal-asserts], [D
+ AS_IF([test "x$enable_internal_asserts" = xno], [VALA_ADD_VALAFLAGS(-D DISABLE_INTERNAL_ASSERTS)])
+ 
+ AC_ARG_ENABLE(consistency-check, [AS_HELP_STRING([--enable-consistency-check], [Enables (very) expensive consistency checks. It might affect the asymptotic performance.])],
+-              enable_consistency_check=$enableval, enable_internal_asserts=no)
++              enable_consistency_check=$enableval, enable_consistency_check=no)
+ AS_IF([test "x$enable_consistency_check" != xno], [VALA_ADD_VALAFLAGS(-D CONSISTENCY_CHECKS)])
+ 
+ GOBJECT_INTROSPECTION_CHECK([0.9.0])
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..d83da27 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+Fix-default-value-of-enable-consistency-check-fixes-.patch
+Add-missing-geeutils.vapi.patch
diff --git a/debian/rules b/debian/rules
index 787b971..6f3dfba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,4 @@ libgee := $(shell sed -nr 's/^Package:[[:space:]]*(libgee[-.0-9]+)[[:space:]]*$$
 DEB_DH_MAKESHLIBS_ARGS_$(libgee) = -V -- -c4
 
 makebuilddir::
-	rm -f gee/gee.vala.stamp
-	rm -f tests/tests.vala.stamp
-	rm -f benchmark/benchmarks.vala.stamp
+	find -name "*vala.stamp" -delete

--- End Message ---
--- Begin Message ---
Version: 8.2

Hi,

These bugs correspond to updates which were included in the 8.2 point
release.

Regards,

Adam

--- End Message ---

Reply to: