smani pushed to devscripts (f21). "Update to 2.15.4"

[notifications at fedoraproject.org]

>From 5d392e9a87ae26dd2fb26e88d163cd6460325e15 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro at gmail.com>
Date: Tue, 28 Apr 2015 10:55:09 +0200
Subject: Update to 2.15.4


diff --git a/.gitignore b/.gitignore
index 85be313..8cc2267 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
 /devscripts_2.15.1.tar.xz
 /devscripts_2.15.2.tar.xz
 /devscripts_2.15.3.tar.xz
+/devscripts_2.15.4.tar.xz
diff --git a/devscripts.spec b/devscripts.spec
index 332318e..f3e7295 100644
--- a/devscripts.spec
+++ b/devscripts.spec
@@ -1,5 +1,5 @@
 Name:           devscripts
-Version:        2.15.3
+Version:        2.15.4
 Release:        1%{?dist}
 Summary:        Scripts for Debian Package maintainers
 
@@ -61,12 +61,12 @@ sed -i 's|/usr/lib/devscripts/libvfork.so.0|%{_libdir}/%{name}/libvfork.so.0|g'
 
 
 %build
-# LIBDIR determines where libvfork gets installed, see scripts/Makefile for LIBDIR
-make %{?_smp_mflags} LIBDIR=%{_libdir}/%{name} CFLAGS="%{optflags}" LDFLAGS="%{__global_ldflags}"
+# PKGLIBDIR determines where libvfork gets installed, see Makefile.common for PKGLIBDIR
+make %{?_smp_mflags} PKGLIBDIR=%{_libdir}/%{name} CFLAGS="%{optflags}" LDFLAGS="%{__global_ldflags}"
 
 
 %install
-%make_install LIBDIR=%{_libdir}/%{name}
+%make_install PKGLIBDIR=%{_libdir}/%{name}
 
 # Install docs through %%doc
 rm -rf %{buildroot}%{_datadir}/doc
@@ -103,6 +103,9 @@ rm -f %{buildroot}%{_bindir}/whodepends
 
 
 %changelog
+* Tue Apr 28 2015 Sandro Mani <manisandro at gmail.com> - 2.15.4-1
+- Update to 2.15.4
+
 * Mon Apr 13 2015 Sandro Mani <manisandro at gmail.com> - 2.15.3-1
 - Update to 2.15.3
 
diff --git a/devscripts_docbook.patch b/devscripts_docbook.patch
index 61eb537..1583ed0 100644
--- a/devscripts_docbook.patch
+++ b/devscripts_docbook.patch
@@ -1,6 +1,6 @@
-diff -rupN devscripts-2.14.6/po4a/Makefile devscripts-2.14.6-new/po4a/Makefile
---- devscripts-2.14.6/po4a/Makefile	2014-08-05 04:34:56.000000000 +0200
-+++ devscripts-2.14.6-new/po4a/Makefile	2014-08-06 22:19:42.963624425 +0200
+diff -rupN devscripts-2.15.4/po4a/Makefile devscripts-2.15.4-new/po4a/Makefile
+--- devscripts-2.15.4/po4a/Makefile	2015-04-26 04:01:25.000000000 +0200
++++ devscripts-2.15.4-new/po4a/Makefile	2015-04-28 09:35:59.751559003 +0200
 @@ -28,7 +28,7 @@ de/%.de.1: de/%.de.pod translate
  	pod2man --utf8 --center=" " --release="Debian-Hilfswerkzeuge" $< > $@
  de/%.de.1: de/%.de.dbk translate
@@ -19,10 +19,10 @@ diff -rupN devscripts-2.14.6/po4a/Makefile devscripts-2.14.6-new/po4a/Makefile
  # 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 $@
