Your message dated Fri, 09 Jan 2009 23:47:04 +0000
with message-id <[email protected]>
and subject line Bug#468218: fixed in gitpkg 0.9
has caused the Debian Bug report #468218,
regarding gitpkg: (git-debimport) Merge upstream branch into master to get
better history
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.)
--
468218: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=468218
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: gitpkg
Version: 0.5
Severity: minor
Currently git-debimport only merges the branches together for the last
version. This patch will merge the upstream into debian before
applying the .diff.gz.
As a result, the commit for the .diff.gz only contains the changes to
the debian metadata.
-- System Information:
Debian Release: lenny/sid
APT prefers unstable
APT policy: (900, 'unstable'), (300, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 2.6.24-x60s (SMP w/2 CPU cores; PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
-- no debconf information
--- git-debimport.orig 2008-02-27 20:18:27.000000000 +0100
+++ git-debimport.merge 2008-02-27 20:18:45.000000000 +0100
@@ -176,6 +176,7 @@
echo "Importing $f"
git checkout "$DEBIAN_BRANCH"
+ git merge $(sanitise_git_ref "$UPSTREAM_TAG_PREFIX$UPSTREAM_VERSION")
for i in $(ls -A); do
if [ "$i" != ".git" ]; then rm -rf $i; fi
done
@@ -200,7 +201,7 @@
done
rm -rf "$CACHE_DIR"
-git merge -s ours "$UPSTREAM_BRANCH"
+git merge "$UPSTREAM_BRANCH"
echo "All done!"
--- End Message ---
--- Begin Message ---
Source: gitpkg
Source-Version: 0.9
We believe that the bug you reported is fixed in the latest version of
gitpkg, which is due to be installed in the Debian FTP archive:
gitpkg_0.9.dsc
to pool/main/g/gitpkg/gitpkg_0.9.dsc
gitpkg_0.9.tar.gz
to pool/main/g/gitpkg/gitpkg_0.9.tar.gz
gitpkg_0.9_all.deb
to pool/main/g/gitpkg/gitpkg_0.9_all.deb
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.
Ron Lee <[email protected]> (supplier of updated gitpkg 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: Sat, 10 Jan 2009 09:32:41 +1030
Source: gitpkg
Binary: gitpkg
Architecture: source all
Version: 0.9
Distribution: unstable
Urgency: low
Maintainer: Ron Lee <[email protected]>
Changed-By: Ron Lee <[email protected]>
Description:
gitpkg - helper scripts for maintaining packages with git
Closes: 468218
Changes:
gitpkg (0.9) unstable; urgency=low
.
* Add a --fetch option to git-debimport to retrieve packages from
snapshot.debian.net rather than requiring an existing local archive
to import. Many thanks to David Paleino for his work on making that
a very useful reality.
* Enable importing Debian 'native' packages too, this is much more useful
now that we have --fetch.
* Add a --late-merge option, which implements the previous behaviour wrt to
merging the upstream branch after an import and default to merging each new
upstream incrementally now. This gives a much better history if it succeeds
without conflicts, and lets us still fall back if not. Closes: #468218
* Make git-debimport generally more robust. Being able to kickstart a new
repo quickly and easily from package snapshots means this might be with us
and still useful for considerably longer than was initially planned.
Checksums-Sha1:
293cc85e8e73d21488b1dd77e239e8b4537314ae 778 gitpkg_0.9.dsc
0640b3944f52d34d33416551802983b9f20a58f8 11133 gitpkg_0.9.tar.gz
69df5a2a3b413f94efac5a49629e451efe2609ef 13912 gitpkg_0.9_all.deb
Checksums-Sha256:
06b17192c9201790ba429909367236ebdf28d4a71cd88d1be5d1689a6a61bb0d 778
gitpkg_0.9.dsc
6964699596301341e7beb0041afd21b792c76de4cb8d9e010e2bcb1c575dc301 11133
gitpkg_0.9.tar.gz
a42cac3bfd043ef1fceeb3a8b8a7c54c91ca024ee124a78bea618e35d792bd3d 13912
gitpkg_0.9_all.deb
Files:
743f963f785b4d79af5991e5d1c4043a 778 devel optional gitpkg_0.9.dsc
f398d760b2fe64226ffbc99ac95ee43c 11133 devel optional gitpkg_0.9.tar.gz
a92a0e416d9f8bc8bebe43afcb8fa261 13912 devel optional gitpkg_0.9_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iD4DBQFJZ915p4BCHGgCHOQRAr6KAJ98QT6uQcquvWitH3HtG3GQ8kU0kACXd4Bj
XodhkP8pO6P6pGexEyYfDQ==
=iJ24
-----END PGP SIGNATURE-----
--- End Message ---
