[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#857134: marked as done (unblock: snapper/0.4.1-3)

Your message dated Wed, 08 Mar 2017 17:32:28 +0000
with message-id <E1clfRs-0006DI-1Q@respighi.debian.org>
and subject line unblock snapper
has caused the Debian Bug report #857134,
regarding unblock: snapper/0.4.1-3
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
857134: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=857134
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Hi,

Please unblock package snapper, since it fixes missing dependency (#856945).
debdiff attached (it includes some noises with somehow modified a patch,
sorry).


unblock snapper/0.4.1-3


diff -Nru snapper-0.4.1/debian/changelog snapper-0.4.1/debian/changelog
--- snapper-0.4.1/debian/changelog	2016-12-22 20:14:18.000000000 +0900
+++ snapper-0.4.1/debian/changelog	2017-03-07 23:32:58.000000000 +0900
@@ -1,3 +1,19 @@
+snapper (0.4.1-3) unstable; urgency=medium
+
+  * debian/control
+    - add missing dependency for libsnapper-dev (Closes: #856945)
+      Thanks to Andreas Beckmann <anbe@debian.org> 
+
+ -- Hideki Yamane <henrich@debian.org>  Tue, 07 Mar 2017 23:32:58 +0900
+
+snapper (0.4.1-2) unstable; urgency=medium
+
+  * debian/patches
+    - add 0002-Bug-852574-Update-udevadm-path-to-bin-udevadm.patch
+      Thanks to Michael Biebl <biebl@debian.org> (Closes: #852574) 
+
+ -- Hideki Yamane <henrich@debian.org>  Sun, 19 Feb 2017 23:38:08 +0900
+
 snapper (0.4.1-1) unstable; urgency=medium
 
   * New upstream release 
diff -Nru snapper-0.4.1/debian/control snapper-0.4.1/debian/control
--- snapper-0.4.1/debian/control	2016-12-22 20:14:18.000000000 +0900
+++ snapper-0.4.1/debian/control	2017-03-07 23:32:58.000000000 +0900
@@ -62,7 +62,7 @@
 Package: libsnapper-dev
 Section: libdevel
 Architecture: linux-any
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, libsnapper4 (= ${binary:Version})
 Description: Library for Linux filesystem snapshot management tool (header files)
  Snapper is a tool for Linux filesystem snapshot management. Apart from the
  obvious creation and deletion of snapshots, it can compare snapshots and revert
diff -Nru snapper-0.4.1/debian/patches/0001-refresh-Add-DSO-linker-options-for-libsnapper.la.pat.patch snapper-0.4.1/debian/patches/0001-refresh-Add-DSO-linker-options-for-libsnapper.la.pat.patch
--- snapper-0.4.1/debian/patches/0001-refresh-Add-DSO-linker-options-for-libsnapper.la.pat.patch	2016-12-22 20:14:18.000000000 +0900
+++ snapper-0.4.1/debian/patches/0001-refresh-Add-DSO-linker-options-for-libsnapper.la.pat.patch	2017-03-07 23:32:58.000000000 +0900
@@ -3,10 +3,20 @@
 Subject: Add DSO linker options for libsnapper.la
 
 ---
+ client/Makefile.am           | 4 ++--
+ client/utils/Makefile.am     | 2 +-
+ examples/c++-lib/Makefile.am | 3 ++-
+ server/Makefile.am           | 3 ++-
+ testsuite-cmp/Makefile.am    | 2 +-
+ testsuite-real/Makefile.am   | 2 +-
+ testsuite/Makefile.am        | 2 +-
+ 7 files changed, 10 insertions(+), 8 deletions(-)
 
+diff --git a/client/Makefile.am b/client/Makefile.am
+index e8f9a5e..198c507 100644
 --- a/client/Makefile.am
 +++ b/client/Makefile.am
-@@ -19,7 +19,7 @@
+@@ -19,7 +19,7 @@ snapper_SOURCES =			\
  	misc.cc		misc.h		\
  	errors.cc	errors.h
  
@@ -15,7 +25,7 @@
  
  libexecdir = /usr/lib/snapper
  
-@@ -36,7 +36,7 @@
+@@ -36,7 +36,7 @@ systemd_helper_SOURCES =		\
  	misc.cc		misc.h		\
  	errors.cc	errors.h
  
@@ -24,15 +34,19 @@
  
  if ENABLE_BTRFS
  
+diff --git a/client/utils/Makefile.am b/client/utils/Makefile.am
+index 910beda..b6016fc 100644
 --- a/client/utils/Makefile.am
 +++ b/client/utils/Makefile.am
-@@ -14,5 +14,5 @@
+@@ -14,5 +14,5 @@ libutils_la_SOURCES =			\
  	GetOpts.cc	GetOpts.h	\
  	Range.cc	Range.h
  
 -libutils_la_LIBADD = ../../snapper/libsnapper.la
 +libutils_la_LIBADD = ../../snapper/libsnapper.la -lboost_thread -lboost_system -lxml2 -lacl -lz -lm
  
+diff --git a/examples/c++-lib/Makefile.am b/examples/c++-lib/Makefile.am
+index 52c81e5..2807f81 100644
 --- a/examples/c++-lib/Makefile.am
 +++ b/examples/c++-lib/Makefile.am
 @@ -5,7 +5,8 @@
@@ -45,15 +59,19 @@
  
  noinst_PROGRAMS = List ListAll Create CmpDirs CreateNumber CreateTimeline
  
+diff --git a/server/Makefile.am b/server/Makefile.am
+index 2a6a4c2..fe05e06 100644
 --- a/server/Makefile.am
 +++ b/server/Makefile.am
-@@ -14,4 +14,5 @@
+@@ -14,4 +14,5 @@ snapperd_SOURCES =					\
  	Types.cc		Types.h
  
  snapperd_LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lrt
 -snapperd_LDFLAGS = -lboost_system -lboost_thread
 +snapperd_LDFLAGS = -lboost_system -lboost_thread \
 +                   -lxml2 -lacl -lz -lm
+diff --git a/testsuite-cmp/Makefile.am b/testsuite-cmp/Makefile.am
+index 81104bf..aca7a79 100644
 --- a/testsuite-cmp/Makefile.am
 +++ b/testsuite-cmp/Makefile.am
 @@ -5,7 +5,7 @@
@@ -65,9 +83,11 @@
  
  noinst_SCRIPTS = run-all
  
+diff --git a/testsuite-real/Makefile.am b/testsuite-real/Makefile.am
+index 8148b54..0e51ae2 100644
 --- a/testsuite-real/Makefile.am
 +++ b/testsuite-real/Makefile.am
-@@ -6,7 +6,7 @@
+@@ -6,7 +6,7 @@ CXXFLAGS += -std=gnu++0x
  
  AM_CPPFLAGS = -I$(top_srcdir)
  
@@ -76,6 +96,8 @@
  
  if HAVE_XATTRS
  TMP_XATST = xattrs1 xattrs2 xattrs3 xattrs4
+diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
+index 8b3fbd6..7fffb29 100644
 --- a/testsuite/Makefile.am
 +++ b/testsuite/Makefile.am
 @@ -4,7 +4,7 @@
diff -Nru snapper-0.4.1/debian/patches/0002-Bug-852574-Update-udevadm-path-to-bin-udevadm.patch snapper-0.4.1/debian/patches/0002-Bug-852574-Update-udevadm-path-to-bin-udevadm.patch
--- snapper-0.4.1/debian/patches/0002-Bug-852574-Update-udevadm-path-to-bin-udevadm.patch	1970-01-01 09:00:00.000000000 +0900
+++ snapper-0.4.1/debian/patches/0002-Bug-852574-Update-udevadm-path-to-bin-udevadm.patch	2017-03-07 23:32:58.000000000 +0900
@@ -0,0 +1,21 @@
+From: Hideki Yamane <henrich@debian.org>
+Date: Sun, 19 Feb 2017 23:33:05 +0900
+Subject: Bug#852574 Update udevadm path to /bin/udevadm
+
+---
+ client/mksubvolume.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/client/mksubvolume.cc b/client/mksubvolume.cc
+index 0bab2ab..f584757 100644
+--- a/client/mksubvolume.cc
++++ b/client/mksubvolume.cc
+@@ -101,7 +101,7 @@ do_tmp_umount(const libmnt_fs* fs, const char* tmp_mountpoint)
+     if (verbose)
+ 	cout << "do-tmp-umount" << endl;
+ 
+-    system("/sbin/udevadm settle --timeout 20");
++    system("/bin/udevadm settle --timeout 20");
+ 
+     libmnt_fs* x = mnt_copy_fs(NULL, fs);
+     if (!x)
diff -Nru snapper-0.4.1/debian/patches/series snapper-0.4.1/debian/patches/series
--- snapper-0.4.1/debian/patches/series	2016-12-22 20:14:18.000000000 +0900
+++ snapper-0.4.1/debian/patches/series	2017-03-07 23:32:58.000000000 +0900
@@ -1 +1,2 @@
 0001-refresh-Add-DSO-linker-options-for-libsnapper.la.pat.patch
+0002-Bug-852574-Update-udevadm-path-to-bin-udevadm.patch

--- End Message ---
--- Begin Message --- 
Unblocked snapper.

--- End Message ---
Reply to: