diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 869d17d..0000000 --- a/.gitignore +++ /dev/null @@ -1,16 +0,0 @@ -.coverage -.tox -/ubuntu_dev_tools.egg-info/ -__pycache__/ -*.pyc -/build/ -/.pybuild/ -/test-data/ -/debian/python-ubuntutools/ -/debian/python3-ubuntutools/ -/debian/ubuntu-dev-tools/ -/debian/debhelper-build-stamp -/debian/files -/debian/*.debhelper -/debian/*.debhelper.log -/debian/*.substvars diff --git a/debian/changelog b/debian/changelog index c825d26..bd9c348 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +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 --git a/doc/setup-packaging-environment.1 b/doc/setup-packaging-environment.1 index 90d6898..68e15ef 100644 --- a/doc/setup-packaging-environment.1 +++ b/doc/setup-packaging-environment.1 @@ -11,7 +11,7 @@ contributors to get their Ubuntu installation ready for packaging work. It 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 --git a/setup-packaging-environment b/setup-packaging-environment index 9738d80..6369b66 100755 --- a/setup-packaging-environment +++ b/setup-packaging-environment @@ -104,7 +104,7 @@ echo "In order to do packaging work, you'll need a minimal set of packages." 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 --git a/ubuntutools/test/test_update_maintainer.py b/ubuntutools/test/test_update_maintainer.py index ae1a9c1..1f447bb 100644 --- a/ubuntutools/test/test_update_maintainer.py +++ b/ubuntutools/test/test_update_maintainer.py @@ -165,8 +165,7 @@ Source: seahorse-plugins 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 @@ Section: gnome 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