[Pkg-sssd-devel] sssd: Changes to 'master'

[Timo Aaltonen]

 debian/changelog                            |    7 +++++
 debian/patches/fix-prefix-substitution.diff |   38 ++++++++++++++++++++++++++++
 debian/patches/series                       |    1 
 3 files changed, 46 insertions(+)

New commits:
commit 1d522775744505af35f9e016b164721f15d0fd60
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Tue Jan 17 16:39:50 2017 +0200

    releasing package sssd version 1.14.2-2

diff --git a/debian/changelog b/debian/changelog
index 19888b8..5d9f33e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-sssd (1.14.2-2) UNRELEASED; urgency=medium
+sssd (1.14.2-2) unstable; urgency=medium
 
   * fix-prefix-substitution.diff: Fix IFP service file path substitution.
     (LP: #1652629)
 
- -- Timo Aaltonen <tjaalton at debian.org>  Tue, 17 Jan 2017 16:04:28 +0200
+ -- Timo Aaltonen <tjaalton at debian.org>  Tue, 17 Jan 2017 16:39:14 +0200
 
 sssd (1.14.2-1) unstable; urgency=medium
 

commit 60992ac7bca377717c9280965d1e99396fb61346
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Tue Jan 17 16:03:46 2017 +0200

    fix-prefix-substitution.diff: Fix IFP service file path substitution. (LP: #1652629)

diff --git a/debian/changelog b/debian/changelog
index 35231ae..19888b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sssd (1.14.2-2) UNRELEASED; urgency=medium
+
+  * fix-prefix-substitution.diff: Fix IFP service file path substitution.
+    (LP: #1652629)
+
+ -- Timo Aaltonen <tjaalton at debian.org>  Tue, 17 Jan 2017 16:04:28 +0200
+
 sssd (1.14.2-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/fix-prefix-substitution.diff b/debian/patches/fix-prefix-substitution.diff
new file mode 100644
index 0000000..6f13e75
--- /dev/null
+++ b/debian/patches/fix-prefix-substitution.diff
@@ -0,0 +1,38 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -3948,12 +3948,17 @@ replace_script = \
+     mv $@.tmp $@
+ 
+ EXTRA_DIST += \
++    src/responder/ifp/org.freedesktop.sssd.infopipe.service.in \
+     src/sysv/systemd/sssd.service.in \
+     src/sysv/systemd/journal.conf.in \
+     src/sysv/systemd/sssd-secrets.socket.in \
+     src/sysv/systemd/sssd-secrets.service.in \
+     $(NULL)
+ 
++src/responder/ifp/org.freedesktop.sssd.infopipe.service: src/responder/ifp/org.freedesktop.sssd.infopipe.service.in Makefile
++	@$(MKDIR_P) src/responder/ifp/
++	$(replace_script)
++
+ src/sysv/systemd/sssd.service: src/sysv/systemd/sssd.service.in Makefile
+ 	@$(MKDIR_P) src/sysv/systemd/
+ 	$(replace_script)
+@@ -4184,6 +4189,7 @@ endif
+ 		rm -Rf $$doc; \
+ 	done;
+ 	rm -Rf ldb_mod_test_dir
++	rm -f $(builddir)/src/responder/ifp/org.freedesktop.sssd.infopipe.service
+ 	rm -f $(builddir)/src/sysv/systemd/sssd.service
+ 	rm -f $(builddir)/src/sysv/systemd/sssd-secrets.socket
+ 	rm -f $(builddir)/src/sysv/systemd/sssd-secrets.service
+--- a/configure.ac
++++ b/configure.ac
+@@ -464,7 +464,6 @@ AC_CONFIG_FILES([Makefile contrib/sssd.s
+                  src/lib/sifp/sss_simpleifp.pc
+                  src/lib/sifp/sss_simpleifp.doxy
+                  src/config/setup.py
+-                 src/responder/ifp/org.freedesktop.sssd.infopipe.service
+                  src/systemtap/sssd.stp
+                  src/config/SSSDConfig/__init__.py])
+ AC_OUTPUT
diff --git a/debian/patches/series b/debian/patches/series
index e16ff16..f7a2939 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+fix-prefix-substitution.diff
 import-daemon-opts.diff
 accept-krb5-1.15.diff