From 23e56c29bdbca9862d483b3551b107cd9a25c648 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 7 Jan 2018 21:53:31 +0000 Subject: changelog: start 4.3 Signed-off-by: Ian Jackson --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 04a1be1..8d56188 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dgit (4.3~) unstable; urgency=medium + + * + + -- + dgit (4.2) unstable; urgency=low * Upload dgit 4.x series to unstable. -- cgit v1.2.3 From ef2804f8817f5d2771caa1c70a9ebe4591268099 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 7 Jan 2018 23:10:04 +0000 Subject: dgit: archive-api-query: Avoid crashing due to lack of $isuite Otherwise: Use of uninitialized value $isuite in concatenation (.) or string at dgit line 705. This breaks the infrastructure. Closes:#886592. Signed-off-by: Ian Jackson --- debian/changelog | 4 +++- dgit | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8d56188..6bac07b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ dgit (4.3~) unstable; urgency=medium - * + Bugfixes: + * dgit archive-api-query: Avoid crashing due to lack of $isuite. + This breaks the infrastructure. Closes:#886592. -- diff --git a/dgit b/dgit index e86e398..27dcf1c 100755 --- a/dgit +++ b/dgit @@ -6456,6 +6456,7 @@ sub pre_archive_api_query () { sub cmd_archive_api_query { badusage "need only 1 subpath argument" unless @ARGV==1; my ($subpath) = @ARGV; + local $isuite = 'DGIT-API-QUERY-CMD'; my @cmd = archive_api_query_cmd($subpath); push @cmd, qw(-f); debugcmd ">",@cmd; -- cgit v1.2.3 From 6e65361c03015f933a393ad8667c0fb0dd0b6adf Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 24 Jan 2018 23:45:57 +0000 Subject: dgit(7): Discuss file executability. Signed-off-by: Ian Jackson --- debian/changelog | 3 +++ dgit.7 | 13 +++++++++++++ 2 files changed, 16 insertions(+) diff --git a/debian/changelog b/debian/changelog index 6bac07b..c32ba46 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,8 @@ dgit (4.3~) unstable; urgency=medium + Documentation improvements: + * dgit(7): Discuss file executability. + Bugfixes: * dgit archive-api-query: Avoid crashing due to lack of $isuite. This breaks the infrastructure. Closes:#886592. diff --git a/dgit.7 b/dgit.7 index 70165a1..ca11535 100644 --- a/dgit.7 +++ b/dgit.7 @@ -243,6 +243,19 @@ If you are not the maintainer, you do not need to worry about the source format of the package. You can just make changes as you like in git. If the package is a `3.0 (quilt)' package, the patch stack will usually not be represented in the git history. +.SH FILE EXECUTABILITY +Debian source package formats +do not always faithfully reproduce +changes to executability. +But dgit insists that the result of dgit clone is identical +(as far as git can represent - see Limitations, above) +to the result of dpkg-source -x. + +So files that are executable in your git tree +must be executable in the result of dpkg-source -x +(but often aren't). +If a package has such troublesome files, +they have to be non-executable in dgit-compatible git branches. .SH FORMAT 3.0 (QUILT) For a format `3.0 (quilt)' source package, dgit may have to make a commit on your current branch to contain metadata used by quilt and -- cgit v1.2.3 From 804bfec6be70bf9198938c3f87792aaabe3b4426 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 24 Jan 2018 23:46:33 +0000 Subject: dgit(7): Discuss git-unrepresentable properties of source trees. Signed-off-by: Ian Jackson --- debian/changelog | 1 + dgit.7 | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index c32ba46..694743f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ dgit (4.3~) unstable; urgency=medium Documentation improvements: * dgit(7): Discuss file executability. + * dgit(7): Discuss git-unrepresentable properties of source trees. Bugfixes: * dgit archive-api-query: Avoid crashing due to lack of $isuite. diff --git a/dgit.7 b/dgit.7 index ca11535..7ad5aba 100644 --- a/dgit.7 +++ b/dgit.7 @@ -197,6 +197,17 @@ import existing vcs history (which might not be faithful to dgit's invariants) or previous non-Dgit uploads (which would not provide a very rich history). + +git represents only file executability. +git does not represent empty directories, +or any leaf objects other than plain files and symlinks. +The behaviour of Debian source package formats +on objects with unusual permissions is complicated. +Some pathological Debian source packages will no longer build +if empty directories are pruned +(or if other things not reproduced by git are changed). +Such sources cannot be worked with properly in git, +and therefore not with dgit either. .SH READ-ONLY DISTROS Distros which do not maintain a set of dgit history git repositories can still be used in a read-only mode with dgit. Currently Ubuntu -- cgit v1.2.3 From 54947007d3db8f79649e5329fb990856ad97d5ec Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 24 Jan 2018 23:47:12 +0000 Subject: changelog: mention #884646 Signed-off-by: Ian Jackson --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 694743f..2957741 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ dgit (4.3~) unstable; urgency=medium Documentation improvements: - * dgit(7): Discuss file executability. + * dgit(7): Discuss file executability. Closes:#886444. * dgit(7): Discuss git-unrepresentable properties of source trees. Bugfixes: -- cgit v1.2.3 From ecb373e0b66e4874eb8208bea857001a42001bc9 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sat, 20 Jan 2018 09:32:56 -0700 Subject: dgit-maint-merge(7): debian/source/patch-header not in format 1.0 Suggested-by: Matthew Vernon Signed-off-by: Sean Whitton --- dgit-maint-merge.7.pod | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod index 0040604..2674d66 100644 --- a/dgit-maint-merge.7.pod +++ b/dgit-maint-merge.7.pod @@ -300,9 +300,14 @@ A single combined diff, containing all the changes, follows. =back -Alternatively, this text could be added to README.source. However, -this might distract from more important information present in the -latter file. +If you are using the version 1.0 source package format, this text +should be added to README.source instead. The version 1.0 source +package format ignores debian/source/patch-header. + +If you're using the version 3.0 (quilt) source package format, you +could add this text to README.source instead of +debian/source/patch-header, but this might distract from more +important information present in README.source. =head1 BUILDING AND UPLOADING -- cgit v1.2.3 From 937288061dd7cb5697c1ae107aabf133013d30f5 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 24 Jan 2018 23:49:44 +0000 Subject: changelog: mention #887850 fix Signed-off-by: Ian Jackson --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2957741..e32273b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ dgit (4.3~) unstable; urgency=medium Documentation improvements: * dgit(7): Discuss file executability. Closes:#886444. * dgit(7): Discuss git-unrepresentable properties of source trees. + * dgit-maint-merge(7): Don't suggest using debian/source/patch-header + for 1.0 source format. Closes:#887850. [Sean Whitton] Bugfixes: * dgit archive-api-query: Avoid crashing due to lack of $isuite. -- cgit v1.2.3 From 4210fa385422c0c5c35f9285410d734d9442430b Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 25 Jan 2018 00:34:08 +0000 Subject: changelog: finalise 4.3 Signed-off-by: Ian Jackson --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e32273b..62093d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dgit (4.3~) unstable; urgency=medium +dgit (4.3) unstable; urgency=high Documentation improvements: * dgit(7): Discuss file executability. Closes:#886444. @@ -10,7 +10,7 @@ dgit (4.3~) unstable; urgency=medium * dgit archive-api-query: Avoid crashing due to lack of $isuite. This breaks the infrastructure. Closes:#886592. - -- + -- Ian Jackson Thu, 25 Jan 2018 00:33:56 +0000 dgit (4.2) unstable; urgency=low -- cgit v1.2.3