Bug#706786: git: please use source format 3.0 (quilt)

[Jonathan Nieder]

tags 706786 + pending
quit

Gerrit Pape wrote:

 since I'm quite inactive these days anyway, I think go ahead with nearly
 all suggestions you have.  You have my trust.  If possible, I'd still
 like to see the general packaging, patch and build process unchanged
 (i.e. not switching to debhelper, dpatch or the like).

Thanks for the kind words.  Yeah, I'll continue to try to keep to that
guideline, getting advice from git@packages when unsure.


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#706786: git: please use source format 3.0 (quilt)

[Gerrit Pape]

On Sat, May 04, 2013 at 03:21:43PM -0700, Jonathan Nieder wrote:
 When adding debian/README.source, I wanted to make a symlink, but
 the traditional source package format represents the debian/ directory
 with a unified diff so it wasn't possible.
 
 How about this patch?

Hi Jonathan,

since I'm quite inactive these days anyway, I think go ahead with nearly
all suggestions you have.  You have my trust.  If possible, I'd still
like to see the general packaging, patch and build process unchanged
(i.e. not switching to debhelper, dpatch or the like).

Thanks a lot for taking care of the packages that steadily and also the
upstream work you do.

Regards, Gerrit.


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#706786: git: please use source format 3.0 (quilt)

[Jonathan Nieder]

Source: git
Version: 1:1.8.3~rc1-1
Severity: wishlist
Tags: patch

Hi,

When adding debian/README.source, I wanted to make a symlink, but
the traditional source package format represents the debian/ directory
with a unified diff so it wasn't possible.

How about this patch?

 * Source format 3.0 (quilt) uses a tarball for the debian/
   directory, which would let we put binary files, special files,
   and permissions there when appropriate.

 * Patches stay in debian/diff/, where source format 3.0 (quilt)
   doesn't care about them.  The current patch system is working
   fine, so I don't see any reason to switch.

 * The VCS would continue to track the unpatched source in
   debian-release branches and patched source in
   track+patches branches.

 * Most contributors shouldn't notice the difference.

Sensible?
Jonathan
From: Jonathan Nieder jrnie...@gmail.com
Date: Sat, 4 May 2013 15:18:41 -0700
Subject: debian: use source format 3.0 (quilt)

Source format 3.0 (quilt) uses a tarball instead of a diff for the
debian/ directory, letting a person put binary files, special files,
and files with non-644 permissions when appropriate.

Patches in this package would stay in debian/diff/, where source
format 3.0 (quilt) doesn't care about them at unpack time.  The
current patch system is working fine, and it's not a compelling time
to change that.

The VCS will continue to track the unpatched source in
debian-release branches and patched source in track+patches
branches.

Most contributors should not notice the difference, except that the
source package will be a little smaller to download and
dpkg-buildpackage a little quieter about unrepresentable changes to
permissions.

Signed-off-by: Jonathan Nieder jrnie...@gmail.com
---
 debian/changelog | 1 +
 debian/source/format | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 debian/source/format

diff --git a/debian/changelog b/debian/changelog
index 7ce02528..9aff7805 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ git (1:1.8.3~rc1-1.1) experimental; urgency=low
 * debian/control: git-svn: Breaks: and Replaces: old git.
   * debian/rules: install perl module manpages to git-man and
 git-svn packages, as appropriate.
+  * Use source format 3.0 (quilt).
 
  -- Jonathan Nieder jrnie...@gmail.com  Sat, 04 May 2013 15:04:47 -0700
 
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index ..163aaf8d
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
-- 
1.8.3.rc1