-diff -rupN devscripts-2.14.6/scripts/Makefile devscripts-2.14.6-new/scripts/Makefile
---- devscripts-2.14.6/scripts/Makefile	2014-08-05 04:34:56.000000000 +0200
-+++ devscripts-2.14.6-new/scripts/Makefile	2014-08-06 22:19:42.963624425 +0200
-@@ -64,7 +64,7 @@ endif
+diff -rupN devscripts-2.15.4/scripts/Makefile devscripts-2.15.4-new/scripts/Makefile
+--- devscripts-2.15.4/scripts/Makefile	2015-04-26 04:01:25.000000000 +0200
++++ devscripts-2.15.4-new/scripts/Makefile	2015-04-28 09:35:59.751559003 +0200
+@@ -60,7 +60,7 @@ endif
  	pod2man --utf8 --center=" " --release="Debian Utilities" $< > $@
  %.1: %.dbk
  	xsltproc --nonet -o $@ \
diff --git a/devscripts_install-layout.patch b/devscripts_install-layout.patch
index f92b025..f07380f 100644
--- a/devscripts_install-layout.patch
+++ b/devscripts_install-layout.patch
@@ -1,12 +1,12 @@
-diff -rupN devscripts-2.14.6/scripts/Makefile devscripts-2.14.6-new/scripts/Makefile
---- devscripts-2.14.6/scripts/Makefile	2014-08-05 04:34:56.000000000 +0200
-+++ devscripts-2.14.6-new/scripts/Makefile	2014-08-06 22:21:05.050620777 +0200
-@@ -95,7 +95,7 @@ test:
+diff -rupN devscripts-2.15.4/scripts/Makefile devscripts-2.15.4-new/scripts/Makefile
+--- devscripts-2.15.4/scripts/Makefile	2015-04-26 04:01:25.000000000 +0200
++++ devscripts-2.15.4-new/scripts/Makefile	2015-04-28 09:37:21.499016744 +0200
+@@ -91,7 +91,7 @@ test:
  	$(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)
+ 	install -dD $(DESTDIR)$(BINDIR) $(DESTDIR)$(PKGLIBDIR)
  	cp $(SCRIPTS) $(DESTDIR)$(BINDIR)
  	ln -sf edit-patch $(DESTDIR)$(BINDIR)/add-patch
diff --git a/devscripts_install-man.patch b/devscripts_install-man.patch
index f219f50..4dccf08 100644
--- a/devscripts_install-man.patch
+++ b/devscripts_install-man.patch
@@ -1,15 +1,7 @@
-diff -rupN devscripts-2.14.6/scripts/Makefile devscripts-2.14.6-new/scripts/Makefile
---- devscripts-2.14.6/scripts/Makefile	2014-08-05 04:34:56.000000000 +0200
-+++ devscripts-2.14.6-new/scripts/Makefile	2014-08-06 22:21:35.668619417 +0200
-@@ -27,6 +27,7 @@ GEN_MAN1S += devscripts.1 mk-origtargz.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)
- 
-@@ -106,5 +107,7 @@ install: all
+diff -rupN devscripts-2.15.4/scripts/Makefile devscripts-2.15.4-new/scripts/Makefile
+--- devscripts-2.15.4/scripts/Makefile	2015-04-26 04:01:25.000000000 +0200
++++ devscripts-2.15.4-new/scripts/Makefile	2015-04-28 09:37:50.877540763 +0200
+@@ -102,5 +102,7 @@ install: all
  	install -dD $(DESTDIR)$(PERLMOD_DIR)
  	mv $(DESTDIR)$(BINDIR)/debpkg $(DESTDIR)$(PERLMOD_DIR)
  	cp debpkg-wrapper $(DESTDIR)$(BINDIR)/debpkg
diff --git a/sources b/sources
index 43d16dc..8c8b560 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7deaa977619ff81ff4203bc2c475ae02  devscripts_2.15.3.tar.xz
+940e520d057b68fa565f15f057e73d52  devscripts_2.15.4.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/devscripts.git/commit/?h=f21&id=5d392e9a87ae26dd2fb26e88d163cd6460325e15