allentc · ntninja · Aug 28, 2025 · Aug 28, 2025 · Aug 28, 2025 · Aug 30, 2025
diff --git a/.github/workflows-helpers/01-ubuntu-22.04-sphinx-packaging.patch b/.github/workflows-helpers/01-ubuntu-22.04-sphinx-packaging.patch
@@ -0,0 +1,36 @@
+--- /usr/lib/python3/dist-packages/sphinx/application.py.orig 2025-08-31 13:41:25.132994303 +0200
++++ /usr/lib/python3/dist-packages/sphinx/application.py   2025-08-31 13:43:11.212492029 +0200
+@@ -34,7 +34,7 @@
+ from sphinx.domains import Domain, Index
+ from sphinx.environment import BuildEnvironment
+ from sphinx.environment.collectors import EnvironmentCollector
+-from sphinx.errors import ApplicationError, ConfigError, VersionRequirementError
++from sphinx.errors import ApplicationError, ConfigError, VersionRequirementError, ExtensionError
+ from sphinx.events import EventManager
+ from sphinx.extension import Extension
+ from sphinx.highlighting import lexer_classes
+@@ -107,6 +107,12 @@
+     'sphinx.environment.collectors.metadata',
+     'sphinx.environment.collectors.title',
+     'sphinx.environment.collectors.toctree',
++    # 1st party extensions
++    'sphinxcontrib.applehelp',
++    'sphinxcontrib.devhelp',
++    'sphinxcontrib.htmlhelp',
++    'sphinxcontrib.serializinghtml',
++    'sphinxcontrib.qthelp',
+     # Strictly, alabaster theme is not a builtin extension,
+     # but it is loaded automatically to use it as default theme.
+     'alabaster',
+@@ -224,7 +230,10 @@
+
+         # load all built-in extension modules
+         for extension in builtin_extensions:
+-            self.setup_extension(extension)
++            try:
++                self.setup_extension(extension)
++            except ExtensionError:
++                pass  # DEBIAN: Allow missing first-party extensions
+
+         # load all user-given extension modules
+         for extension in self.config.extensions:
diff --git a/.github/workflows-helpers/01-ubuntu-24.04-sphinx-packaging.patch b/.github/workflows-helpers/01-ubuntu-24.04-sphinx-packaging.patch
@@ -0,0 +1,30 @@
+--- application.py   2025-08-28 14:39:46.514868940 +0200
++++ /usr/lib/python3/dist-packages/sphinx/application.py 2025-08-28 14:44:27.414862345 +0200
+@@ -20,7 +20,7 @@
+ from sphinx import locale, package_dir
+ from sphinx.config import ENUM, Config, _ConfigRebuild
+ from sphinx.environment import BuildEnvironment
+-from sphinx.errors import ApplicationError, ConfigError, VersionRequirementError
++from sphinx.errors import ApplicationError, ConfigError, VersionRequirementError, ExtensionError
+ from sphinx.events import EventManager
+ from sphinx.highlighting import lexer_classes
+ from sphinx.locale import __
+@@ -122,5 +122,6 @@
+     'alabaster',
+ )
+ builtin_extensions += _first_party_themes
++builtin_extensions += _first_party_extensions
+
+ ENV_PICKLE_FILENAME = 'environment.pickle'
+@@ -248,7 +249,10 @@
+         # load all built-in extension modules, first-party extension modules,
+         # and first-party themes
+         for extension in builtin_extensions:
+-            self.setup_extension(extension)
++            try:
++                self.setup_extension(extension)
++            except ExtensionError:
++                pass  # DEBIAN: Allow missing first-party extensions
+
+         # load all user-given extension modules
+         for extension in self.config.extensions:
diff --git a/.github/workflows/check-style.yml b/.github/workflows/check-style.yml
@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 jobs:
   check-style:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v2

diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml
@@ -8,7 +8,8 @@ env:
 
 jobs:
   build:
-    runs-on: windows-2019
+    runs-on: windows-latest
+    continue-on-error: true
 
     strategy:
       fail-fast: false
@@ -45,31 +46,31 @@ jobs:
       working-directory: ${{env.GITHUB_WORKSPACE}}
       shell: pwsh
       run: |
