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

Bug#687765: marked as done (unblock: adanaxisgpl/1.2.5.dfsg.1-4.1, bzr-stats/0.1.0+bzr51-1 and gnat-gps/5.0-13)

Your message dated Sat, 1 Dec 2012 12:49:16 +0100
with message-id <20121201114916.GJ5634@radis.cristau.org>
and subject line Re: Bug#687765: unblock: adanaxisgpl/1.2.5.dfsg.1-4.1, bzr-stats/0.1.0+bzr51-1 and gnat-gps/5.0-13
has caused the Debian Bug report #687765,
regarding unblock: adanaxisgpl/1.2.5.dfsg.1-4.1, bzr-stats/0.1.0+bzr51-1 and gnat-gps/5.0-13
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.)


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

The packages below have a release critical bug in Debian Testing, which
is fixed in Debian Unstable. They do miss an unblock request, however:


Package adanaxisgpl/1.2.5.dfsg.1-4.1

    Fixing #667094 -- adanaxisgpl: ftbfs with GCC-4.7

    The debdiff is minimal and only adds -fpermissive to CXXFLAGS [1]


Package bzr-stats/0.1.0+bzr51-1

    Fixing #686138 -- bzr-stats: incompatibility with bzr 2.6

    This is a full maintainer upload, but the debdiff looks pretty
minimal and acceptable. However, it does some packaging related changes.
YMMV. The debdiff is attached


Package gnat-gps/5.0-13

    #684194 -- gnat-gps: /u/s/d/gnat-gps is empty after upgrade from squeeze

    The upload fixes the bug only. A debdiff is attached


unblock adanaxisgpl/1.2.5.dfsg.1-4.1
unblock bzr-stats/0.1.0+bzr51-1
unblock gnat-gps/5.0-13

At this point I gave up. Sometimes people are making life to you really
complicated, I understand your frustration now. :)

Here are some unblock requsts you are unlikely to accept.

Package calibre/0.8.64+dfsg-1:

    Fixing #653328 -- calibre: Calibre Quick Start Guide under
Non-Commercial License

    Note, the maintainer packaged a new upstream version which generates
a large delta between the Wheezy and Testing version. The RC bugfix
itself could be extracted for a t-p-u update only easily, however.
Please CC 653328 in case you won't unblock this request.


Package dnsmasq-base/2.63-3

    #686694 -- dnsmasq-base: fails to install: missing Depends: adduser

    There is a maintainer upload which adds a new upstream version as
well (despite the missing changelog entry mentioning that). The same as
for calibre applies here, a debdiff is not attached due to its size.

I might prepare a t-p-u NMU for these two.



unblock calibre/0.8.64+dfsg-1
unblock dnsmasq-base/2.63-3

[1]
http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=10;filename=adanaxisgpl.debdiff;att=1;bug=667094


-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)



-- 
with kind regards,
Arno Töll
IRC: daemonkeeper on Freenode/OFTC
GnuPG Key-ID: 0x9D80F36D

diff -Nru bzr-stats-0.1.0+bzr48/classify.py bzr-stats-0.1.0+bzr51/classify.py
--- bzr-stats-0.1.0+bzr48/classify.py	2010-10-13 06:54:33.000000000 +0200
+++ bzr-stats-0.1.0+bzr51/classify.py	2012-08-28 02:28:39.000000000 +0200
@@ -15,6 +15,8 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """Classify a commit based on the types of files it changed."""
 
+from __future__ import absolute_import
+
 import os.path
 
 from bzrlib import urlutils
diff -Nru bzr-stats-0.1.0+bzr48/cmds.py bzr-stats-0.1.0+bzr51/cmds.py
--- bzr-stats-0.1.0+bzr48/cmds.py	2011-03-22 00:27:31.000000000 +0100
+++ bzr-stats-0.1.0+bzr51/cmds.py	2012-08-28 02:28:39.000000000 +0200
@@ -15,6 +15,8 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """A Simple bzr plugin to generate statistics about the history."""
 
