up to 2.15.7

diff --git a/devscripts.spec b/devscripts.spec
index c0e87c8e044dc1dda281850b0ecf4ec5d1a4fad3..20b5347cc1047f3aeb1a1371a5583ca84d817487 100644 (file)
--- a/devscripts.spec
+++ b/devscripts.spec
@@ -1,14 +1,15 @@
 # TODO
 # - bash-completions subpackage
+# - some junk installed to root: "/devscripts.*"
 %include       /usr/lib/rpm/macros.perl
 Summary:       Scripts for Debian Package maintainers
 Name:          devscripts
-Version:       2.15.1
+Version:       2.15.7
 Release:       1
 License:       GPL v2+
 Group:         Development
 Source0:       http://ftp.debian.org/debian/pool/main/d/devscripts/%{name}_%{version}.tar.xz
-# Source0-md5: 7c46c0f19205d2022184972ce6390a15
+# Source0-md5: 1655e2c91e42cd48393c65726bc3faa9
 Patch0:                %{name}_docbook.patch
 Patch1:                %{name}_install-layout.patch
 Patch2:                %{name}_install-man.patch
@@ -94,15 +95,13 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_bindir}/checkbashisms
 %{_mandir}/man1/*
 %exclude %{_mandir}/man1/checkbashisms.1*
-%dir %{_libdir}/%{name}
-%attr(755,root,root) %{_libdir}/%{name}/libvfork.so.0
 %{py3_sitescriptdir}/%{name}
 %{py3_sitescriptdir}/%{name}*.egg-info
 %{_datadir}/%{name}
-
-/etc/bash_completion.d/*
+%{perl_vendorlib}/Devscripts
 
 %files -n checkbashisms
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/checkbashisms
 %{_mandir}/man1/checkbashisms.1*
+

diff --git a/devscripts_install-layout.patch b/devscripts_install-layout.patch
index 7dcfc4fb9567d2b81f2bb0fd27b0f2a3fa85ab50..9711bc7e00a3bdc75b1963434b7bb150e36c7095 100644 (file)
--- a/devscripts_install-layout.patch
+++ b/devscripts_install-layout.patch
@@ -1,13 +1,13 @@
-# Removes the debian-only --install-layout python-setuptools option
-diff -rupN devscripts-2.13.3/scripts/Makefile devscripts-2.13.3-new/scripts/Makefile
---- devscripts-2.13.3/scripts/Makefile 2013-08-16 02:01:22.000000000 +0200
-+++ devscripts-2.13.3-new/scripts/Makefile     2013-09-19 18:05:52.040168029 +0200
-@@ -92,7 +92,7 @@ test:
+Removes the debian-only --install-layout python-setuptools option
+
+--- devscripts-2.15.7/scripts/Makefile~        2015-08-03 09:38:41.000000000 +0300
++++ devscripts-2.15.7/scripts/Makefile 2015-08-03 09:39:15.202484554 +0300
+@@ -86,7 +86,7 @@
        $(foreach python,$(shell py3versions -r ../debian/control),$(python) setup.py test$(\n))
  
  install: all
 -      python3 setup.py install --root="$(DESTDIR)" --no-compile --install-layout=deb
 +      python3 setup.py install --root="$(DESTDIR)" --no-compile
-       install -dD $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR)
        cp $(SCRIPTS) $(DESTDIR)$(BINDIR)
        ln -sf edit-patch $(DESTDIR)$(BINDIR)/add-patch
+       install -d $(DESTDIR)$(COMPL_DIR)

diff --git a/devscripts_install-man.patch b/devscripts_install-man.patch
index 914f79034f0494a6fa4ba1f9a383668cf2e3a29d..90c6f2e878dd6940fab7f54e79d5aba182c6eb47 100644 (file)
--- a/devscripts_install-man.patch
+++ b/devscripts_install-man.patch
@@ -1,15 +1,7 @@
-# Install some additional man pages
-diff -rupN devscripts-2.13.4/scripts/Makefile devscripts-2.13.4-new/scripts/Makefile
+Install some additional man pages
+
 --- devscripts-2.13.4/scripts/Makefile 2013-09-20 00:55:41.000000000 +0200
 +++ devscripts-2.13.4-new/scripts/Makefile     2013-10-17 17:21:02.612017885 +0200
-@@ -27,6 +27,7 @@ GEN_MAN1S += devscripts.1
- BINDIR = /usr/bin
- LIBDIR = /usr/lib/devscripts
- BIN_LIBDIR = /usr/lib/devscripts
-+MAN1DIR = /usr/share/man/man1
- 
- all: $(SCRIPTS) $(GEN_MAN1S) $(LIBS) $(CWRAPPERS) $(COMPLETION)
- 
 @@ -103,5 +104,7 @@ install: all
        install -dD $(DESTDIR)$(PERLMOD_DIR)
        mv $(DESTDIR)$(BINDIR)/debpkg $(DESTDIR)$(PERLMOD_DIR)