-        Invoke-WebRequest -Uri "https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.5/wxWidgets-3.0.5-headers.7z" -OutFile wxWidgets-headers.7z
-        7z.exe x wxWidgets-headers.7z -o${{env.WXWIN}}
+        Invoke-WebRequest -Uri "https://github.com/wxWidgets/wxWidgets/releases/download/v3.3.1/wxWidgets-3.3.1-headers.7z" -OutFile wxWidgets-headers.7z
+        7z.exe x -aoa wxWidgets-headers.7z -o${{env.WXWIN}}
 
     - name: Download and unpack wxWidgets source
       if: ${{ matrix.build_conf == 'Release' }}
       working-directory: ${{env.GITHUB_WORKSPACE}}
       shell: pwsh
       run: |
-        Invoke-WebRequest -Uri "https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.5/wxWidgets-3.0.5.7z" -OutFile wxWidgets-source.7z
-        7z.exe x wxWidgets-source.7z -o${{env.WXWIN}}
+        Invoke-WebRequest -Uri "https://github.com/wxWidgets/wxWidgets/releases/download/v3.3.1/wxWidgets-3.3.1.7z" -OutFile wxWidgets-source.7z
+        7z.exe x -aoa wxWidgets-source.7z -o${{env.WXWIN}}
 
     - name: Download and unpack wxWidgets developer files
       working-directory: ${{env.GITHUB_WORKSPACE}}
       shell: pwsh
       run: |
-        Invoke-WebRequest -Uri "https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.5/wxMSW-3.0.5_vc142_Dev.7z" -OutFile wxWidgets-devel.7z
-        7z.exe x wxWidgets-devel.7z -o${{env.WXWIN}}
+        Invoke-WebRequest -Uri "https://github.com/wxWidgets/wxWidgets/releases/download/v3.3.1/wxMSW-3.3.1_vc14x_x64_Dev.7z" -OutFile wxWidgets-devel.7z
+        7z.exe x -aoa wxWidgets-devel.7z -o${{env.WXWIN}}
 
     - name: Download and unpack wxWidgets release libraries
       if: ${{ matrix.build_conf == 'Release' }}
       working-directory: ${{env.GITHUB_WORKSPACE}}
       shell: pwsh
       run: |
-        Invoke-WebRequest -Uri "https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.5/wxMSW-3.0.5_vc142_ReleaseDLL.7z" -OutFile wxWidgets-libraries.7z
-        7z.exe x wxWidgets-libraries.7z -o${{env.WXWIN}}
+        Invoke-WebRequest -Uri "https://github.com/wxWidgets/wxWidgets/releases/download/v3.3.1/wxMSW-3.3.1_vc14x_x64_ReleaseDLL.7z" -OutFile wxWidgets-libraries.7z
+        7z.exe x -aoa wxWidgets-libraries.7z -o${{env.WXWIN}}
 
     - name: Download and unpack PostgreSQL
       working-directory: ${{env.GITHUB_WORKSPACE}}

diff --git a/.github/workflows/ubuntubuild.yml b/.github/workflows/ubuntubuild.yml
@@ -4,31 +4,71 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on:  ${{ matrix.os }}
 
     strategy:
-      fail-fast: false
       matrix:
+        os: [ubuntu-22.04, ubuntu-24.04]
         build_conf: [Release, Debug]
+        exclude:
+          - os: ubuntu-22.04
+            build_conf: Debug
+
+    env:
+      WX_VERSION: "${{ matrix.os == 'ubuntu-22.04' && '3.0' || '3.2' }}"
 
     steps:
     - uses: actions/checkout@v2
 
+    # System setup
     - name: Update package lists
       run: sudo apt-get update
 
+    - name: Install Debian package tools
+      if: matrix.build_conf == 'Release'
+      run: sudo apt-get install build-essential debhelper-compat dpkg-dev
+
     - name: Install libraries
-      run: sudo apt-get install libwxgtk3.0-gtk3-dev libpq-dev libxml2-dev libxslt1-dev libssh2-1-dev python3-sphinx
+      run: sudo apt-get install autotools-dev libpq-dev libwxgtk${{ env.WX_VERSION == '3.0' && '3.0-gtk3' || env.WX_VERSION }}-dev libxslt1-dev libssh2-1-dev libxml2-dev python3-sphinx python3-sphinxcontrib.htmlhelp
+
+    - name: Workaround Debian bug \#1112319
+      run: sudo patch -u /usr/lib/python3/dist-packages/sphinx/application.py .github/workflows-helpers/01-${{ matrix.os }}-sphinx-packaging.patch
 