+from __future__ import absolute_import
+
 from bzrlib import (
     branch,
     commands,
@@ -26,6 +28,7 @@
     ui,
     workingtree,
     )
+from bzrlib.revision import NULL_REVISION
 from bzrlib.plugins.stats.classify import classify_delta
 
 from itertools import izip
@@ -166,7 +169,10 @@
     a_repo.lock_read()
     try:
         trace.note('getting ancestry')
-        ancestry = a_repo.get_ancestry(revision)[1:]
+        graph = a_repo.get_graph()
+        ancestry = [
+            r for (r, ps) in graph.iter_ancestry([revision])
+            if ps is not None and r != NULL_REVISION]
         revs, canonical_committer = get_revisions_and_committers(a_repo, ancestry)
     finally:
         a_repo.unlock()
@@ -183,11 +189,9 @@
     pb = ui.ui_factory.nested_progress_bar()
     a_repo.lock_read()
     try:
-        trace.note('getting ancestry 1')
-        start_ancestry = set(a_repo.get_ancestry(start_rev))
-        trace.note('getting ancestry 2')
-        ancestry = a_repo.get_ancestry(end_rev)[1:]
-        ancestry = [rev for rev in ancestry if rev not in start_ancestry]
+        graph = a_repo.get_graph()
+        trace.note('getting ancestry diff')
+        ancestry = graph.find_difference(start_rev, end_rev)[1]
         revs, canonical_committer = get_revisions_and_committers(a_repo, ancestry)
     finally:
         a_repo.unlock()
@@ -366,7 +370,8 @@
            }
     repository.lock_read()
     try:
-        ancestry = filter(lambda x: x is not None, repository.get_ancestry(revid))
+        graph = repository.get_graph()
+        ancestry = [r for (r, ps) in graph.iter_ancestry([revid]) if ps is not None]
         revs = repository.get_revisions(ancestry)
         pb = ui.ui_factory.nested_progress_bar()
         try:
