[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: review of release_2.6



On Wed, Nov 06, 2024 at 12:21:51PM +0100, Bill Allombert wrote:
> Hello Don,
> 
> I found two debbugs git repos:
> https://bugs.debian.org/debbugs-source/debbugs.git/
> https://salsa.debian.org/debbugs-team/debbugs.git
> 
> Which one is the canonical one ?
> 
> I have reviewed the branch release_2.6.
> debbugs is missing a Build-Depends on libmail-message-perl
> (you already added a Depends in fe90d1cbac)
> 
> I join 5 patches to be applied with "git am".

I have some more patches before the release.

By the way I have put my tree online:
git clone https://people.debian.org/~ballombe/debbugs.git/

Some of my commit are duplicates of commit in master that I missed, sorry. 

I would like to release 2.6.1 (or whatever you want to call it) tomorrow.

Cheers,
-- 
Bill. <ballombe@debian.org>

Imagine a large red swirl here. 
>From 648b766e331a4fe85e4b655858b0cac242f3baac Mon Sep 17 00:00:00 2001
From: Don Armstrong <don@donarmstrong.com>
Date: Sun, 7 Jul 2019 21:04:18 -0700
Subject: [PATCH 1/4] switch to compatibility level 12

---
 debian/compat  | 2 +-
 debian/control | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/compat b/debian/compat
index ec63514..48082f7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+12
diff --git a/debian/control b/debian/control
index e93e32f..8fb07f1 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Colin Watson <cjwatson@debian.org>, Don Armstrong <don@debian.org>,
 Standards-Version: 4.1.3
 Vcs-Browser: https://salsa.debian.org/debbugs-team/debbugs
 Vcs-Git: https://salsa.debian.org/debbugs-team/debbugs.git
-Build-Depends: debhelper (>= 9)
+Build-Depends: debhelper
 Build-Depends-Indep: libparams-validate-perl,
  libmailtools-perl, libmime-tools-perl, libio-stringy-perl, libmldbm-perl,
  liburi-perl, libsoap-lite-perl, libcgi-simple-perl,
-- 
2.39.5

>From 8cb1d763345f494a36d9697917061c8751d9b718 Mon Sep 17 00:00:00 2001
From: Bill Allombert <Bill.Allombert@math.u-bordeaux.fr>
Date: Fri, 8 Nov 2024 09:51:22 +0100
Subject: [PATCH 2/4] Replace debian/compat by debhelper-compat (= 12)

---
 debian/changelog | 9 ++++++---
 debian/compat    | 1 -
 debian/control   | 2 +-
 debian/rules     | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)
 delete mode 100644 debian/compat

diff --git a/debian/changelog b/debian/changelog
index 638a120..a8a166a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,11 +29,14 @@ debbugs (2.6.1) unstable; urgency=medium
   * Allow exporting of debbugs responses to mbox format when requested
 
   [ Bill Allombert ]
-  * Add Build-Depends-Indep on libmail-message-perl for running the test-suite
-  * debbugs-local: add Depends on sensible-utils
+  * debian/control:
+    - Build-Depends-Indep on libmail-message-perl for running the test-suite
+    - Build-Depends on debhelper-compat (= 12)
+    - debbugs-local Depends on sensible-utils
+  * debian/compat: removed
   * Actually upload the package (closes: #477182, #1079842)
 
- -- Bill Allombert <ballombe@debian.org>  Tue, 05 Nov 2024 19:08:52 +0100
+ -- Bill Allombert <ballombe@debian.org>  Fri, 08 Nov 2024 10:03:05 +0100
 
 debbugs (2.6.0) unstable; urgency=medium
 
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 48082f7..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-12
diff --git a/debian/control b/debian/control
index 8fb07f1..b1921a6 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Colin Watson <cjwatson@debian.org>, Don Armstrong <don@debian.org>,
 Standards-Version: 4.1.3
 Vcs-Browser: https://salsa.debian.org/debbugs-team/debbugs
 Vcs-Git: https://salsa.debian.org/debbugs-team/debbugs.git
-Build-Depends: debhelper
+Build-Depends: debhelper-compat (=12)
 Build-Depends-Indep: libparams-validate-perl,
  libmailtools-perl, libmime-tools-perl, libio-stringy-perl, libmldbm-perl,
  liburi-perl, libsoap-lite-perl, libcgi-simple-perl,
diff --git a/debian/rules b/debian/rules
index 75d02ac..2edb470 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --parallel
+	dh $@
 
 override_dh_auto_install:
 	dh_auto_install -- INSTALLDIRS=vendor
-- 
2.39.5

>From 598cf4fc86bdc97e7b43062a488cb78a752f5feb Mon Sep 17 00:00:00 2001
From: Bill Allombert <Bill.Allombert@math.u-bordeaux.fr>
Date: Fri, 8 Nov 2024 10:12:32 +0100
Subject: [PATCH 3/4] Update Standards-Version to 4.7.0

---
 debian/changelog | 1 +
 debian/control   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a8a166a..7e3e4b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,7 @@ debbugs (2.6.1) unstable; urgency=medium
     - Build-Depends-Indep on libmail-message-perl for running the test-suite
     - Build-Depends on debhelper-compat (= 12)
     - debbugs-local Depends on sensible-utils
+    - Update Standards-Version to 4.7.0
   * debian/compat: removed
   * Actually upload the package (closes: #477182, #1079842)
 
diff --git a/debian/control b/debian/control
index b1921a6..33909ff 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debbugs developers <debian-debbugs@lists.debian.org>
 Uploaders: Colin Watson <cjwatson@debian.org>, Don Armstrong <don@debian.org>,
            Bill Allombert <ballombe@debian.org>
-Standards-Version: 4.1.3
+Standards-Version: 4.7.0
 Vcs-Browser: https://salsa.debian.org/debbugs-team/debbugs
 Vcs-Git: https://salsa.debian.org/debbugs-team/debbugs.git
 Build-Depends: debhelper-compat (=12)
-- 
2.39.5

>From 2307d5c31fcab63c2137b36a388b10984a235cdf Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@debian.org>
Date: Tue, 21 May 2024 13:00:34 +0100
Subject: [PATCH 4/4] UPGRADE.md: Fix typo

---
 UPGRADE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UPGRADE.md b/UPGRADE.md
index 62a7bd4..df9463f 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -93,7 +93,7 @@ Add the following variable to the `/etc/debbugs/text` file:
 
 <dt><code>moreinfo</code>
   <dd>This `$gBug can\'t be addressed until more information is provided by the
-  submitter. The `$gBug will be closed if the submitter doesn\'t provide ore
+  submitter. The `$gBug will be closed if the submitter doesn\'t provide more
   information in a reasonable (few months) timeframe. This is for `$gBugs like
   \"It doesn\'t work\". What doesn\'t work?
 
-- 
2.39.5


Reply to: