From e57b8874cfa23e35ba99ed1f78b6766f59707077e5707f2f8505e0c98d55e543 Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Mon, 1 Jul 2013 08:25:03 +0000 Subject: [PATCH 1/2] Accepting request 181478 from home:adra:branches:system:packagemanager Added a patch (fix_pod_syntax.patch) to fix build with perl 5.18 OBS-URL: https://build.opensuse.org/request/show/181478 OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/devscripts?expand=0&rev=10 --- devscripts.changes | 5 +++++ devscripts.spec | 3 +++ fix_pod_syntax.patch | 18 ++++++++++++++++++ 3 files changed, 26 insertions(+) create mode 100644 fix_pod_syntax.patch diff --git a/devscripts.changes b/devscripts.changes index dfbc3cc..a603ac1 100644 --- a/devscripts.changes +++ b/devscripts.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Jun 29 20:34:29 UTC 2013 - asterios.dramis@gmail.com + +- Added a patch (fix_pod_syntax.patch) to fix build with perl 5.18. + ------------------------------------------------------------------- Tue Feb 12 09:11:49 UTC 2013 - frank.lichtenheld@sophos.com diff --git a/devscripts.spec b/devscripts.spec index 2360bfe..186d067 100644 --- a/devscripts.spec +++ b/devscripts.spec @@ -37,6 +37,8 @@ Patch2: devscripts-pod2man-no-utf8.patch Patch3: devscripts-2.11.7-remove-install-layout-deb.patch # PATCH-FIX-OPENSUSE support old versions of File::Patch (SLE 11) Patch4: devscripts-old-File-Path.patch +# PATCH-FIX-UPSTREAM fix_pod_syntax.patch asterios.dramis@gmail.com -- Fix pod syntax (fixes build with perl 5.18) +Patch5: fix_pod_syntax.patch BuildRequires: dpkg-devel >= 1.15.6 BuildRequires: python-devel # we are sorry to drop sles10 support, but no setuptools @@ -119,6 +121,7 @@ line, and outputs warnings if possible bashisms are detected. %endif %patch1 -p1 %patch3 -p1 +%patch5 -p1 %build make %{?_smp_mflags} XSL_STYLESHEET="%{_xsl_stylesheet}" diff --git a/fix_pod_syntax.patch b/fix_pod_syntax.patch new file mode 100644 index 0000000..a56c22e --- /dev/null +++ b/fix_pod_syntax.patch @@ -0,0 +1,18 @@ +diff -Naur devscripts-2.12.4.orig/scripts/transition-check.pl devscripts-2.12.4/scripts/transition-check.pl +--- devscripts-2.12.4.orig/scripts/transition-check.pl 2012-09-25 01:51:39.000000000 +0300 ++++ devscripts-2.12.4/scripts/transition-check.pl 2013-06-29 23:31:50.225798441 +0300 +@@ -58,12 +58,12 @@ + + =over 4 + +-=item 0 ++=item C<0> + + Either B<--help> or B<--version> was used, or none of the packages examined + was involved in a transition. + +-=item 1 ++=item C<1> + + At least one package examined is involved in a current transition. + From 8e3c2bd55cc17c0e7b2c9341c45bec2927d89900f524c230afdefefb6ff07a1e Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Mon, 1 Jul 2013 08:56:00 +0000 Subject: [PATCH 2/2] Accepting request 181578 from home:flichtenheld update to 2.12.6 OBS-URL: https://build.opensuse.org/request/show/181578 OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/devscripts?expand=0&rev=11 --- devscripts.changes | 6 ++++++ devscripts.spec | 2 +- devscripts_2.12.4.tar.gz | 3 --- devscripts_2.12.6.tar.gz | 3 +++ 4 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 devscripts_2.12.4.tar.gz create mode 100644 devscripts_2.12.6.tar.gz diff --git a/devscripts.changes b/devscripts.changes index a603ac1..dcaad29 100644 --- a/devscripts.changes +++ b/devscripts.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jul 1 08:31:11 UTC 2013 - frank.lichtenheld@sophos.com + +- update to 2.12.6 (current stable) +* see /usr/share/doc/packages/devscripts/changelog for details + ------------------------------------------------------------------- Sat Jun 29 20:34:29 UTC 2013 - asterios.dramis@gmail.com diff --git a/devscripts.spec b/devscripts.spec index 186d067..f2a920f 100644 --- a/devscripts.spec +++ b/devscripts.spec @@ -21,7 +21,7 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} Name: devscripts -Version: 2.12.4 +Version: 2.12.6 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 diff --git a/devscripts_2.12.4.tar.gz b/devscripts_2.12.4.tar.gz deleted file mode 100644 index 7024d38..0000000 --- a/devscripts_2.12.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:34bcbec78bd4fe34d9f1326b9d1477ff2410e20e2dca6b7bfbf2bf92dbb83904 -size 791085 diff --git a/devscripts_2.12.6.tar.gz b/devscripts_2.12.6.tar.gz new file mode 100644 index 0000000..63d7ae3 --- /dev/null +++ b/devscripts_2.12.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eab908dc6809459a62eac4e6d07bda714123fc4cc0b15e275b865c8a49e65f8e +size 996395