deb: refine fluentd-apt-source

Rakefile

@@ -20,12 +20,12 @@ PACKAGES = [
 ]
 
 APT_SOURCE_PACKAGES = [
-  "fluentd-apt-source"
+  "fluent-apt-source"
 ]
 
 ALL_PACKAGE = [
   "fluent-package",
-  "fluentd-apt-source",
+  "fluent-apt-source",
 ]
 
 def define_bulked_task(name, description, packages = PACKAGES)
@@ -56,7 +56,7 @@ end
 end
 
 [
-  ["apt:build", "Build fluentd-apt-source deb packages", APT_SOURCE_PACKAGES],
+  ["apt:build", "Build fluent-apt-source deb packages", APT_SOURCE_PACKAGES],
 ].each do |params|
   define_bulked_task(*params)
 end

fluentd-apt-source/Rakefile → fluent-apt-source/Rakefile

@@ -13,7 +13,7 @@ CLOBBER.include("apt/repositories")
 
 class FluentdAptSourcePackageTask < PackageTask
   def initialize
-    super("fluentd-apt-source",
+    super("fluent-apt-source",
           repository_version,
           latest_commit_time(File.join(__dir__, "..")))
     CLEAN.include(@archive_name)

fluentd-apt-source/debian/changelog → fluent-apt-source/debian/changelog

@@ -1,4 +1,4 @@
-fluentd-apt-source (2023.6.29-1) unstable; urgency=medium
+fluent-apt-source (2023.6.29-1) unstable; urgency=medium
 
   * New upstream release.
   * Added new Fluent Package Official Signing Key.

fluentd-apt-source/debian/control → fluent-apt-source/debian/control

@@ -1,4 +1,4 @@
-Source: fluentd-apt-source
+Source: fluent-apt-source
 Section: misc
 Priority: optional
 Maintainer: Fluentd developers <[email protected]>
@@ -9,13 +9,25 @@ Build-Depends:
 Standards-Version: 4.5.0
 Homepage: https://www.fluentd.org/
 
-Package: fluentd-apt-source
+Package: fluent-apt-source
 Section: misc
 Architecture: all
 Depends:
   ${misc:Depends},
-  apt-transport-https,
   gnupg
+Replaces: fluentd-apt-source (<< 2023.6.29-1)
+Breaks: fluentd-apt-source (<< 2023.6.29-1)
 Description: GnuPG archive key and APT source of the Fluent Package archive
  The Fluentd project digitally signs its Release files. This package
  contains the archive key used for that.
+
+Package: fluentd-apt-source
+Section: oldlibs
+Architecture: all
+Depends:
+  ${misc:Depends},
+  fluent-apt-source
+Description: Transitional package for fluent-apt-source
+ This is a transitional package for fluent-apt-source.
+ .
+ It can be safely be removed.

fluent-apt-source/debian/fluent-apt-source.lintian-overrides

@@ -0,0 +1 @@
+fluent-apt-source: new-package-should-close-itp-bug

fluent-apt-source/debian/lintian/fluent-apt-source/debian.profile

@@ -0,0 +1,3 @@
+Profile: fluent-apt-source/main
+Extends: debian/main
+Disable-Tags: dir-or-file-in-opt

fluentd-apt-source/debian/lintian/fluentd-apt-source/ubuntu.profile → fluent-apt-source/debian/lintian/fluent-apt-source/ubuntu.profile

@@ -1,3 +1,3 @@
-Profile: fluentd-apt-source/main
+Profile: fluent-apt-source/main
 Extends: ubuntu/main
 Disable-Tags: dir-or-file-in-opt

fluent-apt-source/debian/source/lintian-overrides

@@ -0,0 +1,5 @@
+fluent-apt-source source: changelog-should-mention-nmu
+fluent-apt-source source: source-nmu-has-incorrect-version-number
+# When development machine has switched to aptly 1.4.0+ds1-7 or later,
+# remove the following (bookworm or later, ubuntu 22.10 or later)
+fluent-apt-source: debian-rules-should-not-use-custom-compression-settings

fluent-package/convert-artifacts-layout.sh

@@ -22,26 +22,26 @@ case $1 in
 		    #      mapping debian/pool/buster/main/f/fluent-package/ => 5/debian/buster/pool/contrib/f/fluent-package
 		    mkdir -p $ARTIFACTS_DIR/5/debian/$d/pool/contrib/t/td-agent
 		    mkdir -p $ARTIFACTS_DIR/5/debian/$d/pool/contrib/f/fluent-package
-		    mkdir -p $ARTIFACTS_DIR/5/debian/$d/pool/contrib/f/fluentd-apt-source
+		    mkdir -p $ARTIFACTS_DIR/5/debian/$d/pool/contrib/f/fluent-apt-source
 		    find $REPOSITORY_PATH/debian/pool/$d -name 'td-agent*.deb' -not -name '*dbgsym*' \
 			 -exec cp {} $ARTIFACTS_DIR/5/debian/$d/pool/contrib/f/fluent-package \;
 		    find $REPOSITORY_PATH/debian/pool/$d -name 'fluent-package*.deb' -not -name '*dbgsym*' \
 			 -exec cp {} $ARTIFACTS_DIR/5/debian/$d/pool/contrib/f/fluent-package \;
-		    find $REPOSITORY_PATH/debian/pool/$d -name 'fluentd-apt-source*.deb' -not -name '*dbgsym*' \
-			 -exec cp {} $ARTIFACTS_DIR/5/debian/$d/pool/contrib/f/fluentd-apt-source \;
+		    find $REPOSITORY_PATH/debian/pool/$d -name 'fluent*-apt-source*.deb' -not -name '*dbgsym*' \
+			 -exec cp {} $ARTIFACTS_DIR/5/debian/$d/pool/contrib/f/fluent-apt-source \;
 		    ;;
 		focal|jammy)
 		    # e.g. mapping ubuntu/pool/.../main/t/td-agent/ => 5/ubuntu/.../pool/contrib/t/td-agent
 		    #      mapping ubuntu/pool/.../main/f/fluent-package/ => 5/ubuntu/.../pool/contrib/f/fluent-package
 		    mkdir -p $ARTIFACTS_DIR/5/ubuntu/$d/pool/contrib/t/td-agent
 		    mkdir -p $ARTIFACTS_DIR/5/ubuntu/$d/pool/contrib/f/fluent-package
-		    mkdir -p $ARTIFACTS_DIR/5/debian/$d/pool/contrib/f/fluentd-apt-source
+		    mkdir -p $ARTIFACTS_DIR/5/ubuntu/$d/pool/contrib/f/fluent-apt-source
 		    find $REPOSITORY_PATH/ubuntu/pool/$d -name 'td-agent*.deb' \
 			 -exec cp {} $ARTIFACTS_DIR/5/ubuntu/$d/pool/contrib/f/fluent-package \;
 		    find $REPOSITORY_PATH/ubuntu/pool/$d -name 'fluent-package*.deb' \
 			 -exec cp {} $ARTIFACTS_DIR/5/ubuntu/$d/pool/contrib/f/fluent-package \;
-		    find $REPOSITORY_PATH/ubuntu/pool/$d -name 'fluentd-apt-source*.deb' \
-			 -exec cp {} $ARTIFACTS_DIR/5/ubuntu/$d/pool/contrib/f/fluentd-apt-source \;
+		    find $REPOSITORY_PATH/ubuntu/pool/$d -name 'fluent*-apt-source*.deb' \
+			 -exec cp {} $ARTIFACTS_DIR/5/ubuntu/$d/pool/contrib/f/fluent-apt-source \;
 		    ;;
 		*)
 		    exit 1