+    # Debug build from source
     - name: Run bootstrap
+      if: matrix.build_conf == 'Debug'
       run: ./bootstrap
 
     - name: Run configure
-      env:
-        ENABLE_DEBUG: "${{ matrix.build_conf == 'Debug' && 'yes' || 'no' }}"
-      run: ./configure --with-wx-version=3.0 --enable-databasedesigner --enable-debug=${{ env.ENABLE_DEBUG }}
+      if: matrix.build_conf == 'Debug'
+      run: ./configure --with-wx-version=${{ env.WX_VERSION }} --enable-databasedesigner --enable-debug=yes
 
     - name: Run make
-      run: | 
+      if: matrix.build_conf == 'Debug'
+      run: |
         make -j4 all
         sudo make install
+
+    # Release build to Debian package
+    - name: Run dpkg-buildpackage
+      if: matrix.build_conf == 'Release'
+      run: |
+        dpkg-buildpackage -j4
+
+        # Annotate created packages with OS code name
+        pushd ..
+        for filename in pgadmin3-lts*.{deb,buildinfo,tar.xz};
+        do
+          mv "${filename}" "${filename%%_*}_ubuntu-22.04_${filename#*_}"
+        done
+        popd
+
+    # Publish Debian packages if tagged
+    - name: Release
+      uses: softprops/action-gh-release@v2
+      if: matrix.build_conf == 'Release' && github.ref_type == 'tag'
+      with:
+        files: |
+          ../pgadmin3-lts*.deb
+          ../pgadmin3-lts*.buildinfo
+          ../pgadmin3-lts*.tar.xz
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,7 @@
 *.chm
 *.tmp
 *.dirstamp
+*~
 .DS_Store
 BuildLog.htm
 Makefile.in

diff --git a/LICENSE b/LICENSE
@@ -1,19 +1,19 @@
-pgAdmin III
-
-Copyright (C) 2002 - 2016, The pgAdmin Development Team
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose, without fee, and without a written agreement is
-hereby granted, provided that the above copyright notice and this paragraph and
-the following two paragraphs appear in all copies.
-
-IN NO EVENT SHALL THE PGADMIN DEVELOPMENT TEAM BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST
-PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
-THE PGADMIN DEVELOPMENT TEAM HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-THE PGADMIN DEVELOPMENT TEAM SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND
-THE PGADMIN DEVELOPMENT TEAM HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
-UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+pgAdmin3 LTS
+
+Copyright (C) 2002 - 2016, The pgAdmin Development Team
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose, without fee, and without a written agreement is
+hereby granted, provided that the above copyright notice and this paragraph and
+the following two paragraphs appear in all copies.
+
+IN NO EVENT SHALL THE PGADMIN DEVELOPMENT TEAM BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST
+PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
+THE PGADMIN DEVELOPMENT TEAM HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+THE PGADMIN DEVELOPMENT TEAM SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND
+THE PGADMIN DEVELOPMENT TEAM HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
+UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
diff --git a/bootstrap b/bootstrap
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -eu
 
 #######################################################################
 #
@@ -10,33 +11,42 @@
 #
 #######################################################################
 
