summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog13
-rwxr-xr-xdgit8
-rw-r--r--tests/git-srcs/pari-extra_3-1.git.tarbin40960 -> 40960 bytes
-rw-r--r--tests/lib4
-rw-r--r--tests/pkg-srcs/example_1.0-1+absurd.debian.tar.xzbin1416 -> 1412 bytes
-rw-r--r--tests/pkg-srcs/example_1.0-1+absurd.dsc6
-rw-r--r--tests/pkg-srcs/example_1.0-1+brokenmeta.debian.tar.xzbin1304 -> 1304 bytes
-rw-r--r--tests/pkg-srcs/example_1.0-1+brokenmeta.dsc6
-rw-r--r--tests/pkg-srcs/example_1.0-1.100.debian.tar.xzbin2108 -> 2156 bytes
-rw-r--r--tests/pkg-srcs/example_1.0-1.100.dsc6
-rw-r--r--tests/pkg-srcs/example_1.0-1.debian.tar.xzbin1304 -> 1300 bytes
-rw-r--r--tests/pkg-srcs/example_1.0-1.dsc6
-rw-r--r--tests/pkg-srcs/pari-extra_3-1.diff.gzbin2358 -> 2357 bytes
-rw-r--r--tests/pkg-srcs/pari-extra_3-1.dsc27
-rw-r--r--tests/pkg-srcs/pari-extra_3-2~dummy1.diff.gzbin2484 -> 2486 bytes
-rw-r--r--tests/pkg-srcs/pari-extra_3-2~dummy1.dsc16
-rw-r--r--tests/pkg-srcs/ruby-rails-3.2_3.2.6-1.debian.tar.gzbin2297 -> 0 bytes
-rw-r--r--tests/pkg-srcs/ruby-rails-3.2_3.2.6-1.debian.tar.xzbin0 -> 2252 bytes
-rw-r--r--tests/pkg-srcs/ruby-rails-3.2_3.2.6-1.dsc30
-rw-r--r--tests/pkg-srcs/sunxi-tools_1.2-2.~~dgittest.debian.tar.gzbin5182 -> 0 bytes
-rw-r--r--tests/pkg-srcs/sunxi-tools_1.2-2.~~dgittest.debian.tar.xzbin0 -> 4892 bytes
-rw-r--r--tests/pkg-srcs/sunxi-tools_1.2-2.~~dgittest.dsc16
-rwxr-xr-xtests/tests/gdr-merge-conflicts4
-rwxr-xr-xtests/tests/mismatches-contents2
-rwxr-xr-xtests/update-dh-compat120
-rwxr-xr-xtests/update-dh-compat-adjust26
-rw-r--r--tests/worktrees/example_1.0.tarbin92160 -> 71680 bytes
-rw-r--r--tests/worktrees/example_1.1.tarbin81920 -> 81920 bytes
-rw-r--r--tests/worktrees/pari-extra_3-1.tarbin81920 -> 71680 bytes
-rw-r--r--tests/worktrees/pari-extra_drs.tarbin153600 -> 112640 bytes
-rw-r--r--tests/worktrees/ruby-rails-3.2_test.tarbin215040 -> 92160 bytes
31 files changed, 216 insertions, 74 deletions
diff --git a/debian/changelog b/debian/changelog
index 87281e2..5c79016 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,13 @@
-dgit (9.14~) unstable; urgency=medium
+dgit (9.15) unstable; urgency=medium
+
+ * dgit: pseudomerge_version_check: Check for unfinalised changelog entry.
+ * tests: Set FILTER_BRANCH_SQUELCH_WARNING=1
+ * tests: Use t-debchange in some places instead of dch
+ * tests: Update all using tests/update-db-compat. Closes: #1002927.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk> Sun, 02 Jan 2022 12:20:23 +0000
+
+dgit (9.14) unstable; urgency=medium
Bugfixes:
* Tolerate git config init.defaultBranch. Closes:#972098.
@@ -27,7 +36,7 @@ dgit (9.14~) unstable; urgency=medium
* Test creation of new symlink is treated as unrepresentable.
* Increase the nproc -> make -j factor.
- --
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk> Wed, 08 Sep 2021 01:30:53 +0100
dgit (9.13) unstable; urgency=medium
diff --git a/dgit b/dgit
index 9b83159..24ed457 100755
--- a/dgit
+++ b/dgit
@@ -4148,9 +4148,10 @@ sub pseudomerge_version_check ($$) {
progress f_
"Checking package changelog for archive version %s ...", $v;
my $cd;
+ my $vclogp;
eval {
my @xa = ("-f$v", "-t$v");
- my $vclogp = parsechangelog @xa;
+ $vclogp = parsechangelog @xa;
my $gf = sub {
my ($fn) = @_;
[ (getfield $vclogp, $fn),
@@ -4172,6 +4173,11 @@ sub pseudomerge_version_check ($$) {
Your tree seems to based on earlier (not uploaded) %s.
END
if $cd->[0] =~ m/UNRELEASED/;
+ fail f_ <<END, $v, $v
+d/changelog entry for %s is unfinalised!
+Your tree seems to based on earlier (not uploaded) %s.
+END
+ unless defined $vclogp->{Date};
}
}
diff --git a/tests/git-srcs/pari-extra_3-1.git.tar b/tests/git-srcs/pari-extra_3-1.git.tar
index 6392d83..7380353 100644
--- a/tests/git-srcs/pari-extra_3-1.git.tar
+++ b/tests/git-srcs/pari-extra_3-1.git.tar
Binary files differ
diff --git a/tests/lib b/tests/lib
index ee8d14f..c8ea771 100644
--- a/tests/lib
+++ b/tests/lib
@@ -58,6 +58,10 @@ export GIT_AUTHOR_DATE='1530000000 +0100'
export LC_CTYPE=C.UTF-8
unset CDPATH
+# We use git-filter-branch in various tests.
+# Nowadays it has a warning with associated sleep.
+export FILTER_BRANCH_SQUELCH_WARNING=1
+
root=`pwd`
troot=$root/tests
testname="${DGIT_TEST_TESTNAME-${0##*/}}"
diff --git a/tests/pkg-srcs/example_1.0-1+absurd.debian.tar.xz b/tests/pkg-srcs/example_1.0-1+absurd.debian.tar.xz
index 9a2dd12..dc1614c 100644
--- a/tests/pkg-srcs/example_1.0-1+absurd.debian.tar.xz
+++ b/tests/pkg-srcs/example_1.0-1+absurd.debian.tar.xz
Binary files differ
diff --git a/tests/pkg-srcs/example_1.0-1+absurd.dsc b/tests/pkg-srcs/example_1.0-1+absurd.dsc
index 1ab743d..b26fcbe 100644
--- a/tests/pkg-srcs/example_1.0-1+absurd.dsc
+++ b/tests/pkg-srcs/example_1.0-1+absurd.dsc
@@ -11,12 +11,12 @@ Package-List:
Checksums-Sha1:
2bc730f941db49de57e9678fb0b07bd95507bb44 236 example_1.0.orig-docs.tar.gz
4bff9170ce9b10cb59937195c5ae2c73719fe150 373 example_1.0.orig.tar.gz
- dafb6f0db0580179ff246dba1dc2892246e84a2c 1416 example_1.0-1+absurd.debian.tar.xz
+ c0beeb06befcfbdd5952c6925801ac17c172d29e 1412 example_1.0-1+absurd.debian.tar.xz
Checksums-Sha256:
ad9671f6b25cdd9f0573f803f702448a45a45183db1d79701aa760bccbeed29c 236 example_1.0.orig-docs.tar.gz
a3ef7c951152f3ec754f96fd483457aa88ba06df3084e6f1cc7c25b669567c17 373 example_1.0.orig.tar.gz
- 4003c34398894e46823bb3fda69f4351dbd5649e321259cde266a135f0428c51 1416 example_1.0-1+absurd.debian.tar.xz
+ 673169591a1de79f28da17b08768fd8fb1b1e84721df6f1fd9b4708f33f2c80c 1412 example_1.0-1+absurd.debian.tar.xz
Files:
cb0cb5487b1e5bcb82547396b4fe93e5 236 example_1.0.orig-docs.tar.gz
599f47808a7754c66aea3cda1b3208d6 373 example_1.0.orig.tar.gz
- 0e88c1ed094f09ee7bf57607132d55ee 1416 example_1.0-1+absurd.debian.tar.xz
+ 27324c0ef68306a4fa9c29ab7ade2492 1412 example_1.0-1+absurd.debian.tar.xz
diff --git a/tests/pkg-srcs/example_1.0-1+brokenmeta.debian.tar.xz b/tests/pkg-srcs/example_1.0-1+brokenmeta.debian.tar.xz
index caad820..504bbb6 100644
--- a/tests/pkg-srcs/example_1.0-1+brokenmeta.debian.tar.xz
+++ b/tests/pkg-srcs/example_1.0-1+brokenmeta.debian.tar.xz
Binary files differ
diff --git a/tests/pkg-srcs/example_1.0-1+brokenmeta.dsc b/tests/pkg-srcs/example_1.0-1+brokenmeta.dsc
index c7c363d..59d25ce 100644
--- a/tests/pkg-srcs/example_1.0-1+brokenmeta.dsc
+++ b/tests/pkg-srcs/example_1.0-1+brokenmeta.dsc
@@ -11,12 +11,12 @@ Package-List:
Checksums-Sha1:
2bc730f941db49de57e9678fb0b07bd95507bb44 236 example_1.0.orig-docs.tar.gz
4bff9170ce9b10cb59937195c5ae2c73719fe150 373 example_1.0.orig.tar.gz
- 68e0e1e3ec092409652d047e62bd3f0dba5a51f3 1304 example_1.0-1+brokenmeta.debian.tar.xz
+ 0b7117415e1b3c2e3a9084ef07872c95085ec0aa 1304 example_1.0-1+brokenmeta.debian.tar.xz
Checksums-Sha256:
ad9671f6b25cdd9f0573f803f702448a45a45183db1d79701aa760bccbeed29c 236 example_1.0.orig-docs.tar.gz
a3ef7c951152f3ec754f96fd483457aa88ba06df3084e6f1cc7c25b669567c17 373 example_1.0.orig.tar.gz
- 3ef0a50e3c0e025d0facada85d4508469c88150504c079698ae329c0c18bf315 1304 example_1.0-1+brokenmeta.debian.tar.xz
+ 9383ffabb2a169c252529f2dea098c55d0956fdadba34a8617bfbff47091ac7f 1304 example_1.0-1+brokenmeta.debian.tar.xz
Files:
cb0cb5487b1e5bcb82547396b4fe93e5 236 example_1.0.orig-docs.tar.gz
599f47808a7754c66aea3cda1b3208d6 373 example_1.0.orig.tar.gz
- 2ed3f4310bdda12b58b1b412d1c88dd9 1304 example_1.0-1+brokenmeta.debian.tar.xz
+ 48308be2bfae98f989e724fb3c52b397 1304 example_1.0-1+brokenmeta.debian.tar.xz
diff --git a/tests/pkg-srcs/example_1.0-1.100.debian.tar.xz b/tests/pkg-srcs/example_1.0-1.100.debian.tar.xz
index ea8ec34..e193d4d 100644
--- a/tests/pkg-srcs/example_1.0-1.100.debian.tar.xz
+++ b/tests/pkg-srcs/example_1.0-1.100.debian.tar.xz
Binary files differ
diff --git a/tests/pkg-srcs/example_1.0-1.100.dsc b/tests/pkg-srcs/example_1.0-1.100.dsc
index 5b075b5..8c7c417 100644
--- a/tests/pkg-srcs/example_1.0-1.100.dsc
+++ b/tests/pkg-srcs/example_1.0-1.100.dsc
@@ -11,12 +11,12 @@ Package-List:
Checksums-Sha1:
2bc730f941db49de57e9678fb0b07bd95507bb44 236 example_1.0.orig-docs.tar.gz
4bff9170ce9b10cb59937195c5ae2c73719fe150 373 example_1.0.orig.tar.gz
- 86c31eba5e08c1765f8e557b97e59d7e1fd9c208 2108 example_1.0-1.100.debian.tar.xz
+ 94dbd51291d7534a9e50a2cebfb1f484999e877b 2156 example_1.0-1.100.debian.tar.xz
Checksums-Sha256:
ad9671f6b25cdd9f0573f803f702448a45a45183db1d79701aa760bccbeed29c 236 example_1.0.orig-docs.tar.gz
a3ef7c951152f3ec754f96fd483457aa88ba06df3084e6f1cc7c25b669567c17 373 example_1.0.orig.tar.gz
- 163f1a753f0ea382148df8d9553240d503781badf03c600946f1400534da1349 2108 example_1.0-1.100.debian.tar.xz
+ 1d76c05cc52b1bc517defb336b7d1e8e59651fc19cd6e303b88be45558adca08 2156 example_1.0-1.100.debian.tar.xz
Files:
cb0cb5487b1e5bcb82547396b4fe93e5 236 example_1.0.orig-docs.tar.gz
599f47808a7754c66aea3cda1b3208d6 373 example_1.0.orig.tar.gz
- 4b7f5d286eff2608107c77c96584a01a 2108 example_1.0-1.100.debian.tar.xz
+ 7f30fd213f0e30613615b2c196c48635 2156 example_1.0-1.100.debian.tar.xz
diff --git a/tests/pkg-srcs/example_1.0-1.debian.tar.xz b/tests/pkg-srcs/example_1.0-1.debian.tar.xz
index 84ca563..4ff8b74 100644
--- a/tests/pkg-srcs/example_1.0-1.debian.tar.xz
+++ b/tests/pkg-srcs/example_1.0-1.debian.tar.xz
Binary files differ
diff --git a/tests/pkg-srcs/example_1.0-1.dsc b/tests/pkg-srcs/example_1.0-1.dsc
index bb65f6e..84f0f2e 100644
--- a/tests/pkg-srcs/example_1.0-1.dsc
+++ b/tests/pkg-srcs/example_1.0-1.dsc
@@ -11,12 +11,12 @@ Package-List:
Checksums-Sha1:
2bc730f941db49de57e9678fb0b07bd95507bb44 236 example_1.0.orig-docs.tar.gz
4bff9170ce9b10cb59937195c5ae2c73719fe150 373 example_1.0.orig.tar.gz
- f2398be1e588e10d11b20ee9bc5ca0eb16e4c158 1304 example_1.0-1.debian.tar.xz
+ 8d131c4fd924859e3462e48a33f669da15684992 1300 example_1.0-1.debian.tar.xz
Checksums-Sha256:
ad9671f6b25cdd9f0573f803f702448a45a45183db1d79701aa760bccbeed29c 236 example_1.0.orig-docs.tar.gz
a3ef7c951152f3ec754f96fd483457aa88ba06df3084e6f1cc7c25b669567c17 373 example_1.0.orig.tar.gz
- fd97c0fb879bfa8084f24a0d0f808a56beb533f17d92c808dc293ff297007925 1304 example_1.0-1.debian.tar.xz
+ 1bc840ae1b76b95ab375c962508a3b14f6958f9766e67c0ef06f5e7dd249d1c7 1300 example_1.0-1.debian.tar.xz
Files:
cb0cb5487b1e5bcb82547396b4fe93e5 236 example_1.0.orig-docs.tar.gz
599f47808a7754c66aea3cda1b3208d6 373 example_1.0.orig.tar.gz
- fd7840d249ee3dba5bdc3dcde7217bbe 1304 example_1.0-1.debian.tar.xz
+ 593103737fe55b5fafcdc0eda5e7f761 1300 example_1.0-1.debian.tar.xz
diff --git a/tests/pkg-srcs/pari-extra_3-1.diff.gz b/tests/pkg-srcs/pari-extra_3-1.diff.gz
index 81f7f2e..3c3d568 100644
--- a/tests/pkg-srcs/pari-extra_3-1.diff.gz
+++ b/tests/pkg-srcs/pari-extra_3-1.diff.gz
Binary files differ
diff --git a/tests/pkg-srcs/pari-extra_3-1.dsc b/tests/pkg-srcs/pari-extra_3-1.dsc
index 8d67ed0..110dbb6 100644
--- a/tests/pkg-srcs/pari-extra_3-1.dsc
+++ b/tests/pkg-srcs/pari-extra_3-1.dsc
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
Format: 1.0
Source: pari-extra
Binary: pari-extra
@@ -9,22 +6,14 @@ Version: 3-1
Maintainer: Bill Allombert <ballombe@debian.org>
Standards-Version: 3.9.2.0
Build-Depends: debhelper (>= 5)
-Package-List:
- pari-extra deb math optional
-Checksums-Sha1:
+Package-List:
+ pari-extra deb math optional arch=all
+Checksums-Sha1:
ff281e103ab11681324b0c694dd3514d78436c51 121 pari-extra_3.orig.tar.gz
- 080078dbc51e4194d209cb5abe57e2b25705fcaa 2358 pari-extra_3-1.diff.gz
-Checksums-Sha256:
+ ca13e48c1b8e063bd33a8c897c44b2fa54c7b607 2357 pari-extra_3-1.diff.gz
+Checksums-Sha256:
ac1ef39f9da80b582d1c0b2adfb09b041e3860ed20ddcf57a0e922e3305239df 121 pari-extra_3.orig.tar.gz
- bf4672acd5302b9eebee2f3bf5269022279e531204d7172b8761bb10fae3517a 2358 pari-extra_3-1.diff.gz
-Files:
+ 90b5f4bdda25d1bf39530cc14310f51d88c8696eef2589f4a7f5991596fe7b1d 2357 pari-extra_3-1.diff.gz
+Files:
76bcf03be979d3331f9051aa88439b8b 121 pari-extra_3.orig.tar.gz
- 02a39965adb84da9b3e6b5c5a0a4c378 2358 pari-extra_3-1.diff.gz
-
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.10 (GNU/Linux)
-
-iEYEARECAAYFAk5CvdoACgkQeDPs8bVESBX0mACeK3Yf9y22T2b6tw8eVQ8XSYxH
-ix4AoJJ3jrGJ4HXJNv/wbvmvBkkybvYJ
-=hkic
------END PGP SIGNATURE-----
+ 264a508299ea6d57c6a386e26d9d6f49 2357 pari-extra_3-1.diff.gz
diff --git a/tests/pkg-srcs/pari-extra_3-2~dummy1.diff.gz b/tests/pkg-srcs/pari-extra_3-2~dummy1.diff.gz
index f5dff2b..a793172 100644
--- a/tests/pkg-srcs/pari-extra_3-2~dummy1.diff.gz
+++ b/tests/pkg-srcs/pari-extra_3-2~dummy1.diff.gz
Binary files differ
diff --git a/tests/pkg-srcs/pari-extra_3-2~dummy1.dsc b/tests/pkg-srcs/pari-extra_3-2~dummy1.dsc
index 1042f09..a55a751 100644
--- a/tests/pkg-srcs/pari-extra_3-2~dummy1.dsc
+++ b/tests/pkg-srcs/pari-extra_3-2~dummy1.dsc
@@ -6,14 +6,14 @@ Version: 3-2~dummy1
Maintainer: Bill Allombert <ballombe@debian.org>
Standards-Version: 3.9.2.0
Build-Depends: debhelper (>= 5), package-does-not-exist
-Package-List:
- pari-extra deb math optional
-Checksums-Sha1:
+Package-List:
+ pari-extra deb math optional arch=all
+Checksums-Sha1:
ff281e103ab11681324b0c694dd3514d78436c51 121 pari-extra_3.orig.tar.gz
- 810c43d186ad2552d65949acf4a065fcfc823636 2484 pari-extra_3-2~dummy1.diff.gz
-Checksums-Sha256:
+ 335afa3b9e4b671a67d00e699be080df44fe08fa 2486 pari-extra_3-2~dummy1.diff.gz
+Checksums-Sha256:
ac1ef39f9da80b582d1c0b2adfb09b041e3860ed20ddcf57a0e922e3305239df 121 pari-extra_3.orig.tar.gz
- 41f47f24df7f50555f43549bd8377cce046750d29f69903e04b7fbfe396a0a73 2484 pari-extra_3-2~dummy1.diff.gz
-Files:
+ 2365210b7a21a28659747188464ae1b5869accc714212f6d5d0c6632899c2ca0 2486 pari-extra_3-2~dummy1.diff.gz
+Files:
76bcf03be979d3331f9051aa88439b8b 121 pari-extra_3.orig.tar.gz
- eff09e2ace409a150646c4994f17f800 2484 pari-extra_3-2~dummy1.diff.gz
+ 5a4ffde2059a1c4c7280bf63ca99991d 2486 pari-extra_3-2~dummy1.diff.gz
diff --git a/tests/pkg-srcs/ruby-rails-3.2_3.2.6-1.debian.tar.gz b/tests/pkg-srcs/ruby-rails-3.2_3.2.6-1.debian.tar.gz
deleted file mode 100644
index 633e6db..0000000
--- a/tests/pkg-srcs/ruby-rails-3.2_3.2.6-1.debian.tar.gz
+++ /dev/null
Binary files differ
diff --git a/tests/pkg-srcs/ruby-rails-3.2_3.2.6-1.debian.tar.xz b/tests/pkg-srcs/ruby-rails-3.2_3.2.6-1.debian.tar.xz
new file mode 100644
index 0000000..30a8787
--- /dev/null
+++ b/tests/pkg-srcs/ruby-rails-3.2_3.2.6-1.debian.tar.xz
Binary files differ
diff --git a/tests/pkg-srcs/ruby-rails-3.2_3.2.6-1.dsc b/tests/pkg-srcs/ruby-rails-3.2_3.2.6-1.dsc
index 4f2e290..f840718 100644
--- a/tests/pkg-srcs/ruby-rails-3.2_3.2.6-1.dsc
+++ b/tests/pkg-srcs/ruby-rails-3.2_3.2.6-1.dsc
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
Format: 3.0 (quilt)
Source: ruby-rails-3.2
Binary: ruby-rails-3.2, rails3
@@ -8,30 +5,21 @@ Architecture: all
Version: 3.2.6-1
Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers@lists.alioth.debian.org>
Uploaders: Antonio Terceiro <terceiro@debian.org>
-Dm-Upload-Allowed: yes
Homepage: http://www.rubyonrails.org
Standards-Version: 3.9.3
Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-rails.git;a=summary
Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-rails-3.2.git
Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~)
-Package-List:
- rails3 deb ruby optional
- ruby-rails-3.2 deb ruby optional
-Checksums-Sha1:
+Package-List:
+ rails3 deb ruby optional arch=all
+ ruby-rails-3.2 deb ruby optional arch=all
+Checksums-Sha1:
f36c3866b22de8ff6875fdbbfbcfb8d18e1f5a89 953 ruby-rails-3.2_3.2.6.orig.tar.gz
- 7208250afe7083e258d1fa36cc3a60527608df11 2297 ruby-rails-3.2_3.2.6-1.debian.tar.gz
-Checksums-Sha256:
+ 5a6ca14c46eb4b9297f024675d43002751d560e7 2252 ruby-rails-3.2_3.2.6-1.debian.tar.xz
+Checksums-Sha256:
207cfb1ef70aa9458c776deeda8e38ac977cbc852209828793b27d55bebc7bea 953 ruby-rails-3.2_3.2.6.orig.tar.gz
- 55decdcdc8248a4153fb7e5688ffdc3c3a2661a95f3870edba3e1eaf40907088 2297 ruby-rails-3.2_3.2.6-1.debian.tar.gz
-Files:
+ ab65b0fe41fff9abb87b538b5d526c2b47af27f784cf4cf2e8c01e399cde7b00 2252 ruby-rails-3.2_3.2.6-1.debian.tar.xz
+Files:
05a3954762c2a2101a10dd2efddf7000 953 ruby-rails-3.2_3.2.6.orig.tar.gz
- 87bdb28ef5053d825bda80e959e2fd1c 2297 ruby-rails-3.2_3.2.6-1.debian.tar.gz
+ e1c519bb58a39d01f4dc6828985057fe 2252 ruby-rails-3.2_3.2.6-1.debian.tar.xz
Ruby-Versions: all
-
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.12 (GNU/Linux)
-
-iEYEARECAAYFAk/nrgIACgkQDOM8kQ+cso9TjgCfcDl8MvUtKVZP6bPP9IrO93hP
-TnAAn1aA67N088u6u/S2VA8UhYjNXhpO
-=7sbS
------END PGP SIGNATURE-----
diff --git a/tests/pkg-srcs/sunxi-tools_1.2-2.~~dgittest.debian.tar.gz b/tests/pkg-srcs/sunxi-tools_1.2-2.~~dgittest.debian.tar.gz
deleted file mode 100644
index c376961..0000000
--- a/tests/pkg-srcs/sunxi-tools_1.2-2.~~dgittest.debian.tar.gz
+++ /dev/null
Binary files differ
diff --git a/tests/pkg-srcs/sunxi-tools_1.2-2.~~dgittest.debian.tar.xz b/tests/pkg-srcs/sunxi-tools_1.2-2.~~dgittest.debian.tar.xz
new file mode 100644
index 0000000..8ac2131
--- /dev/null
+++ b/tests/pkg-srcs/sunxi-tools_1.2-2.~~dgittest.debian.tar.xz
Binary files differ
diff --git a/tests/pkg-srcs/sunxi-tools_1.2-2.~~dgittest.dsc b/tests/pkg-srcs/sunxi-tools_1.2-2.~~dgittest.dsc
index e0161cd..820022d 100644
--- a/tests/pkg-srcs/sunxi-tools_1.2-2.~~dgittest.dsc
+++ b/tests/pkg-srcs/sunxi-tools_1.2-2.~~dgittest.dsc
@@ -9,14 +9,14 @@ Standards-Version: 3.9.5
Vcs-Browser: http://git.debian.org/?p=collab-maint/sunxi-tools.git
Vcs-Git: git://git.debian.org/collab-maint/sunxi-tools.git
Build-Depends: debhelper (>= 9), pkg-config, libusb-1.0-0-dev, u-boot-tools
-Package-List:
- sunxi-tools deb utils optional
-Checksums-Sha1:
+Package-List:
+ sunxi-tools deb utils optional arch=any
+Checksums-Sha1:
2457216dbbf5552c413753f7211f7be3db6aff54 35076 sunxi-tools_1.2.orig.tar.gz
- 6f30698cd897b350a4f92b2b5dded69adca6f82e 5182 sunxi-tools_1.2-2.~~dgittest.debian.tar.gz
-Checksums-Sha256:
+ 491322a7e377365cf53104b5dda6a30ede0c01f7 4892 sunxi-tools_1.2-2.~~dgittest.debian.tar.xz
+Checksums-Sha256:
03a63203ff79389e728d88ad705e546aa6362a6d08b9901392acb8639998ef95 35076 sunxi-tools_1.2.orig.tar.gz
- 0a513f3254d245b59aaffbeb5c43159a6461617c1f6f3c6824646c4259cda406 5182 sunxi-tools_1.2-2.~~dgittest.debian.tar.gz
-Files:
+ 33b627e8958f1bc6d2a9bf1d1a042ac808924d860c09272989067fd57b9fb8e6 4892 sunxi-tools_1.2-2.~~dgittest.debian.tar.xz
+Files:
dbc55f60559f9db497559176c3c753dd 35076 sunxi-tools_1.2.orig.tar.gz
- a6ec0eb0d897b0121dc978fc00db2ea6 5182 sunxi-tools_1.2-2.~~dgittest.debian.tar.gz
+ 528d6bb421ba55aa1cec176298f8f14c 4892 sunxi-tools_1.2-2.~~dgittest.debian.tar.xz
diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts
index 5a3f243..05b5480 100755
--- a/tests/tests/gdr-merge-conflicts
+++ b/tests/tests/gdr-merge-conflicts
@@ -63,8 +63,8 @@ git merge --no-edit -s ours other
# we have to do a little dance to make this not a pseudomerge
t-git-next-date
-dch -a 'Merge, only conflict was in debian/changelog'
-t-dch-r-rune dch
+t-debchange -a 'Merge, only conflict was in debian/changelog'
+t-dch-r-rune t-debchange
git commit -a --amend --no-edit
wreckage-before
diff --git a/tests/tests/mismatches-contents b/tests/tests/mismatches-contents
index ea0d724..e424016 100755
--- a/tests/tests/mismatches-contents
+++ b/tests/tests/mismatches-contents
@@ -11,7 +11,7 @@ ln -s $troot/pkg-srcs/${p}_${v%-*}.orig.tar.* .
cd $p
v=1.0-1
-dch -v $v -D unstable -m 'Make a revision'
+t-debchange -v $v -D unstable -m 'Make a revision'
echo foo >us-file
git add us-file debian/changelog
git commit -m "Commit $v"
diff --git a/tests/update-dh-compat b/tests/update-dh-compat
new file mode 100755
index 0000000..6c35c6c
--- /dev/null
+++ b/tests/update-dh-compat
@@ -0,0 +1,120 @@
+#!/bin/bash
+# dgit
+# Integration between git and Debian-style archives
+#
+# Copyright (C)2013-2021 Ian Jackson
+# Copyright (C)2017-2019 Sean Whitton
+# Copyright (C)2019 Matthew Vernon / Genome Research Limited
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+set -e
+
+# This ad-hoc script was wrtten to deal with #1002927.
+
+export FILTER_BRANCH_SQUELCH_WARNING=1
+toplevel=$PWD
+
+cd_fresh_d () {
+ cd "$toplevel"
+ rm -rf d
+ mkdir d
+ cd d
+}
+
+adjust="$toplevel"/tests/update-dh-compat-adjust
+adjust () { "$adjust"; }
+
+git_filter_strip_origs () {
+ git for-each-ref refs/original \
+ --format '%(refname)' |
+ xargs -rn1 git update-ref -d
+}
+
+adjust_git_filter () {
+ # this is the dgit origin commit; this check may stop
+ # us rewriting our normal dgit tree
+ set +e
+ git cat-file -e 06fb75074c0bebccdcf86385b8d248fd127ed66d
+ rc=$?
+ set -e
+ test $rc = 1
+
+ git_filter_strip_origs
+
+ git filter-branch \
+ --tree-filter "$adjust" \
+ --tag-name-filter cat \
+ -- --all
+
+ git_filter_strip_origs
+
+ git gc --aggressive --prune=all
+}
+
+cd "$toplevel"
+
+for f in tests/pkg-srcs/*.dsc; do
+ cd_fresh_d
+
+ dpkg-source -x ../$f p
+ cd p
+ adjust
+ dpkg-source -b .
+ cd ..
+ dcmd rm ../$f
+ dcmd mv *.dsc ../tests/pkg-srcs/
+
+ cd ..
+done
+
+cd "$toplevel"
+
+for f in tests/git-srcs/*.tar; do
+ cd_fresh_d
+
+ tar xf ../$f
+
+ p=$(echo *)
+ cd $p
+ adjust_git_filter
+ cd ..
+ tar cf ../$f $p
+
+ cd ..
+done
+
+cd "$toplevel"
+
+for f in tests/worktrees/*.tar; do
+ cd_fresh_d
+
+ tar xf ../$f
+
+ p=$(echo *)
+ cd $p
+ adjust_git_filter
+ adjust
+ cd ..
+
+ tar cf ../$f $p
+
+ cd ..
+done
+
+cd "$toplevel"
+
+rm -rf d
+
+echo ok.
diff --git a/tests/update-dh-compat-adjust b/tests/update-dh-compat-adjust
new file mode 100755
index 0000000..54305a1
--- /dev/null
+++ b/tests/update-dh-compat-adjust
@@ -0,0 +1,26 @@
+#!/bin/sh
+# dgit
+# Integration between git and Debian-style archives
+#
+# Copyright (C)2013-2021 Ian Jackson
+# Copyright (C)2017-2019 Sean Whitton
+# Copyright (C)2019 Matthew Vernon / Genome Research Limited
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# See update-dh-compat
+# This ad-hoc script was wrtten to deal with #1002927.
+
+set -e
+perl -i -pe 's/^5$/12/' debian/compat
diff --git a/tests/worktrees/example_1.0.tar b/tests/worktrees/example_1.0.tar
index 11f694f..658cddc 100644
--- a/tests/worktrees/example_1.0.tar
+++ b/tests/worktrees/example_1.0.tar
Binary files differ
diff --git a/tests/worktrees/example_1.1.tar b/tests/worktrees/example_1.1.tar
index f58c41a..2c257a3 100644
--- a/tests/worktrees/example_1.1.tar
+++ b/tests/worktrees/example_1.1.tar
Binary files differ
diff --git a/tests/worktrees/pari-extra_3-1.tar b/tests/worktrees/pari-extra_3-1.tar
index 56b797d..201f6f5 100644
--- a/tests/worktrees/pari-extra_3-1.tar
+++ b/tests/worktrees/pari-extra_3-1.tar
Binary files differ
diff --git a/tests/worktrees/pari-extra_drs.tar b/tests/worktrees/pari-extra_drs.tar
index 94c8455..987b595 100644
--- a/tests/worktrees/pari-extra_drs.tar
+++ b/tests/worktrees/pari-extra_drs.tar
Binary files differ
diff --git a/tests/worktrees/ruby-rails-3.2_test.tar b/tests/worktrees/ruby-rails-3.2_test.tar
index 6b0a824..eda72b2 100644
--- a/tests/worktrees/ruby-rails-3.2_test.tar
+++ b/tests/worktrees/ruby-rails-3.2_test.tar
Binary files differ