diff -Nru bzr-stats-0.1.0+bzr48/debian/changelog bzr-stats-0.1.0+bzr51/debian/changelog
--- bzr-stats-0.1.0+bzr48/debian/changelog	2012-05-29 00:50:34.000000000 +0200
+++ bzr-stats-0.1.0+bzr51/debian/changelog	2012-08-31 16:08:07.000000000 +0200
@@ -1,3 +1,19 @@
+bzr-stats (0.1.0+bzr51-1) unstable; urgency=low
+
+  * New maintainer (Closes: #668919)
+  * New upstream snapshot
+   + fix compatibility with bzr 2.6 (Closes: #686138)
+  * debian/rules
+   - add get-orig-source target
+  * debian/control
+   - remove half broken Build-Depends: bzr (<< 2.4.0~beta1-2)
+   - update X-Python-Version to 2.6 or later to follow bzr package
+  * debian/copyright
+   - merge contents of same field
+   - remove comment field
+
+ -- Koichi Akabe <vbkaisetsu@gmail.com>  Tue, 28 Aug 2012 15:57:29 +0900
+
 bzr-stats (0.1.0+bzr48-2) unstable; urgency=low
 
   * Orphan package.
diff -Nru bzr-stats-0.1.0+bzr48/debian/control bzr-stats-0.1.0+bzr51/debian/control
--- bzr-stats-0.1.0+bzr48/debian/control	2012-05-29 00:50:34.000000000 +0200
+++ bzr-stats-0.1.0+bzr51/debian/control	2012-08-31 16:04:30.000000000 +0200
@@ -1,16 +1,15 @@
 Source: bzr-stats
 Section: vcs
 Priority: optional
-Maintainer: Debian QA Group <packages@qa.debian.org>
-Build-Depends-Indep: python-bzrlib.tests | bzr (<< 2.4.0~beta1-2),
-                     bzr (>= 1.13~),
-                     python-subunit,
-                     python-testtools
+Maintainer: Debian Bazaar Maintainers <pkg-bazaar-maint@lists.alioth.debian.org>
+Uploaders: Koichi Akabe <vbkaisetsu@gmail.com>
+Build-Depends-Indep: python-bzrlib.tests, bzr (>= 1.13~), python-subunit, python-testtools
 Build-Depends: debhelper (>= 7.0.50~), python (>= 2.6.6-3)
 Standards-Version: 3.9.3
-X-Python-Version: >= 2.4
-Vcs-Bzr: http://bzr.debian.org/pkg-bazaar/bzr-stats/unstable
+X-Python-Version: >= 2.6
 Homepage: http://launchpad.net/bzr-stats
+Vcs-Bzr: http://bzr.debian.org/bzr/pkg-bazaar/bzr-stats/unstable
+Vcs-Browser: http://anonscm.debian.org/loggerhead/pkg-bazaar/bzr-stats/unstable/files
 DM-Upload-Allowed: yes
 
 Package: bzr-stats
diff -Nru bzr-stats-0.1.0+bzr48/debian/copyright bzr-stats-0.1.0+bzr51/debian/copyright
--- bzr-stats-0.1.0+bzr48/debian/copyright	2012-05-29 00:50:34.000000000 +0200
+++ bzr-stats-0.1.0+bzr51/debian/copyright	2012-08-28 02:15:30.000000000 +0200
@@ -1,39 +1,25 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: bzr-stats
 Upstream-Contact: Bazaar Developers <bazaar@lists.canonical.com>
-Source: https://launchpad.net/bzr-stats/
-
-Files: debian/*
-Comment:
- This package was debianized by Jelmer Vernooij <jelmer@samba.org> on Wed Oct
- 24 13:31:13 CET 2007.
-Copyright: Jelmer Vernooij <jelmer@debian.org>
-License: GPL-2+
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License with
- the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL-2;
- if not, write to the Free Software Foundation, Inc., 51 Franklin St,
- Fifth Floor, Boston, MA 02110-1301, USA.
+Source: https://launchpad.net/bzr-stats
 
 Files: *
 Comment:
  Upstream authors:
- Jelmer Vernooij <jelmer@samba.org>
- John Arbash Meinel <john@arbash-meinel.com>
- Russ Brown <pickscrape@gmail.com>
- Lukáš Lalinský <lalinsky@gmail.com>
- Wesley J. Landaker <wjlanda@sandia.gov>
+  Jelmer Vernooij <jelmer@samba.org>
+  John Arbash Meinel <john@arbash-meinel.com>
+  Russ Brown <pickscrape@gmail.com>
+  Lukáš Lalinský <lalinsky@gmail.com>
+  Wesley J. Landaker <wjlanda@sandia.gov>
 Copyright: 2007-2012 Canonical Ltd
-Copyright: 2008-2010 Jelmer Vernooij <jelmer@samba.org>
+           2008-2010 Jelmer Vernooij <jelmer@samba.org>
+License: GPL-2+
+
+Files: debian/*
+Copyright: Jelmer Vernooij <jelmer@debian.org>
+           Koichi Akabe <vbkaisetsu@gmail.com>
+License: GPL-2+
+
 License: GPL-2+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
diff -Nru bzr-stats-0.1.0+bzr48/debian/rules bzr-stats-0.1.0+bzr51/debian/rules
--- bzr-stats-0.1.0+bzr48/debian/rules	2012-05-29 00:50:34.000000000 +0200
+++ bzr-stats-0.1.0+bzr51/debian/rules	2012-08-31 16:04:08.000000000 +0200
@@ -12,3 +12,12 @@
 	$(CONCURRENCY) BZR_PLUGINS_AT=stats@$(CURDIR) /usr/bin/bzr selftest -s bp.stats \
 	    -v --parallel=fork
 endif
+
+PACKAGE = bzr-stats
+SRC_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(\([0-9]\+\):\)\?\(.*\)-.*/\3/p')
+BZR_REVISION := $(shell echo $(SRC_VERSION) | awk -F"+" '{ print $$2 }' | sed 's/bzr//' )
+TARBALL = $(PACKAGE)_$(SRC_VERSION).orig.tar.bz2
+.PHONY: get-orig-source
+get-orig-source:
+	bzr export $(TARBALL) -r $(BZR_REVISION) "lp:bzr-stats"
+	echo "  "$(TARBALL)" created; move it to the right destination to build the package"
diff -Nru bzr-stats-0.1.0+bzr48/info.py bzr-stats-0.1.0+bzr51/info.py
--- bzr-stats-0.1.0+bzr48/info.py	2011-02-26 20:26:00.000000000 +0100
+++ bzr-stats-0.1.0+bzr51/info.py	2012-08-28 02:28:39.000000000 +0200
@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 bzr_plugin_name = 'stats'
 
 bzr_plugin_version = (0, 2, 0, 'dev', 0)
diff -Nru bzr-stats-0.1.0+bzr48/po/en_GB.po bzr-stats-0.1.0+bzr51/po/en_GB.po
--- bzr-stats-0.1.0+bzr48/po/en_GB.po	1970-01-01 01:00:00.000000000 +0100
+++ bzr-stats-0.1.0+bzr51/po/en_GB.po	2012-08-28 02:28:39.000000000 +0200
@@ -0,0 +1,34 @@
+# English (United Kingdom) translation for bzr-stats
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the bzr-stats package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: bzr-stats\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-11-12 05:56+0100\n"
+"PO-Revision-Date: 2012-05-01 11:31+0000\n"
+"Last-Translator: Dan Bishop <dan@danbishop.org>\n"
+"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-02 05:14+0000\n"
+"X-Generator: Launchpad (build 15177)\n"
+
+#: cmds.py:243
+msgid "Generate statistics for LOCATION."
+msgstr "Generate statistics for LOCATION."
+
+#: cmds.py:248
+msgid "Show the class of contributions."
+msgstr "Show the class of contributions."
+
+#: cmds.py:286
+msgid "Figure out the ancestor graph for LOCATION"
+msgstr "Figure out the ancestor graph for LOCATION"
+
+#: cmds.py:395
+msgid "Determine credits for LOCATION."
+msgstr "Determine credits for LOCATION."
diff -Nru bzr-stats-0.1.0+bzr48/test_classify.py bzr-stats-0.1.0+bzr51/test_classify.py
--- bzr-stats-0.1.0+bzr48/test_classify.py	2010-01-15 23:15:53.000000000 +0100
+++ bzr-stats-0.1.0+bzr51/test_classify.py	2012-08-28 02:28:39.000000000 +0200
@@ -13,8 +13,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+from __future__ import absolute_import
+
 from bzrlib.tests import TestCase
-from bzrlib.plugins.stats.classify import classify_filename, classify_delta
+from bzrlib.plugins.stats.classify import classify_filename
 
 
 class TestClassify(TestCase):
diff -Nru bzr-stats-0.1.0+bzr48/test_stats.py bzr-stats-0.1.0+bzr51/test_stats.py
--- bzr-stats-0.1.0+bzr48/test_stats.py	2010-06-01 22:41:07.000000000 +0200
+++ bzr-stats-0.1.0+bzr51/test_stats.py	2012-08-28 02:28:39.000000000 +0200
@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from bzrlib.tests import TestCase, TestCaseWithTransport
 from bzrlib.revision import Revision
 from bzrlib.plugins.stats.cmds import get_revisions_and_committers, collapse_by_person

diff -Nru gnat-gps-5.0/debian/changelog gnat-gps-5.0/debian/changelog
--- gnat-gps-5.0/debian/changelog	2012-07-20 23:35:47.000000000 +0200
+++ gnat-gps-5.0/debian/changelog	2012-08-16 16:44:55.000000000 +0200
@@ -1,3 +1,9 @@
+gnat-gps (5.0-13) unstable; urgency=low
+
+  * Avoid symlinking documentation directories (Closes: #684194).
+
+ -- Nicolas Boulenguez <nicolas.boulenguez@free.fr>  Thu, 16 Aug 2012 12:40:48 +0200
+
 gnat-gps (5.0-12) unstable; urgency=low
 
   [Nicolas Boulenguez]
diff -Nru gnat-gps-5.0/debian/rm_doc_symlink.preinst.sed gnat-gps-5.0/debian/rm_doc_symlink.preinst.sed
--- gnat-gps-5.0/debian/rm_doc_symlink.preinst.sed	1970-01-01 01:00:00.000000000 +0100
+++ gnat-gps-5.0/debian/rm_doc_symlink.preinst.sed	2012-08-16 17:06:43.000000000 +0200
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# Abort on error.
+set -e
+
+# debian/rules will replace this with the package name.
+DOCLNK=/usr/share/doc/PKGNAME
+if test "$1" = upgrade \
+    -a -L $DOCLNK \
+    && dpkg --compare-versions "$2" lt-nl 5.0-13
+then
+    rm $DOCLNK
+fi
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff -Nru gnat-gps-5.0/debian/rules gnat-gps-5.0/debian/rules
--- gnat-gps-5.0/debian/rules	2012-06-14 23:54:00.000000000 +0200
+++ gnat-gps-5.0/debian/rules	2012-08-16 20:28:14.000000000 +0200
@@ -153,9 +153,23 @@
         done
 	dh_clean $(C_OBJECTS)
 
-override_dh_installdocs:
-	dh_installdocs --package=gnat-gps-doc
-	dh_installdocs --remaining-packages --link-doc=gnat-gps-common
+# Replacing documentation directories with symbolic links would spare
+# 10Kb but creates too much maintainance, see #684194 and #655383.
+# From 4.3-1 to 5.0-12, every binary package has created at least a
+# link, that dpkg may never have removed since (policy 6.6.4).
+# Generated preinst scripts will remove them.
+PREINST_ARCH  := debian/gnat-gps.preinst \
+                 debian/gnat-gps-dbg.preinst
+PREINST_INDEP := debian/gnat-gps-common.preinst \
+                 debian/gnat-gps-doc.preinst
+binary-arch: $(PREINST_ARCH)
+binary-indep: $(PREINST_INDEP)
+clean: clean_preinst
+$(PREINST_ARCH) $(PREINST_INDEP): debian/%.preinst: debian/rm_doc_symlink.preinst.sed
+	sed s/PKGNAME/$*/ < $< > $@
+.PHONY: clean_preinst
+clean_preinst:
+	$(RM) $(PREINST_ARCH) $(PREINST_INDEP)
 
 override_dh_compress:
 	dh_compress --all -X.xml -X.ads -X.adb -X.c -X.py

Attachment: signature.asc
Description: OpenPGP digital signature


--- End Message ---
--- Begin Message --- 
Hi,

I'm closing this bug, because the mixing of different packages with
different status makes it confusing.

bzr-stats and gnat-gps appear to have migrated already, adanaxisgpl is
still ood on kbsd.

On Sat, Sep 15, 2012 at 19:04:35 +0200, Arno Töll wrote:

> On 15.09.2012 18:24, Adam D. Barratt wrote:
> > There's already a request as #686547, and an earlier mail to the
> > maintainers requesting a t-p-u upload
> > (<MID:50431AD9.2060909@thykier.net>).
> >
> 
> Sorry, you're right. I missed that. That said, I may prepare a NMU to
> apologize for making your work :)
> 
Any luck with that?

Cheers,
Julien

Attachment: signature.asc
Description: Digital signature


--- End Message ---
Reply to: