Hello community, here is the log from the commit of package devscripts for openSUSE:Factory checked in at 2019-04-04 12:05:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/devscripts (Old) and /work/SRC/openSUSE:Factory/.devscripts.new.3908 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "devscripts" Thu Apr 4 12:05:11 2019 rev:9 rq:690674 version:2.18.10 Changes: -------- --- /work/SRC/openSUSE:Factory/devscripts/devscripts.changes 2015-01-20 19:11:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.devscripts.new.3908/devscripts.changes 2019-04-04 12:05:14.389427502 +0200 @@ -2 +2,29 @@ -Sun Jan 4 18:52:45 UTC 2015 - [email protected] +Tue Apr 2 14:08:49 UTC 2019 - Martin Wilck <[email protected]> + +- Fixed license tag as suggested by licensedigger. + +------------------------------------------------------------------- +Thu Mar 28 08:49:53 UTC 2019 - Martin Wilck <[email protected]> + +- Changed download location for source tarball from Debian package + pool to salsa.debian.org to avoid download errors in OBS. + * format must be changed to tar.bz2, because salsa.debian.org + doesn't support tar.xz. + * verified identical contents of new and old tarball + +------------------------------------------------------------------- +Sat Dec 15 13:47:09 UTC 2018 - Alexei Sorokin <[email protected]> + +- Update to version 2.18.10: + * See /usr/share/doc/packages/devscripts/changelog +- Rebase and rename devscripts-2.11.7-buildfix.patch to + devscripts-fix-build.patch. +- Rebase and rename devscripts-2.15.1-remove-install-layout-deb.patch + to devscripts-fix-python-install-layout.patch. +- Rebase and rename devscripts-2.11.7-debcommit-hg16.patch to + devscripts-debcommit-hg16.patch (is it still relevant?). +- Kill support for ancient openSUSE and non-SUSE distributions. +- Spec clean-up. + +------------------------------------------------------------------- +Sun Jan 4 18:52:45 UTC 2015 - Denisart Benjamin <[email protected]> @@ -898 +925,0 @@ - Old: ---- devscripts-2.11.7-buildfix.patch devscripts-2.11.7-debcommit-hg16.patch devscripts-2.15.1-remove-install-layout-deb.patch devscripts_2.15.1.tar.xz New: ---- devscripts-debcommit-hg16.patch devscripts-fix-build.patch devscripts-fix-python-install-layout.patch devscripts-v2.18.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ devscripts.spec ++++++ --- /var/tmp/diff_new_pack.hsa1FP/_old 2019-04-04 12:05:15.913427905 +0200 +++ /var/tmp/diff_new_pack.hsa1FP/_new 2019-04-04 12:05:15.913427905 +0200 @@ -1,7 +1,7 @@ # # spec file for package devscripts # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,137 +12,124 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%define _xsl_stylesheet %{_datadir}/xml/docbook/stylesheet/nwalsh/current/manpages/docbook.xsl Name: devscripts -Version: 2.15.1 +Version: 2.18.10 Release: 0 Summary: Scripts to make the life of a Debian Package maintainer easier -License: GPL-2.0+ and GPL-2.0 and GPL-3.0+ and GPL-3.0 and Artistic-2.0 and GPL-1.0+ or Artistic-1.0 and SUSE-Public-Domain and ISC +License: GPL-2.0-or-later AND GPL-2.0-only AND GPL-3.0-or-later AND GPL-3.0-only AND Artistic-2.0 AND (GPL-1.0-or-later OR Artistic-1.0) AND SUSE-Public-Domain AND ISC Group: Development/Tools/Building -Source0: http://ftp.de.debian.org/debian/pool/main/d/devscripts/%{name}_%{version}.tar.xz -# PATCH-FIX-UPSTREAM remove bash auto completion and fix docbook template directories path. -Patch0: devscripts-2.11.7-buildfix.patch -# PATCH-FIX-UPSTREAM hg can't commit empty, fix it. -Patch1: devscripts-2.11.7-debcommit-hg16.patch -# PATCH-FIX-UPSTREAM remove unrecognized --install-layout=deb from scripts/setup.py and fix prefix -Patch3: devscripts-2.15.1-remove-install-layout-deb.patch -BuildRequires: dpkg-devel >= 1.15.6 +URL: https://salsa.debian.org/debian/devscripts +Source: https://salsa.debian.org/debian/devscripts/-/archive/v%{version}/devscripts-v%{version}.tar.bz2 +# PATCH-FIX-OPENSUSE devscripts-fix-build.patch -- Fix docbook template directories path. +Patch0: devscripts-fix-build.patch +# PATCH-FIX-OPENSUSE devscripts-fix-python-install-layout.patch -- Remove Debian's --install-layout=deb from setup.py. +Patch1: devscripts-fix-python-install-layout.patch +# PATCH-FEATURE-OPENSUSE devscripts-debcommit-hg16.patch -- Mercurial cannot commit empty, fix it. +Patch2: devscripts-debcommit-hg16.patch +BuildRequires: bash-completion-devel +BuildRequires: docbook-xsl-stylesheets +BuildRequires: dpkg-devel >= 1.18.19 +BuildRequires: help2man +BuildRequires: libxslt +BuildRequires: perl +BuildRequires: perl-macros BuildRequires: python3-devel BuildRequires: python3-setuptools +BuildRequires: sgmltool +BuildRequires: texlive-latex BuildRequires: zlib-devel Requires: checkbashisms >= %{version} Requires: dpkg Requires: html2text -Requires: perl Provides: deb:%{_bindir}/debchange -BuildRequires: docbook-xsl-stylesheets -BuildRequires: libxslt -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -%if 0%{?suse_version} -BuildRequires: sgmltool -BuildRequires: texlive-latex -%define _xsl_stylesheet /usr/share/xml/docbook/stylesheet/nwalsh/current/manpages/docbook.xsl -%endif -%if 0%{?fedora_version} -BuildRequires: tetex-latex -%define _xsl_stylesheet /usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl -%endif -%if 0%{?rhel_version} -BuildRequires: tetex-latex -%define _xsl_stylesheet /usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl -%endif -%if 0%{?centos_version} -BuildRequires: tetex-latex -%define _xsl_stylesheet /usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl -%endif +%{?perl_requires} %description Collection of scripts for working on Debian packages. + Examples: - - bts: a command-line tool for manipulating the Debian Bug - Tracking System - - dcontrol: remotely query package and source control files - for all Debian distributions - - debchange/dch: automagically add entries to - debian/changelog files - - debsign, debrsign: sign a .changes/.dsc pair without - needing any of the rest of the package to be present; - can sign the pair remotely or fetch the pair from a - remote machine for signing - - diff2patches: extract patches from a .diff.gz file - placing them under debian/ or, if present, debian/patches - - licensecheck: attempt to determine the license of source - files - - uscan: scan upstream sites for new releases of packages + - bts: A command-line tool for manipulating the Debian Bug + Tracking System. + - dcontrol: Remotely query package and source control files for + all Debian distributions. + - debchange/dch: Automagically add entries to debian/changelog + files. + - debsign, debrsign: Sign a .changes/.dsc pair without needing any + of the rest of the package to be present; can sign the pair + remotely or fetch the pair from a remote machine for signing. + - diff2patches: Extract patches from a .diff.gz file placing them + under debian/ or, if present, debian/patches. + - licensecheck: Attempt to determine the license of source files. + - uscan: Scan upstream sites for new releases of packages. %package -n checkbashisms Summary: Tool for checking /bin/sh scripts for possible bashisms -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Development/Tools/Building -Provides: deb:/usr/bin/checkbashisms -Provides: devscripts:/usr/bin/checkbashisms -Requires: perl -%if 0%{?suse_version} && 0%{?suse_version} < 1120 -#for the benefit of SLE -%else +Provides: deb:%{_bindir}/checkbashisms +Provides: devscripts:%{_bindir}/checkbashisms BuildArch: noarch -%endif +%{?perl_requires} %description -n checkbashisms -checkbashisms performs basic checks on /bin/sh shell scripts for the possible -presence of bashisms. It takes the names of the shell scripts on the command -line, and outputs warnings if possible bashisms are detected. +checkbashisms performs basic checks on /bin/sh shell scripts for +the possible presence of bashisms. It takes the names of the shell +scripts on the command line, and outputs warnings if possible +bashisms are detected. %prep -%setup -q - +%setup -q -n devscripts-v%{version} %patch0 -p1 %patch1 -p1 -%patch3 -p1 +%patch2 -p1 %build -make %{?_smp_mflags} XSL_STYLESHEET="%{_xsl_stylesheet}" +make %{?_smp_mflags} V=1 \ + XSL_STYLESHEET="%{_xsl_stylesheet}" %install -%{__make} install DESTDIR=%{?buildroot} XSL_STYLESHEET="%{_xsl_stylesheet}" +%make_install \ + XSL_STYLESHEET="%{_xsl_stylesheet}" + +mkdir -p %{buildroot}%{_mandir}/man1/ +install -Dpm 0644 scripts/*.1 -t %{buildroot}%{_mandir}/man1/ -install -d %{buildroot}%{_mandir}/man1/ -install -d %{buildroot}%{_mandir}/man5/ -install -m 644 scripts/*.1 %{buildroot}%{_mandir}/man1/ -install -m 644 scripts/*.5 %{buildroot}%{_mandir}/man5/ while read target link; do if [ -d $(dirname "%{buildroot}$link") ]; then - ln -sf $target %{buildroot}$link + ln -sf "$target" "%{buildroot}$link" fi -done <debian/links -# fix docs -mkdir -pv %{buildroot}%{_docdir} -if [ %{_datadir}/doc != %{_docdir} ]; then - mv %{buildroot}%{_datadir}/doc/devscripts %{buildroot}%{_docdir} +done < debian/links + +# Fix documentation. +mkdir -p %{buildroot}%{_docdir}/ +if [ "%{_datadir}/doc" != "%{_docdir}" ]; then + mv %{buildroot}%{_datadir}/doc/devscripts %{buildroot}%{_docdir}/ fi -chmod -x %{buildroot}%{_docdir}/devscripts/README -install -m644 debian/copyright %{buildroot}%{_docdir}/devscripts/copyright -install -m644 debian/changelog %{buildroot}%{_docdir}/devscripts/changelog +install -Dpm 0644 debian/changelog %{buildroot}%{_docdir}/devscripts/changelog %files -%defattr(-,root,root) -%doc %{_docdir}/devscripts -%doc %{_mandir}/man*/* +%license debian/copyright COPYING +%doc %{_docdir}/devscripts/ %{_bindir}/* -%{python3_sitelib}/devscripts/ -%{python3_sitelib}/devscripts-%{version}-py%{py3_ver}.egg-info/ -/usr/lib/devscripts -%{_datadir}/devscripts -%exclude %{_mandir}/man1/checkbashisms.1.gz %exclude %{_bindir}/checkbashisms +%{_datadir}/devscripts/ +%{python3_sitelib}/devscripts/ +%{python3_sitelib}/devscripts-* +%{perl_vendorlib}/Devscripts/ +%{_datadir}/bash-completion/completions/* +%exclude %{_datadir}/bash-completion/completions/checkbashisms +%{_mandir}/man?/*.?%{?ext_man} +%exclude %{_mandir}/man1/checkbashisms.1%{?ext_man} %files -n checkbashisms -%defattr(-,root,root) -%doc %{_mandir}/man1/checkbashisms.1.gz +%license debian/copyright COPYING %{_bindir}/checkbashisms +%{_datadir}/bash-completion/completions/checkbashisms +%{_mandir}/man1/checkbashisms.1%{?ext_man} %changelog ++++++ devscripts-debcommit-hg16.patch ++++++ --- a/scripts/debcommit.pl +++ b/scripts/debcommit.pl @@ -663,7 +663,9 @@ sub commit { } else { die "debcommit: unknown program $prog"; } - die "debcommit: commit failed\n" if (!$action_rc); + # mercurial 1.6 returns failure if nothing is to be committed + # but we still want to continue with tagging + die "debcommit: commit failed\n" if (!$action_rc) && (!$release); } sub tag { ++++++ devscripts-fix-build.patch ++++++ diff -paur a/Makefile b/Makefile --- a/Makefile 2018-11-15 08:15:00.000000000 +0300 +++ b/Makefile 2018-12-16 16:59:27.376872292 +0300 @@ -4,7 +4,7 @@ include Makefile.common DESTDIR = -all: version doc make_scripts conf.default translated_manpages +all: version doc conf.default version: rm -f version diff -paur a/Makefile.common b/Makefile.common --- a/Makefile.common 2018-11-15 08:15:00.000000000 +0300 +++ b/Makefile.common 2018-12-16 17:00:29.077661251 +0300 @@ -13,3 +13,5 @@ PERLMOD_DIR = $(shell perl -MConfig -e ' DATA_DIR = $(PREFIX)/share/devscripts TEMPLATES_DIR = $(DATA_DIR)/templates SYSCONFDIR = /etc + +XSL_STYLESHEET = /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl Только в b: Makefile.common.orig Только в b: Makefile.common.rej Только в b: Makefile.orig Только в b: Makefile.rej diff -paur a/po4a/Makefile b/po4a/Makefile --- a/po4a/Makefile 2018-11-15 08:15:00.000000000 +0300 +++ b/po4a/Makefile 2018-12-16 16:57:58.863740489 +0300 @@ -40,8 +40,7 @@ fr/%.fr.1: fr/%.fr.pod translate podchecker $< pod2man --utf8 --center=" " --release="Utilitaires Debian" $< > $@ fr/%.fr.1: fr/%.fr.dbk translate - xsltproc --nonet -o $@ \ - /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $< + xsltproc --nonet -o $@ $(XSL_STYLESHEET) $< # xsltproc writes out to foo.1 even if you tell it to do otherwise, so we have # to rename the file after it's generated mv fr/$*.1 $@ Только в b/po4a: Makefile.orig diff -paur a/scripts/Makefile b/scripts/Makefile --- a/scripts/Makefile 2018-11-15 08:15:00.000000000 +0300 +++ b/scripts/Makefile 2018-12-16 17:02:23.223120806 +0300 @@ -81,8 +81,7 @@ endif podchecker $< pod2man --utf8 --center=" " --release="Debian Utilities" $< > $@ %.1: %.dbk - xsltproc --nonet -o $@ \ - /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $< + xsltproc --nonet -o $@ $(XSL_STYLESHEET) $< # Syntax checker test_sh: $(SH_CHECKS) Только в b/scripts: Makefile.orig Только в b/scripts: Makefile.rej ++++++ devscripts-fix-python-install-layout.patch ++++++ --- a/scripts/Makefile +++ b/scripts/Makefile @@ -121,7 +120,7 @@ clean: test: test_pl test_sh test_py install: all - python3 setup.py install --root="$(DESTDIR)" --no-compile --install-layout=deb + python3 setup.py install --root="$(DESTDIR)" --prefix="$(PREFIX)" --no-compile cp $(SCRIPTS) $(DESTDIR)$(BINDIR) ln -sf edit-patch $(DESTDIR)$(BINDIR)/add-patch install -d $(DESTDIR)$(COMPL_DIR)
