diff -Nru ubuntustudio-meta-0.182/.bzr-builddeb/default.conf ubuntustudio-meta-0.183/.bzr-builddeb/default.conf --- ubuntustudio-meta-0.182/.bzr-builddeb/default.conf 2015-09-09 10:21:13.000000000 +0200 +++ ubuntustudio-meta-0.183/.bzr-builddeb/default.conf 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -[BUILDDEB] -native = True diff -Nru ubuntustudio-meta-0.182/debian/changelog ubuntustudio-meta-0.183/debian/changelog --- ubuntustudio-meta-0.182/debian/changelog 2018-09-26 18:26:29.000000000 +0200 +++ ubuntustudio-meta-0.183/debian/changelog 2018-11-03 08:11:11.000000000 +0100 @@ -1,3 +1,17 @@ +ubuntustudio-meta (0.183) disco; urgency=medium + + * Switch seeds to git from bzr (LP: #1800817) + * Convert -meta bzr repository to git & merge "out of Vcs" changes + * Add new git Vcs URLs to debian/control + * Switch germinate Vcs from bzr to automatic (--vcs) + * Switch update.cfg from bzr to new git seeds location + * Switch cosmic > disco in update.cfg + * Remove trailing whitespace in d/control and d/changelog + * Update d/copyright file to copyright format 1.0 + * Bump standards version, no changes required + + -- Ross Gammon Sat, 03 Nov 2018 08:11:11 +0100 + ubuntustudio-meta (0.182) cosmic; urgency=medium * Refreshed dependencies @@ -995,8 +1009,8 @@ ubuntustudio-meta (0.123) trusty; urgency=medium - * update.cfg: Add ppc64el. - + * update.cfg: Add ppc64el. + * Refreshed dependencies * Added entangle to photography-recommends [amd64 arm64 armhf i386 powerpc] @@ -1460,7 +1474,7 @@ (LP: #954468, #946312, #571688, #946819, #933722) [ Micah Gersten ] - * Remove the the abort-upgrade|configure section as this has no remaining + * Remove the the abort-upgrade|configure section as this has no remaining logic and was apparently left over from some previous revision - update debian/ubuntustudio-audio.preinst diff -Nru ubuntustudio-meta-0.182/debian/control ubuntustudio-meta-0.183/debian/control --- ubuntustudio-meta-0.182/debian/control 2018-05-13 23:45:01.000000000 +0200 +++ ubuntustudio-meta-0.183/debian/control 2018-11-03 08:11:11.000000000 +0100 @@ -2,8 +2,11 @@ Section: metapackages Priority: optional Maintainer: Ubuntu Studio Developers -Standards-Version: 4.1.4 +Standards-Version: 4.2.1 Build-Depends: debhelper (>= 11), germinate (>= 1.0) +Vcs-Git: https://git.launchpad.net/~ubuntustudio-dev/ubuntustudio-meta +Vcs-Browser: https://git.launchpad.net/~ubuntustudio-dev/ubuntustudio-meta +Homepage: https://launchpad.net/ubuntustudio-meta Package: ubuntustudio-desktop-core Architecture: any @@ -52,7 +55,7 @@ Depends: ${germinate:Depends}, ${misc:Depends}, ubuntustudio-fonts Recommends: ${germinate:Recommends} Description: Ubuntu Studio graphics Package - Ubuntu Studio is a multimedia creation flavor of Ubuntu for the + Ubuntu Studio is a multimedia creation flavor of Ubuntu for the Linux audio, video, and graphic enthusiast or professional. . A collection of applications aimed at 2D/3D creation and editing. @@ -62,7 +65,7 @@ Depends: ${germinate:Depends}, ${misc:Depends} Recommends: ${germinate:Recommends} Description: Ubuntu Studio audio plugins Package - Ubuntu Studio is a multimedia creation flavor of Ubuntu for the + Ubuntu Studio is a multimedia creation flavor of Ubuntu for the Linux audio, video, and graphic enthusiast or professional. . A collection of LADSPA, LV2, and DSSI plugins. @@ -72,7 +75,7 @@ Depends: ${germinate:Depends}, ${misc:Depends} Recommends: ${germinate:Recommends} Description: Ubuntu Studio video Package - Ubuntu Studio is a multimedia creation flavor of Ubuntu for the + Ubuntu Studio is a multimedia creation flavor of Ubuntu for the Linux audio, video, and graphic enthusiast or professional. . A collection of applications aimed at video creation and editing. diff -Nru ubuntustudio-meta-0.182/debian/copyright ubuntustudio-meta-0.183/debian/copyright --- ubuntustudio-meta-0.182/debian/copyright 2015-09-09 10:21:13.000000000 +0200 +++ ubuntustudio-meta-0.183/debian/copyright 2018-11-03 08:11:11.000000000 +0100 @@ -1,15 +1,26 @@ -Copyright (C) 2006, Joseph Jackson IV. http://www.ubuntustudio.org/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Ubuntu Studio +Upstream-Contact: ubuntu-studio-devel@lists.ubuntu.com +Source: https://code.launchpad.net/ubuntustudio-meta/+git -Upstream Author: Joseph Jackson IV +Files: * +Copyright: 2006, Joseph Jackson IV + 2018, Ross Gammon +License: GPL-2+ -This program is free software; you can redistribute it and/or modify it under -the terms of the GNU General Public License as published by the Free Software -Foundation; either version 2, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT ANY -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -PARTICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License with your -system, in /usr/share/common-licenses/GPL-2. If not, see -. +License: GPL-2+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". diff -Nru ubuntustudio-meta-0.182/update ubuntustudio-meta-0.183/update --- ubuntustudio-meta-0.182/update 2015-09-09 10:21:13.000000000 +0200 +++ ubuntustudio-meta-0.183/update 2018-11-03 08:11:11.000000000 +0100 @@ -10,4 +10,4 @@ exit 1 fi -exec germinate-update-metapackage --bzr +exec germinate-update-metapackage --vcs diff -Nru ubuntustudio-meta-0.182/update.cfg ubuntustudio-meta-0.183/update.cfg --- ubuntustudio-meta-0.182/update.cfg 2018-08-17 01:06:04.000000000 +0200 +++ ubuntustudio-meta-0.183/update.cfg 2018-11-03 08:11:11.000000000 +0100 @@ -1,7 +1,7 @@ [DEFAULT] -dist: cosmic +dist: disco -[cosmic] +[disco] seeds: desktop-core desktop audio-core audio audio-plugins fonts graphics video photography publishing architectures: i386 amd64 ppc64el armhf arm64 s390x seed_base: http://people.canonical.com/~ubuntu-archive/seeds/ @@ -13,6 +13,6 @@ archive_base/s390x: %(archive_base/ports)s components: main restricted universe multiverse -[cosmic/vcs] -seed_base: bzr+ssh://bazaar.launchpad.net/~ubuntustudio-dev/ubuntu-seeds/ git+ssh://git.launchpad.net/~ubuntu-core-dev/ubuntu-seeds/+git/ +[disco/vcs] +seed_base: git+ssh://git.launchpad.net/~ubuntustudio-dev/ubuntu-seeds/+git git+ssh://git.launchpad.net/~ubuntu-core-dev/ubuntu-seeds/+git/ seed_dist: ubuntustudio.%(dist)s