+run_autoreconf=true
+while [ $# -gt 0 ];
+do
+	if [ "$1" = "--skip-autoreconf" ];
+	then
+		run_autoreconf=false
+		shift 1
+	elif [ "$1" = "--" ];
+	then
+		shift 1
+		break  # Options for autoreconf
+	else
+		echo "usage: ./bootstrap [--skip-autoreconf] [-- [autoreconf-param...]] " >&2
+		echo >&2
+		exit 1
+	fi
+done
+
 # Insert the version number wherever it's needed
-echo "Stamping the version number..."
+echo "Stamping the version number…" >&2
 LONG_VER=`grep '#define VERSION_PACKAGE' pgadmin/include/version.h | awk '{print $3}'`
 SHORT_VER=`echo $LONG_VER | cut -d . -f1,2`
 
 sed -e "s/PGADMIN_LONG_VERSION/$LONG_VER/" -e "s/PGADMIN_SHORT_VERSION/$SHORT_VER/" configure.ac.in > configure.ac
 sed -e "s/PGADMIN_LONG_VERSION/$LONG_VER/" -e "s/PGADMIN_SHORT_VERSION/$SHORT_VER/" pkg/mac/pgadmin.Info.plist.in > pkg/mac/pgadmin.Info.plist
 sed -e "s/PGADMIN_LONG_VERSION/$LONG_VER/" -e "s/PGADMIN_SHORT_VERSION/$SHORT_VER/" pkg/mac/debug.pgadmin.Info.plist.in > pkg/mac/debug.pgadmin.Info.plist
-sed -e "s/PGADMIN_LONG_VERSION/$LONG_VER/" -e "s/PGADMIN_SHORT_VERSION/$SHORT_VER/" pkg/mandrake/pgadmin3.spec.in > pkg/mandrake/pgadmin3.spec
-sed -e "s/PGADMIN_LONG_VERSION/$LONG_VER/" -e "s/PGADMIN_SHORT_VERSION/$SHORT_VER/" pkg/redhat/pgadmin3.spec.in > pkg/redhat/pgadmin3.spec
-sed -e "s/PGADMIN_LONG_VERSION/$LONG_VER/" -e "s/PGADMIN_SHORT_VERSION/$SHORT_VER/" pkg/slackware/build-release.in > pkg/slackware/build-release
 sed -e "s/PGADMIN_LONG_VERSION/$LONG_VER/" -e "s/PGADMIN_SHORT_VERSION/$SHORT_VER/" pkg/src/build-tarball.in > pkg/src/build-tarball
-sed -e "s/PGADMIN_LONG_VERSION/$LONG_VER/" -e "s/PGADMIN_SHORT_VERSION/$SHORT_VER/" pkg/suse/pgadmin3.spec.in > pkg/suse/pgadmin3.spec
 
 sed -e "s/PGADMIN_LONG_VERSION/$LONG_VER/" -e "s/PGADMIN_SHORT_VERSION/$SHORT_VER/" docs/en_US/conf.py.in > docs/en_US/conf.py
 
-echo "Configuring the build system..."
+# Add extra automake configuration file
+mkdir -p config
+cp -f config.rpath.in config/config.rpath
 
-if [ ! -x config ]; then 
-  set -x
-  mkdir config
+if ${run_autoreconf};
+then
+	echo "Configuring the build system…" >&2
+	autoreconf -i "$@"
 fi
-
-set -x
-
-aclocal && \
-autoheader && \
-cp -f config.rpath.in config/config.rpath && \
-automake --foreign --add-missing --copy && \
-autoconf
diff --git a/branding/branding.ini b/branding/branding.ini
@@ -13,8 +13,8 @@
 ; Application details. The shortname should be a Unix friendly 
 ; name. The long name should be a Windows friendly long name.
 
-;ShortAppName=pgadmin3
-LongAppName=pgAdmin3 LTS by BigSQL
+ShortAppName=pgadmin3
+LongAppName=pgAdmin3 LTS
 WebsiteUrl=http://pgadmin3.org/
 
 ; Images

diff --git a/configure.ac.in b/configure.ac.in
@@ -149,13 +149,8 @@ AC_CONFIG_FILES([Makefile
 		 plugins.d/Makefile
 		 pgadmin/Makefile
 		 pkg/Makefile
-		 pkg/debian/Makefile
 		 pkg/mac/Makefile
-		 pkg/mandrake/Makefile
-		 pkg/redhat/Makefile
-		 pkg/slackware/Makefile
 		 pkg/src/Makefile
-		 pkg/suse/Makefile
 		 pkg/win32/Makefile
 		 xtra/Makefile
 		 xtra/png2c/Makefile

diff --git a/debian/.gitignore b/debian/.gitignore
@@ -0,0 +1,8 @@
+pgadmin3-lts*/
+tmp/
+.debhelper/
+autoreconf.*
+debhelper-build-stamp
+files
+pgadmin3*.debhelper.log
+pgadmin3*.substvars
diff --git a/pkg/debian/changelog → debian/changelog b/pkg/debian/changelog → debian/changelog
@@ -1,3 +1,9 @@
+pgadmin3-lts (20230521) UNRELEASED; urgency=medium
+
+  * Initial rerelease.
+
+ -- Erin of Yukis <[email protected]>  Thu, 28 Aug 2025 11:59:19 +0200
+
 pgadmin3 (1.6.0-0.beta2.1) experimental; urgency=low
 
   * New upstream release. Beta 2.