Bug#286771: marked as done (xfree86: debian/changelog contains Subversion conflict markers)
Your message dated Tue, 08 Mar 2005 21:07:14 -0800
with message-id <422E8482.7070602@verizon.net>
and subject line Bug no longer present in xfree86 4.3.0.dfsg.1-12
has caused the attached Bug report 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 I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--------------------------------------
Received: (at submit) by bugs.debian.org; 22 Dec 2004 03:12:19 +0000
>From asp16@alu.ua.es Tue Dec 21 19:12:19 2004
Return-path: <asp16@alu.ua.es>
Received: from 84-120-66-96.onocable.ono.com (chistera.yi.org) [84.120.66.96]
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1CgwvD-0000VR-00; Tue, 21 Dec 2004 19:12:19 -0800
Received: from userid 1000 by chistera.yi.org with local (Exim 4.34)
id 1CgwvB-0000Sl-J6
for submit@bugs.debian.org; Wed, 22 Dec 2004 04:12:17 +0100
Date: Wed, 22 Dec 2004 04:12:17 +0100
From: Adeodato =?iso-8859-1?Q?Sim=F3?= <asp16@alu.ua.es>
To: Debian Bug Tracking System <submit@bugs.debian.org>
Subject: xfree86: debian/changelog contains Subversion conflict markers
Message-ID: <20041222031217.GA1701@chistera.yi.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
X-No-CC: Please respect my Mail-Followup-To header
User-Agent: Mutt/1.5.6+20040907i
Delivered-To: submit@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-6.8 required=4.0 tests=BAYES_00,FROM_ENDS_IN_NUMS,
HAS_PACKAGE autolearn=no version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level:
Package: xfree86
Version: 4.3.0.dfsg.1-10
Severity: minor
hi,
lines 365-369 of changelog.Debian.gz read like this:
<<<<<<< .working
-- Fabio M. Di Nitto <fabbione@fabbione.net> Thu, 09 Dec 2004 17:14:45 +0100
=======
-- Fabio M. Di Nitto <fabbione@fabbione.net> Thu, 9 Dec 2004 17:14:45 +0100
>>>>>>> .merge-right.r2073
$ md5sum changelog.Debian.gz
9d14873c0219e637209b57ea5ed5c996 changelog.Debian.gz
cheers,
--
Adeodato Simó
EM: asp16 [ykwim] alu.ua.es | PK: DA6AE621
Listening to: Manitoba - Paul's Birthday
Everything you read in newspapers is absolutely true, except for that
rare story of which you happen to have first-hand knowledge.
-- Erwin Knoll
---------------------------------------
Received: (at 286771-done) by bugs.debian.org; 9 Mar 2005 05:09:52 +0000
>From josh.trip@verizon.net Tue Mar 08 21:09:52 2005
Return-path: <josh.trip@verizon.net>
Received: from vms048pub.verizon.net [206.46.252.48]
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1D8tSC-0005eo-00; Tue, 08 Mar 2005 21:09:52 -0800
Received: from [192.168.1.3] ([4.5.66.209])
by vms048.mailsrvcs.net (Sun Java System Messaging Server 6.2 HotFix 0.04
(built Dec 24 2004)) with ESMTPA id <0ID200E31JOFVLJ2@vms048.mailsrvcs.net> for
286771-done@bugs.debian.org; Tue, 08 Mar 2005 23:09:51 -0600 (CST)
Date: Tue, 08 Mar 2005 21:07:14 -0800
From: Josh Triplett <josh.trip@verizon.net>
Subject: Bug no longer present in xfree86 4.3.0.dfsg.1-12
To: 286771-done@bugs.debian.org
Message-id: <422E8482.7070602@verizon.net>
MIME-version: 1.0
Content-type: multipart/signed; micalg=pgp-sha1;
protocol="application/pgp-signature";
boundary=------------enig2004B1DF966C8515D9D1C49D
X-Accept-Language: en-us, en
X-Enigmail-Version: 0.90.0.0
X-Enigmail-Supports: pgp-inline, pgp-mime
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7.5) Gecko/20050105
Debian/1.7.5-1
Delivered-To: 286771-done@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-3.0 required=4.0 tests=BAYES_00 autolearn=no
version=2.60-bugs.debian.org_2005_01_02
X-Spam-Level:
This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
--------------enig2004B1DF966C8515D9D1C49D
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
I'm running xfree86 4.3.0.dfsg.1-12, and the offending text is no longer
present in the changelog.
- Josh Triplett
--------------enig2004B1DF966C8515D9D1C49D
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
Comment: Using GnuPG with Debian - http://enigmail.mozdev.org
iD8DBQFCLoSKGJuZRtD+evsRAqfUAKCYlN/RqjkGquY9Nl0RWx7YdSvQXgCguHJ7
t72YUF4fUFs6VUeUk8Rilt0=
=aIoZ
-----END PGP SIGNATURE-----
--------------enig2004B1DF966C8515D9D1C49D--
Reply to: