[Git][debian-proftpd-team/proftpd][master] 3 commits: Finalize for upload.

[Hilmar Preuße (@hilmar-guest)]

Hilmar Preuße pushed to branch master at Debian ProFTPD Team / proftpd


Commits:
3f353447 by Hilmar Preuße at 2023-11-09T22:25:37+01:00
Finalize for upload.

- - - - -
6956bde5 by Hilmar Preuße at 2023-11-11T23:32:17+01:00
Change package version to 1.3.8.a to avoid issues w/ version comparing.

- - - - -
9e3e2ea7 by Hilmar Preuße at 2023-11-11T23:35:54+01:00
"gbp pull" should pull pristine-tar branch too.

- - - - -


3 changed files:

- debian/README.source
- debian/changelog
- debian/gbp.conf


Changes:

=====================================
debian/README.source
=====================================
@@ -14,3 +14,14 @@ Note that since 1.3.2, upstream git repository has a proper stable
 branch which should be followed instead of master for useful fixes.
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Fri Jan  5 10:04:28 CET 2018
+
+With 1.3.7a we introduced the extension +dfsg to the orig.tar.gz file to
+document that the file we upload to Debian is modified. Unfortunately this gives
+issues w/ version comparing: 1.3.8a+dfsg is considered to be an earlier version
+than 1.3.8+dfsg: dpkg --compare-versions 1.3.8a+dfsg lt 1.3.8+dfsg . For the time
+being we introduce a "." between major number and letter to avoid this issue.
+Starting with 1.3.9, we will use extension ~dfsg, which does not cause the issue.
+I won't change the naming of the orig.tar.gz in the pristine-tar branch, simply
+create a soft link to get the source package.
+
+  -- Hilmar Preusse <hille42 at web.de>  Sat, 11 Nov 2023 23:28:15 +0100


=====================================
debian/changelog
=====================================
@@ -1,8 +1,11 @@
-proftpd-dfsg (1.3.8a+dfsg-1) UNRELEASED; urgency=medium
+proftpd-dfsg (1.3.8.a+dfsg-1) unstable; urgency=medium
 
   * New upstream minor release; disable patches, we got from upstream.
+  * Change package version to 1.3.8.a to avoid issues w/ version comparing.
+    Document that in d/README.source.
+  * "gbp pull" should pull pristine-tar branch too.
 
- -- Hilmar Preusse <hille42 at web.de>  Mon, 09 Oct 2023 06:39:09 +0000
+ -- Hilmar Preusse <hille42 at web.de>  Thu, 09 Nov 2023 22:22:57 +0100
 
 proftpd-dfsg (1.3.8+dfsg-8) unstable; urgency=medium
 


=====================================
debian/gbp.conf
=====================================
@@ -4,3 +4,6 @@ postimport = echo "Updating debian/control file."; debian/rules debian/control
 
 [push]
 pristine-tar = True
+
+[pull]
+pristine-tar = True



View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/compare/fa8fe3e125a824b67145399718c451208b3d5198...9e3e2ea73b2fbb40a7e48a71eb1f6c7b87490421

-- 
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/compare/fa8fe3e125a824b67145399718c451208b3d5198...9e3e2ea73b2fbb40a7e48a71eb1f6c7b87490421
You're receiving this email because of your account on salsa.debian.org.