Your message dated Sun, 2 Nov 2014 17:42:32 +0000
with message-id <20141102174232.gh18...@lupin.home.powdarrmonkey.net>
and subject line Re: Bug#767768: unblock: doxygen/1.8.8-5
has caused the Debian Bug report #767768,
regarding unblock: doxygen/1.8.8-5
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 ow...@bugs.debian.org
immediately.)
--
767768: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=767768
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package doxygen
The 1.8.8-5 upload fixes two rc bugs:
#762272: Doxygen segfaults while building src:efl. Resolve by
cherry-picking upstream commit.
#767658: src:doxygen FTBFS since dpkg no longer accepts the old
Build-Profiles syntax.
Please find a .debdiff between jessie and sid attached. Unblock command
likely is:
unblock doxygen/1.8.8-5
Helmut
diff -Nru doxygen-1.8.8/debian/changelog doxygen-1.8.8/debian/changelog
--- doxygen-1.8.8/debian/changelog 2014-10-05 17:52:05.000000000 +0200
+++ doxygen-1.8.8/debian/changelog 2014-11-02 15:08:03.000000000 +0100
@@ -1,3 +1,10 @@
+doxygen (1.8.8-5) unstable; urgency=medium
+
+ * Cherry pick c83db38ea83499be19d9ff242bfa22ae534ee80c. (Closes: #762272)
+ * Fix FTBFS: Update syntax of Build-Profiles header. (Closes: #767658)
+
+ -- Helmut Grohne <hel...@subdivi.de> Sun, 02 Nov 2014 15:07:52 +0100
+
doxygen (1.8.8-4) unstable; urgency=medium
* Cherry pick 6d4044ad43ae1424a256eb1c26992301e7c64f4a. (Closes: #760700)
diff -Nru doxygen-1.8.8/debian/control doxygen-1.8.8/debian/control
--- doxygen-1.8.8/debian/control 2014-10-05 17:37:48.000000000 +0200
+++ doxygen-1.8.8/debian/control 2014-11-02 14:17:44.000000000 +0100
@@ -86,7 +86,7 @@
Depends: doxygen, ${shlibs:Depends}, ${misc:Depends}
Suggests: doxygen-doc
Replaces: doxygen (<< 1.2.14)
-Build-Profiles: !stage1
+Build-Profiles: <!stage1>
Description: GUI configuration tool for doxygen
Doxygen is a documentation system for C, C++, Java, Objective-C, Python, IDL
and to some extent PHP, C#, and D. It can generate an on-line class browser
diff -Nru doxygen-1.8.8/debian/patches/fix-762272.diff
doxygen-1.8.8/debian/patches/fix-762272.diff
--- doxygen-1.8.8/debian/patches/fix-762272.diff 1970-01-01
01:00:00.000000000 +0100
+++ doxygen-1.8.8/debian/patches/fix-762272.diff 2014-11-02
14:15:43.000000000 +0100
@@ -0,0 +1,76 @@
+From: Dimitri van Heesch <dimi...@stack.nl>
+Subject: Debian Bug 762272: segfault with cyclic subgroups
+Bug-Debian: https://bugs.debian.org/762272
+Last-Modified: 2014-11-02
+Origin:
https://github.com/doxygen/doxygen/commits/c83db38ea83499be19d9ff242bfa22ae534ee80c
+
+Index: doxygen/src/groupdef.cpp
+===================================================================
+--- doxygen.orig/src/groupdef.cpp 2014-11-02 14:15:33.000000000 +0100
++++ doxygen/src/groupdef.cpp 2014-11-02 14:15:33.000000000 +0100
+@@ -510,7 +510,31 @@
+
+ bool GroupDef::containsGroup(const GroupDef *def)
+ {
+- return this==def || groupList->find(def) >= 0;
++ if (this==def)
++ {
++ return TRUE;
++ }
++ else if (groupList->find(def)>=0)
++ {
++ return TRUE;
++ }
++ else // look for subgroups as well
++ {
++ GroupList *groups = partOfGroups();
++ if (groups)
++ {
++ GroupListIterator it(*groups);
++ GroupDef *gd;
++ for (;(gd=it.current());++it)
++ {
++ if (gd->containsGroup(def))
++ {
++ return TRUE;
++ }
++ }
++ }
++ }
++ return FALSE;
+ }
+
+ void GroupDef::addGroup(const GroupDef *def)
+@@ -1229,16 +1253,23 @@
+ for (;(g=gli.current());++gli)
+ {
+ GroupDef *gd=0;
+- if (!g->groupname.isEmpty() &&
(gd=Doxygen::groupSDict->find(g->groupname)) &&
+- !gd->containsGroup(subGroup) )
+- {
+- gd->addGroup(subGroup);
+- subGroup->makePartOfGroup(gd);
+- }
+- else if (gd==subGroup)
++ if (!g->groupname.isEmpty() &&
(gd=Doxygen::groupSDict->find(g->groupname)))
+ {
+- warn(root->fileName,root->startLine,"Trying to add group %s to itself!",
+- gd->name().data());
++ if (gd==subGroup)
++ {
++ warn(root->fileName,root->startLine,"Refusing to add group %s to
itself",
++ gd->name().data());
++ }
++ else if (gd->containsGroup(subGroup))
++ {
++ warn(root->fileName,root->startLine,"Refusing to add group %s to
group %s, since the latter is already a "
++ "subgroup of the former\n",
subGroup->name().data(),gd->name().data());
++ }
++ else
++ {
++ gd->addGroup(subGroup);
++ subGroup->makePartOfGroup(gd);
++ }
+ }
+ }
+ }
diff -Nru doxygen-1.8.8/debian/patches/series
doxygen-1.8.8/debian/patches/series
--- doxygen-1.8.8/debian/patches/series 2014-10-05 16:56:26.000000000 +0200
+++ doxygen-1.8.8/debian/patches/series 2014-10-31 23:28:33.000000000 +0100
@@ -10,3 +10,4 @@
clang-configure.diff
sqlite3-configure.diff
fix-760700.diff
+fix-762272.diff
--- End Message ---
--- Begin Message ---
On Sun, Nov 02, 2014 at 04:13:12PM +0100, Helmut Grohne wrote:
> Please unblock package doxygen
>
> The 1.8.8-5 upload fixes two rc bugs:
>
> #762272: Doxygen segfaults while building src:efl. Resolve by
> cherry-picking upstream commit.
> #767658: src:doxygen FTBFS since dpkg no longer accepts the old
> Build-Profiles syntax.
Unblocked, thanks.
--
Jonathan Wiltshire j...@debian.org
Debian Developer http://people.debian.org/~jmw
4096R: 0xD3524C51 / 0A55 B7C5 1223 3942 86EC 74C3 5394 479D D352 4C51
signature.asc
Description: Digital signature
--- End Message ---
