diff -Nru cups-x2go-3.0.1.3/cups-x2go cups-x2go-3.0.1.4/cups-x2go --- cups-x2go-3.0.1.3/cups-x2go 2017-11-11 12:51:36.000000000 +0000 +++ cups-x2go-3.0.1.4/cups-x2go 2018-11-22 10:17:42.000000000 +0000 @@ -1,7 +1,8 @@ #!/usr/bin/perl # X2Go CUPS backend -# Copyright 2009-2015 Obviously Nice +# Copyright (C) 2009-2018 X2Go Project - https://wiki.x2go.org +# Copyright (C) 2009-2018 Obviously Nice # # 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 @@ -333,7 +334,7 @@ } } -# Temporary file cleanup is hopefully handled correctly by File::Temp. +# Temporary PDF file cleanup is hopefully handled correctly by File::Temp. END { if ($need_ps_file_cleanup) { diff -Nru cups-x2go-3.0.1.3/cups-x2go.spec cups-x2go-3.0.1.4/cups-x2go.spec --- cups-x2go-3.0.1.3/cups-x2go.spec 2017-11-11 12:51:36.000000000 +0000 +++ cups-x2go-3.0.1.4/cups-x2go.spec 2018-11-22 10:17:42.000000000 +0000 @@ -1,5 +1,5 @@ Name: cups-x2go -Version: 3.0.1.3 +Version: 3.0.1.4 Release: 0.0x2go1%{?dist} Summary: CUPS backend for printing from X2Go @@ -11,13 +11,21 @@ BuildArch: noarch # %%{_datadir}/ppd/ is provided by ,,cups-filters'' for OpenSUSE 13.2+ and SLES 12+. -# Older releases provide %%{_datadir}/ppd/ not at all. +# SLE{S,D} 11 provides %%{_datadir}/ppd/ via cups-drivers. +# Older OpenSuSE releases do not provide %%{_datadir}/ppd at all. # However, cups-filters conflicts with cups < 1.6, which is currently shipped for -# OpenSUSE 13.2 and SLES 12. Do not use this (yet.) -#%if 0%{?suse_version} && 0%{?suse_version} >= 1315 -#Requires: cups-filters -#BuildRequires: cups-filters -#%else +# OpenSUSE 13.2. Do not use this package on that platform. +%if 0%{?suse_version} +%if 0%{?suse_version} >= 1315 && 0%{?suse_version} != 1320 +Requires: cups-filters +BuildRequires: cups-filters +%else +%if 0%{?suse_version} == 1110 +Requires: cups-drivers +BuildRequires: cups-drivers +%endif +%endif +%endif # Also needed at build-time as the package owning the common directories on SUSE. %if 0%{?fedora} Requires: cups @@ -27,8 +35,6 @@ Requires: cups BuildRequires: cups %endif -#%endif -#%endif Requires: ghostscript %if 0%{?fedora} || 0%{?el5} || 0%{?el6} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?rhel} @@ -52,6 +58,9 @@ %{perl_requires} %endif %else +%if 0%{?fedora} +BuildRequires: perl-generators +%endif Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %endif @@ -103,7 +112,7 @@ %endif # -# The cups-x2go backends wants root permissions. So give it to them. +# The cups-x2go backend wants root permissions. So give them to it. # http://www.cups.org/documentation.php/doc-1.4/man-backend.html says: # “Backends without world execute permissions are run as the root user. # Otherwise, the backend is run using the unprivileged user account, @@ -112,10 +121,12 @@ %attr(0700,root,root) %{_prefix}/lib/cups/backend/cups-x2go %config(noreplace) %{_sysconfdir}/cups/cups-x2go.conf -# Nothing provides %%{_datadir}/ppd/ on OpenSUSE < 13.2/SLES < 12. -# The package (cups-filters) that provides %%{_datadir}/ppd/ conflicts with -# cups on newer releases. -%if 0%{?suse_version} && 0%{?suse_version} <= 1320 +# Nothing provides %%{_datadir}/ppd/ on OpenSUSE < 13.2. +# The package that provides %%{_datadir}/ppd/ on OpenSuSE >= 13.2 +# (cups-filters) conflicts with cups on OpenSuSE 13.2. +# Make sure to exclude SLE{S,D} 11 and 12, for which %%{_datadir}/ppd/ +# is provided by cups-drivers and cups-filters respectively. +%if 0%{?suse_version} && 0%{?suse_version} <= 1320 && 0%{?suse_version} != 1110 && 0%{?suse_version} != 1315 %{_datadir}/ppd/ %endif %{_datadir}/ppd/cups-x2go/ diff -Nru cups-x2go-3.0.1.3/debian/bzr-builder.manifest cups-x2go-3.0.1.4/debian/bzr-builder.manifest --- cups-x2go-3.0.1.3/debian/bzr-builder.manifest 2017-11-11 12:51:37.000000000 +0000 +++ cups-x2go-3.0.1.4/debian/bzr-builder.manifest 2018-11-22 10:17:42.000000000 +0000 @@ -1,2 +1,2 @@ -# bzr-builder format 0.3 deb-version {debupstream}-0~135 -lp:~x2go/x2go/cups-x2go_build-main revid:git-v1:addd9525d231a8cd05bc78ea1f1d3ea8462ca7d8 +# bzr-builder format 0.3 deb-version {debupstream}-0~145 +lp:~x2go/x2go/cups-x2go_build-main revid:git-v1:0eb2236e28effcd5629b61019c222c53ee8b0b1d diff -Nru cups-x2go-3.0.1.3/debian/changelog cups-x2go-3.0.1.4/debian/changelog --- cups-x2go-3.0.1.3/debian/changelog 2017-11-11 12:51:37.000000000 +0000 +++ cups-x2go-3.0.1.4/debian/changelog 2018-11-22 10:17:42.000000000 +0000 @@ -1,8 +1,37 @@ -cups-x2go (3.0.1.3-0~135~ubuntu18.04.1) bionic; urgency=low +cups-x2go (3.0.1.4-0~145~ubuntu18.04.1) bionic; urgency=low * Auto build. - -- Mihai Moldovan Sat, 11 Nov 2017 12:51:37 +0000 + -- X2Go Thu, 22 Nov 2018 10:17:42 +0000 + +cups-x2go (3.0.1.4-0x2go1) unstable; urgency=low + + [ Mihai Moldovan ] + * New upstream version (3.0.1.4): + - misc: update copyright notices. + - cups-x2go: clarify *what* temporary file we want to get cleaned up + automatically by File::Temp. + * debian/control: + - Maintainer change in package: X2Go Developers . + - Uploaders: add myself. Also, force a rebuild due to the changed + versioning. + * cups-x2go.spec: + - Fixup %{_datadir}/ppd/ directory owning. On SLE{S,D} 11 and 12, this + directory is owned/provided by cups-drivers and cups-filters + respectively. On OpenSuSE systems prior to 13.2, this directory was not + provided by any package, so cups-x2go has to own it. OpenSuSE 42.1+ + provides cups-filters that owns this directory, consistently with + SLE{S,D} 12. OpenSuSE 13.2 is a special case: even though the + cups-filters package is available there (and also owns + %{_datadir}/ppd/), it conflicts with the cups package, which makes it + useless. Let cups-x2go own this directory instead on OpenSuSE 13.2. + - Grammar fix in comment only. + - Build-Require perl-generators on Fedora, since perl-generators (and + hence Perl) was removed from the Build Root. The Fedora Packaging + Guidelines for Perl say to build-depend upon perl-generators whenever a + perl script or module is installed. + + -- X2Go Release Manager Thu, 22 Nov 2018 08:00:44 +0100 cups-x2go (3.0.1.3-0x2go1) unstable; urgency=low diff -Nru cups-x2go-3.0.1.3/debian/control cups-x2go-3.0.1.4/debian/control --- cups-x2go-3.0.1.3/debian/control 2017-11-11 12:51:36.000000000 +0000 +++ cups-x2go-3.0.1.4/debian/control 2018-11-22 10:17:42.000000000 +0000 @@ -1,10 +1,11 @@ Source: cups-x2go Section: x11 Priority: optional -Maintainer: X2Go Developers +Maintainer: X2Go Developers Uploaders: Oleksandr Shneyder , Mike Gabriel , + Mihai Moldovan , Build-Depends: debhelper (>= 7) Standards-Version: 3.9.1 diff -Nru cups-x2go-3.0.1.3/debian/copyright cups-x2go-3.0.1.4/debian/copyright --- cups-x2go-3.0.1.3/debian/copyright 2017-11-11 12:51:36.000000000 +0000 +++ cups-x2go-3.0.1.4/debian/copyright 2018-11-22 10:17:42.000000000 +0000 @@ -5,7 +5,8 @@ Upstream Author: Oleksandr Shneyder -Copyright (C) 2009-2015 obviously nice - http://www.obviouslynice.de +Copyright (C) 2009-2018 X2Go Project - https://wiki.x2go.org +Copyright (C) 2009-2018 Obviously Nice - http://www.obviouslynice.de 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 @@ -22,12 +23,12 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -Copyright (C) 2009-2015 Oleksandr Shneyder +Copyright (C) 2009-2018 Oleksandr Shneyder oleksandr.shneyder@obviously-nice.de On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL'. -The Debian packaging is (C) 2009-2015, Oleksandr Shneyder and +The Debian packaging is (C) 2009-2018, Oleksandr Shneyder and is licensed under the GPL, see above. diff -Nru cups-x2go-3.0.1.3/VERSION.cups-x2go cups-x2go-3.0.1.4/VERSION.cups-x2go --- cups-x2go-3.0.1.3/VERSION.cups-x2go 2017-11-11 12:51:36.000000000 +0000 +++ cups-x2go-3.0.1.4/VERSION.cups-x2go 2018-11-22 10:17:42.000000000 +0000 @@ -1 +1 @@ -3.0.1.3 +3.0.1.4