From c2973c82c6c588f11b99bc544cb215bdadd1809b Mon Sep 17 00:00:00 2001 From: Christoph Berg Date: Thu, 5 Sep 2024 22:46:38 +0200 Subject: [PATCH] Update generate-pgdg-source for buster/oracular --- jenkins/generate-pgdg-source | 64 +++--------------------------------- 1 file changed, 4 insertions(+), 60 deletions(-) diff --git a/jenkins/generate-pgdg-source b/jenkins/generate-pgdg-source index 40f8798..3f9d326 100755 --- a/jenkins/generate-pgdg-source +++ b/jenkins/generate-pgdg-source @@ -175,7 +175,7 @@ case $PACKAGE in case $distribution in sid|trixie) llvm_version 15 ;; # downgrade to 15 bookworm) llvm_version 15 ;; # upgrade to 15 - noble|mantic) llvm_version 15 ;; # downgrade to 15 + oracular|noble|mantic) llvm_version 15 ;; # downgrade to 15 jammy) llvm_version 15 ;; # upgrade to 15 esac ;; @@ -189,19 +189,9 @@ case $PACKAGE in esac ;; esac -case $PACKAGE in - postgresql-[89].?|postgresql-1[01]) - case $distribution in buster|stretch|jessie|disco|bionic|xenial) - # debian/postgresql-*.install is only relevant for 9.0 - sed -i -e 's/^#py2#//' debian/control debian/rules debian/postgresql-*.install - TWEAK+=("Re-enable plpython2 packages.") - ;; - esac - ;; -esac case $PACKAGE in postgresql-9.[1-6]) - case $distribution in noble) + case $distribution in oracular|noble) # remove binary from .dsc so autopkgtest doesn't see it (package still needs -Pnopython to build) perl -i -000 -ne "print unless /^Package: postgresql-plpython3/m" debian/control TWEAK+=("Disable plpython3 package, incompatible with Python 3.12.") @@ -219,17 +209,6 @@ case $PACKAGE in esac ;; esac -case $PACKAGE in - postgresql-8.?|postgresql-9.?) - case $distribution in buster) - echo >> debian/rules - echo "# dh_dwz is broken in buster for manual debug packages (#939164)" >> debian/rules - echo "override_dh_dwz:" >> debian/rules - TWEAK+=("Disable dh_dwz.") - ;; - esac - ;; -esac # adjust debhelper level case $PACKAGE in @@ -243,7 +222,7 @@ case $PACKAGE in xenial) debhelper_compat 10 ;; bionic) debhelper_compat 12 ;; eoan) debhelper_compat 12 ;; - focal|groovy|hirsute|impish|jammy|kinetic|lunar|mantic|noble) debhelper_compat 13 ;; + focal|groovy|hirsute|impish|jammy|kinetic|lunar|mantic|noble|oracular) debhelper_compat 13 ;; *) echo "debhelper compat missing for $distribution"; exit 1 ;; esac ;; @@ -256,49 +235,14 @@ case $PACKAGE in xenial) debhelper_compat 9 ;; bionic) debhelper_compat 11 ;; eoan|focal) debhelper_compat 12 ;; - groovy|hirsute|impish|jammy|kinetic|lunar|mantic|noble) debhelper_compat 13 ;; + groovy|hirsute|impish|jammy|kinetic|lunar|mantic|noble|oracular) debhelper_compat 13 ;; *) echo "debhelper compat missing for $distribution"; exit 1 ;; esac ;; esac -# remove unsupported autopkgtest restrictions -case $distribution in buster|focal|bionic) - if test -f debian/tests/control && grep needs-internet debian/tests/control; then - sed -i -e 's/\(, \)\?needs-internet//' debian/tests/control - TWEAK+=("Remove needs-internet from debian/tests/control.") - fi - ;; -esac - # tweaks for other packages case $PACKAGE in - postgresql-common) - case $distribution in buster|stretch|jessie|disco|bionic|xenial) - sed -i -e 's/^#py2#//' debian/rules PgCommon.pm - TWEAK+=("Re-enable plpython2 packages.") - ;; - esac - ;; - - libdbd-pg-perl|libpg-perl) - case $distribution in - buster|stretch|jessie|eoan|disco|bionic|xenial) - sed -i -e 's/perl-xs-dev/perl/' debian/control - TWEAK+=("Use perl in place of perl-xs-dev.") - ;; - esac - ;; - - postgis) - case ${distribution:-} in - buster|stretch|focal|eoan|bionic|xenial) - sed -i -e '/proj-7.0.1.patch/d' debian/patches/series - TWEAK+=("Disable proj-7.0.1.patch.") - ;; - esac - ;; - prometheus-sql-exporter) case ${distribution:-} in bookworm|noble|mantic|jammy) -- 2.39.5