diffstat of debian/ for gnome-software_3.30.6-5 gnome-software_3.30.6-5+progress5u1 changelog | 13 +++++++++++++ control | 13 +++++++++---- control.in | 13 +++++++++---- gnome-software.gsettings-override.in | 2 +- rules | 5 +++-- 5 files changed, 35 insertions(+), 11 deletions(-) diff -Nru gnome-software-3.30.6/debian/changelog gnome-software-3.30.6/debian/changelog --- gnome-software-3.30.6/debian/changelog 2019-02-25 02:09:02.000000000 +0000 +++ gnome-software-3.30.6/debian/changelog 2019-02-25 21:26:36.000000000 +0000 @@ -1,3 +1,16 @@ +gnome-software (3.30.6-5+progress5u1) engywuck; urgency=medium + + * Initial upload to engywuck. + * Updating maintainer field. + * Updating uploaders field. + * Updating bugs field. + * Updating vcs fields. + * Making org.gnome.software gsettings overrides derivatives friendlier. + * Updating org.gnome.software gsettings overrides for Progress Linux. + * Regenerating debian files. + + -- Daniel Baumann Mon, 25 Feb 2019 22:26:36 +0100 + gnome-software (3.30.6-5) unstable; urgency=medium * Cherry-pick 8 Snap patches via Ubuntu diff -Nru gnome-software-3.30.6/debian/control gnome-software-3.30.6/debian/control --- gnome-software-3.30.6/debian/control 2019-02-25 02:09:02.000000000 +0000 +++ gnome-software-3.30.6/debian/control 2019-02-25 21:26:36.000000000 +0000 @@ -5,8 +5,11 @@ Source: gnome-software Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers -Uploaders: Jeremy Bicha , Laurent Bigonville +Maintainer: Progress Linux Maintainers +XSBC-Uploaders: Daniel Baumann +XSBC-Original-Maintainer: Debian GNOME Maintainers +XSBC-Original-Uploaders: Jeremy Bicha , Laurent Bigonville +Bugs: mailto:maintainers@lists.progress-linux.org Build-Depends: appstream, appstream-util, debhelper-compat (= 12), @@ -35,8 +38,10 @@ xsltproc Rules-Requires-Root: no Standards-Version: 4.3.0 -Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-software -Vcs-Git: https://salsa.debian.org/gnome-team/gnome-software.git +Vcs-Browser: https://git.progress-linux.org/distributions/engywuck/packages/gnome-software +Vcs-Git: https://git.progress-linux.org/distributions/engywuck/packages/gnome-software +XSBC-Original-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-software +XSBC-Original-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-software.git Homepage: https://wiki.gnome.org/Apps/Software Package: gnome-software diff -Nru gnome-software-3.30.6/debian/control.in gnome-software-3.30.6/debian/control.in --- gnome-software-3.30.6/debian/control.in 2019-02-25 02:09:02.000000000 +0000 +++ gnome-software-3.30.6/debian/control.in 2019-02-25 21:26:36.000000000 +0000 @@ -1,8 +1,11 @@ Source: gnome-software Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers -Uploaders: @GNOME_TEAM@ +Maintainer: Progress Linux Maintainers +XSBC-Uploaders: Daniel Baumann +XSBC-Original-Maintainer: Debian GNOME Maintainers +XSBC-Original-Uploaders: @GNOME_TEAM@ +Bugs: mailto:maintainers@lists.progress-linux.org Build-Depends: appstream, appstream-util, debhelper-compat (= 12), @@ -31,8 +34,10 @@ xsltproc Rules-Requires-Root: no Standards-Version: 4.3.0 -Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-software -Vcs-Git: https://salsa.debian.org/gnome-team/gnome-software.git +Vcs-Browser: https://git.progress-linux.org/distributions/engywuck/packages/gnome-software +Vcs-Git: https://git.progress-linux.org/distributions/engywuck/packages/gnome-software +XSBC-Original-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-software +XSBC-Original-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-software.git Homepage: https://wiki.gnome.org/Apps/Software Package: gnome-software diff -Nru gnome-software-3.30.6/debian/gnome-software.gsettings-override.in gnome-software-3.30.6/debian/gnome-software.gsettings-override.in --- gnome-software-3.30.6/debian/gnome-software.gsettings-override.in 2019-02-25 02:09:02.000000000 +0000 +++ gnome-software-3.30.6/debian/gnome-software.gsettings-override.in 2019-02-25 21:26:36.000000000 +0000 @@ -1,4 +1,4 @@ [org.gnome.software] -official-repos=['@DISTRO@-*'] +official-repos=[@OFFICIAL_REPOS@] free-repos=[@FREE_REPOS@] free-repos-url='@URL@' diff -Nru gnome-software-3.30.6/debian/rules gnome-software-3.30.6/debian/rules --- gnome-software-3.30.6/debian/rules 2019-02-25 02:09:02.000000000 +0000 +++ gnome-software-3.30.6/debian/rules 2019-02-25 21:26:36.000000000 +0000 @@ -46,7 +46,8 @@ endif DISTRO_ID = debian -FREE_REPOS = \'@DISTRO@-*-main\' +OFFICIAL_REPOS = \'debian-*\', \'progress_linux-*\' +FREE_REPOS = \'debian-*-main\', \'progress_linux-*-main\' FREE_URL = https:\/\/www.debian.org\/social_contract\#guidelines ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes)) DISTRO_ID = ubuntu @@ -72,7 +73,7 @@ endif override_dh_installgsettings: - sed "s#@FREE_REPOS@#$(FREE_REPOS)#g" debian/gnome-software.gsettings-override.in > debian/gnome-software.gsettings-override + sed -e "s#@OFFICIAL_REPOS@#$(OFFICIAL_REPOS)#g" -e "s#@FREE_REPOS@#$(FREE_REPOS)#g" debian/gnome-software.gsettings-override.in > debian/gnome-software.gsettings-override sed -i "s/@DISTRO@/$(DISTRO_ID)/g" debian/gnome-software.gsettings-override sed -i "s/@URL@/$(FREE_URL)/g" debian/gnome-software.gsettings-override dh_installgsettings