Your message dated Thu, 17 Jun 2010 09:34:39 +0000
with message-id <[email protected]>
and subject line Bug#583243: fixed in git-dpm 0.1.2-1
has caused the Debian Bug report #583243,
regarding git-dpm fails to init with upstream containing a debian/ directory
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 [email protected]
immediately.)
--
583243: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=583243
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: git-dpm
Version: 0.1.1-1
Severity: normal
Tags: upstream
After applying patches in patched branch, git-dpm fails with git saying some
files has content different from both file and the HEAD. When launching in
debug mode, I got this:
Make sure debian branch does not contain any additional changes...
Merging the new patched branch into debian/
Switched to branch 'master'
Create an index with files from 'patched'...
Remove possible debian/ in patched...
error: 'debian/changelog' has staged content different from both the file and
the HEAD
(use -f to force removal)
error: 'debian/compat' has staged content different from both the file and the
HEAD
(use -f to force removal)
error: 'debian/control' has staged content different from both the file and the
HEAD
(use -f to force removal)
error: 'debian/copyright' has staged content different from both the file and
the HEAD
(use -f to force removal)
error: 'debian/rules' has staged content different from both the file and the
HEAD
(use -f to force removal)
error: 'debian/watch' has staged content different from both the file and the
HEAD
(use -f to force removal)
Note that this repository is special in 2 ways.
First, upstream branch contains a debian/ directory as upstream tarball does.
Second, patches listed in debian/patches/series are already applied on upstream
and merged in master manually. This alone can't be the reason as I also did it
on another repository and it worked just fine. The command I launched is:
git dpm init --create-no-patches --patches-applied <upstrean-tarball> upstream
Best regards.
-- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (990, 'unstable'), (500, 'oldstable'), (500, 'testing'), (500,
'stable'), (1, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 2.6.32-5-686 (SMP w/1 CPU core)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-- debconf-show failed
--- End Message ---
--- Begin Message ---
Source: git-dpm
Source-Version: 0.1.2-1
We believe that the bug you reported is fixed in the latest version of
git-dpm, which is due to be installed in the Debian FTP archive:
git-dpm_0.1.2-1.debian.tar.gz
to main/g/git-dpm/git-dpm_0.1.2-1.debian.tar.gz
git-dpm_0.1.2-1.dsc
to main/g/git-dpm/git-dpm_0.1.2-1.dsc
git-dpm_0.1.2-1_all.deb
to main/g/git-dpm/git-dpm_0.1.2-1_all.deb
git-dpm_0.1.2.orig.tar.gz
to main/g/git-dpm/git-dpm_0.1.2.orig.tar.gz
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Bernhard R. Link <[email protected]> (supplier of updated git-dpm package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Wed, 16 Jun 2010 10:26:22 +0200
Source: git-dpm
Binary: git-dpm
Architecture: source all
Version: 0.1.2-1
Distribution: unstable
Urgency: low
Maintainer: Bernhard R. Link <[email protected]>
Changed-By: Bernhard R. Link <[email protected]>
Description:
git-dpm - git Debian package manager
Closes: 583243
Changes:
git-dpm (0.1.2-1) unstable; urgency=low
.
* several small bugfixes including
- fix error processing changed upstream debian/ directory
(Closes: 583243)
* do not compress manpage.pdf
Checksums-Sha1:
2338554fa82fbe250ff174355c2dc3a95aebac54 1283 git-dpm_0.1.2-1.dsc
8a9fa8462113c532879599b69a148b1863490442 95873 git-dpm_0.1.2.orig.tar.gz
ddde47477211b4816cab25e5387b43b899e1e2dd 2219 git-dpm_0.1.2-1.debian.tar.gz
19045f6768319c266e3139c029a0061a0eda4a27 125214 git-dpm_0.1.2-1_all.deb
Checksums-Sha256:
c72aca517299872c36f7bb4cb6b4ddf7561a840e33e7d6ca6431ff1adbf119f6 1283
git-dpm_0.1.2-1.dsc
d470e772070476ffe5067bcdf28513a347f55b3c3d08c8bccd4ee005db6b29ed 95873
git-dpm_0.1.2.orig.tar.gz
1aa9c9f1a651e8595dfc00fbc6d4110af3f8bac2f7ec34bc24188819634866ac 2219
git-dpm_0.1.2-1.debian.tar.gz
9f1a365706d48c7afe86be3e5a37b7dae099b34919b946c8c2415a1dea819d36 125214
git-dpm_0.1.2-1_all.deb
Files:
32fe4297613ab7b0a736e1730a907d51 1283 vcs extra git-dpm_0.1.2-1.dsc
42628181accb2dbd076d2d0025edf6fa 95873 vcs extra git-dpm_0.1.2.orig.tar.gz
7d373ae92fba848dcbbfd0e6e0298790 2219 vcs extra git-dpm_0.1.2-1.debian.tar.gz
4a177e45d5118b4dea6b2ebc95d10129 125214 vcs extra git-dpm_0.1.2-1_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iJwEAQECAAYFAkwZ5vYACgkQWzIpWA8dktr21gP/Zfk+1ZjXh/I5hyo87plI8wPV
+wgRUW/2qFwdVXuKl0yP+VSLvjeSVz20jOBG+lykyHEGqadRzFbhouOGVCcZ0//+
wYRS1HhbwnLLD3NEfeEwk/SuNiM2mSHtUpokihpfAnr66WdIIaTivtkPF+qtGga9
l4Z5EOasHbdRgp40xek=
=Tq/q
-----END PGP SIGNATURE-----
--- End Message ---
