diff -Nru ubuntu-dev-tools-0.193ubuntu2/debian/changelog ubuntu-dev-tools-0.193ubuntu4~23.04.1/debian/changelog --- ubuntu-dev-tools-0.193ubuntu2/debian/changelog 2023-04-21 02:23:08.000000000 +0000 +++ ubuntu-dev-tools-0.193ubuntu4~23.04.1/debian/changelog 2023-05-31 00:58:54.000000000 +0000 @@ -1,3 +1,26 @@ +ubuntu-dev-tools (0.193ubuntu4~23.04.1) lunar; urgency=medium + + * Backport current ubuntu-dev-tools to lunar. LP: #2021910. + - this fixes compatibility with newer debootstrap which drops using + per-Ubuntu-series symlinks for the bootstrap script. LP: #2020530. + + -- Steve Langasek Tue, 30 May 2023 17:58:54 -0700 + +ubuntu-dev-tools (0.193ubuntu4) mantic; urgency=medium + + * Remove references to ftpmaster.internal. When this name is resolvable + but firewalled, syncpackage hangs; and these are tools for developers, + not for running in an automated context in the DCs where + ftpmaster.internal is reachable. + + -- Steve Langasek Tue, 30 May 2023 10:02:43 -0700 + +ubuntu-dev-tools (0.193ubuntu3) mantic; urgency=medium + + * Excise all references to cdbs (including in test cases) + + -- Steve Langasek Tue, 30 May 2023 09:45:12 -0700 + ubuntu-dev-tools (0.193ubuntu2) lunar; urgency=medium [ Vladimir Petko ] diff -Nru ubuntu-dev-tools-0.193ubuntu2/doc/setup-packaging-environment.1 ubuntu-dev-tools-0.193ubuntu4~23.04.1/doc/setup-packaging-environment.1 --- ubuntu-dev-tools-0.193ubuntu2/doc/setup-packaging-environment.1 2022-12-17 07:39:10.000000000 +0000 +++ ubuntu-dev-tools-0.193ubuntu4~23.04.1/doc/setup-packaging-environment.1 2023-05-30 17:01:28.000000000 +0000 @@ -11,7 +11,7 @@ ensures that all four components from Ubuntu's official repositories are enabled along with their corresponding source repositories. It also installs a minimal set of packages needed for Ubuntu packaging work (ubuntu-dev-tools, devscripts, -debhelper, cdbs, patchutils, pbuilder, and build-essential). Finally, it assists +debhelper, patchutils, pbuilder, and build-essential). Finally, it assists in defining the DEBEMAIL and DEBFULLNAME environment variables. .SH AUTHORS diff -Nru ubuntu-dev-tools-0.193ubuntu2/setup-packaging-environment ubuntu-dev-tools-0.193ubuntu4~23.04.1/setup-packaging-environment --- ubuntu-dev-tools-0.193ubuntu2/setup-packaging-environment 2018-09-20 08:32:28.000000000 +0000 +++ ubuntu-dev-tools-0.193ubuntu4~23.04.1/setup-packaging-environment 2023-05-30 17:01:28.000000000 +0000 @@ -104,7 +104,7 @@ echo "Those, together with other packages which, though optional, have proven" echo "to be useful, will now be installed." echo -sudo apt-get install ubuntu-dev-tools devscripts debhelper cdbs patchutils pbuilder build-essential +sudo apt-get install ubuntu-dev-tools devscripts debhelper patchutils pbuilder build-essential separator2 echo "Enabling the source repository" diff -Nru ubuntu-dev-tools-0.193ubuntu2/ubuntutools/config.py ubuntu-dev-tools-0.193ubuntu4~23.04.1/ubuntutools/config.py --- ubuntu-dev-tools-0.193ubuntu2/ubuntutools/config.py 2023-04-12 16:44:03.000000000 +0000 +++ ubuntu-dev-tools-0.193ubuntu4~23.04.1/ubuntutools/config.py 2023-05-30 17:02:20.000000000 +0000 @@ -44,7 +44,6 @@ "MIRROR_FALLBACK": True, "UBUNTU_MIRROR": "http://archive.ubuntu.com/ubuntu", "UBUNTU_PORTS_MIRROR": "http://ports.ubuntu.com", - "UBUNTU_INTERNAL_MIRROR": "http://ftpmaster.internal/ubuntu", "UBUNTU_DDEBS_MIRROR": "http://ddebs.ubuntu.com", "UPDATE_BUILDER": False, "WORKDIR": None, Binary files /tmp/tmpr7t_cvny/hFE08GS1HF/ubuntu-dev-tools-0.193ubuntu2/ubuntutools/__init__.pyc and /tmp/tmpr7t_cvny/FiRznP4pCb/ubuntu-dev-tools-0.193ubuntu4~23.04.1/ubuntutools/__init__.pyc differ Binary files /tmp/tmpr7t_cvny/hFE08GS1HF/ubuntu-dev-tools-0.193ubuntu2/ubuntutools/logger.pyc and /tmp/tmpr7t_cvny/FiRznP4pCb/ubuntu-dev-tools-0.193ubuntu4~23.04.1/ubuntutools/logger.pyc differ Binary files /tmp/tmpr7t_cvny/hFE08GS1HF/ubuntu-dev-tools-0.193ubuntu2/ubuntutools/lp/__init__.pyc and /tmp/tmpr7t_cvny/FiRznP4pCb/ubuntu-dev-tools-0.193ubuntu4~23.04.1/ubuntutools/lp/__init__.pyc differ Binary files /tmp/tmpr7t_cvny/hFE08GS1HF/ubuntu-dev-tools-0.193ubuntu2/ubuntutools/lp/lpapicache.pyc and /tmp/tmpr7t_cvny/FiRznP4pCb/ubuntu-dev-tools-0.193ubuntu4~23.04.1/ubuntutools/lp/lpapicache.pyc differ Binary files /tmp/tmpr7t_cvny/hFE08GS1HF/ubuntu-dev-tools-0.193ubuntu2/ubuntutools/lp/__pycache__/__init__.cpython-37.pyc and /tmp/tmpr7t_cvny/FiRznP4pCb/ubuntu-dev-tools-0.193ubuntu4~23.04.1/ubuntutools/lp/__pycache__/__init__.cpython-37.pyc differ Binary files /tmp/tmpr7t_cvny/hFE08GS1HF/ubuntu-dev-tools-0.193ubuntu2/ubuntutools/lp/__pycache__/lpapicache.cpython-37.pyc and /tmp/tmpr7t_cvny/FiRznP4pCb/ubuntu-dev-tools-0.193ubuntu4~23.04.1/ubuntutools/lp/__pycache__/lpapicache.cpython-37.pyc differ Binary files /tmp/tmpr7t_cvny/hFE08GS1HF/ubuntu-dev-tools-0.193ubuntu2/ubuntutools/lp/__pycache__/udtexceptions.cpython-37.pyc and /tmp/tmpr7t_cvny/FiRznP4pCb/ubuntu-dev-tools-0.193ubuntu4~23.04.1/ubuntutools/lp/__pycache__/udtexceptions.cpython-37.pyc differ Binary files /tmp/tmpr7t_cvny/hFE08GS1HF/ubuntu-dev-tools-0.193ubuntu2/ubuntutools/lp/udtexceptions.pyc and /tmp/tmpr7t_cvny/FiRznP4pCb/ubuntu-dev-tools-0.193ubuntu4~23.04.1/ubuntutools/lp/udtexceptions.pyc differ Binary files /tmp/tmpr7t_cvny/hFE08GS1HF/ubuntu-dev-tools-0.193ubuntu2/ubuntutools/misc.pyc and /tmp/tmpr7t_cvny/FiRznP4pCb/ubuntu-dev-tools-0.193ubuntu4~23.04.1/ubuntutools/misc.pyc differ Binary files /tmp/tmpr7t_cvny/hFE08GS1HF/ubuntu-dev-tools-0.193ubuntu2/ubuntutools/__pycache__/__init__.cpython-37.pyc and /tmp/tmpr7t_cvny/FiRznP4pCb/ubuntu-dev-tools-0.193ubuntu4~23.04.1/ubuntutools/__pycache__/__init__.cpython-37.pyc differ Binary files /tmp/tmpr7t_cvny/hFE08GS1HF/ubuntu-dev-tools-0.193ubuntu2/ubuntutools/__pycache__/logger.cpython-37.pyc and /tmp/tmpr7t_cvny/FiRznP4pCb/ubuntu-dev-tools-0.193ubuntu4~23.04.1/ubuntutools/__pycache__/logger.cpython-37.pyc differ Binary files /tmp/tmpr7t_cvny/hFE08GS1HF/ubuntu-dev-tools-0.193ubuntu2/ubuntutools/__pycache__/misc.cpython-37.pyc and /tmp/tmpr7t_cvny/FiRznP4pCb/ubuntu-dev-tools-0.193ubuntu4~23.04.1/ubuntutools/__pycache__/misc.cpython-37.pyc differ Binary files /tmp/tmpr7t_cvny/hFE08GS1HF/ubuntu-dev-tools-0.193ubuntu2/ubuntutools/__pycache__/rdepends.cpython-37.pyc and /tmp/tmpr7t_cvny/FiRznP4pCb/ubuntu-dev-tools-0.193ubuntu4~23.04.1/ubuntutools/__pycache__/rdepends.cpython-37.pyc differ Binary files /tmp/tmpr7t_cvny/hFE08GS1HF/ubuntu-dev-tools-0.193ubuntu2/ubuntutools/rdepends.pyc and /tmp/tmpr7t_cvny/FiRznP4pCb/ubuntu-dev-tools-0.193ubuntu4~23.04.1/ubuntutools/rdepends.pyc differ Binary files /tmp/tmpr7t_cvny/hFE08GS1HF/ubuntu-dev-tools-0.193ubuntu2/ubuntutools/subprocess.pyc and /tmp/tmpr7t_cvny/FiRznP4pCb/ubuntu-dev-tools-0.193ubuntu4~23.04.1/ubuntutools/subprocess.pyc differ diff -Nru ubuntu-dev-tools-0.193ubuntu2/ubuntutools/test/test_update_maintainer.py ubuntu-dev-tools-0.193ubuntu4~23.04.1/ubuntutools/test/test_update_maintainer.py --- ubuntu-dev-tools-0.193ubuntu2/ubuntutools/test/test_update_maintainer.py 2023-04-12 16:44:03.000000000 +0000 +++ ubuntu-dev-tools-0.193ubuntu4~23.04.1/ubuntutools/test/test_update_maintainer.py 2023-05-30 17:01:28.000000000 +0000 @@ -165,8 +165,7 @@ Section: gnome Priority: optional Maintainer: Emilio Pozuelo Monfort -Build-Depends: debhelper (>= 5), - cdbs (>= 0.4.41) +Build-Depends: debhelper (>= 5) Standards-Version: 3.8.3 Homepage: http://live.gnome.org/Seahorse @@ -184,8 +183,7 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Emilio Pozuelo Monfort -Build-Depends: debhelper (>= 5), - cdbs (>= 0.4.41) +Build-Depends: debhelper (>= 5) Standards-Version: 3.8.3 Homepage: http://live.gnome.org/Seahorse