Update the debian/ build files

5 files changed, 52 insertions, 17 deletions

diff --git a/debian/changelog b/debian/changelog
index 837e4b2..eb312ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ unionfs-fuse (0.25~hg.20100602-1) karmic; urgency=low
 
  -- Bernd Schubert <bernd.schubert@fastmail.fm>  Wed, 02 Jun 2010 00:25:51 +0200
 
+
 unionfs-fuse (0.25~hg.20100315-1) unstable; urgency=low
 
   * new hg version
@@ -20,8 +21,8 @@ unionfs-fuse (0.25~hg.20100315-1) unstable; urgency=low
 
 unionfs-fuse (0.24-1) unstable; urgency=low
 
-  * New upstream release
-  * Add utimens.patch
+  * New upstream release 
+  * Add utimens.patch 
   * Also close 509516, although the solution is not perfect yet
     (closes: #509516)
   * Switch to dpkg-source 3.0 (quilt) format
@@ -38,8 +39,8 @@ unionfs-fuse (0.23.hg.20100315-1) unstable; urgency=low
 unionfs-fuse (0.23.hg.20090831-1) unstable; urgency=low
 
   * another pull from my branch
-  * fix relative pathes (closes: #541614)
-  * inlcude patch from Goswin (closes: #533403)
+  * fix relative pathes (closes: 541614)
+  * inlcude patch from Goswin (closes: 533403)
 
  -- Bernd Schubert <bernd.schubert@fastmail.fm>  Mon, 31 Aug 2009 00:29:46 +0200
 
diff --git a/debian/control b/debian/control
index 1d507e2..7b4aa04 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: unionfs-fuse
 Section: misc
 Priority: optional
 Maintainer: Bernd Schubert <bernd.schubert@fastmail.fm>
-Build-Depends: debhelper (>= 7.0.0), libfuse-dev, cmake
+Build-Depends: debhelper (>= 7.0.0), libfuse-dev, quilt (>= 0.40), cmake
 Standards-Version: 3.8.4
 
 Package: unionfs-fuse
diff --git a/debian/copyright b/debian/copyright
index 4fed5b8..85254bd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -28,8 +28,9 @@ License: other
 Files: cow_utils.[ch]
 Copyright: Copyright 1991, 1993, 1994,  The Regents of the University of California.
 License: BSD-3
- On Debian systems, the complete text of the BSD license
- can be found in file "/usr/share/common-licenses/BSD
+ The complete text of this license can be found at the end of this file
+ in the paragraph "Original BSD 3-Clause License:"
+ 
 
 
 The detailed License Texts
@@ -70,3 +71,32 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+Original BSD 3-Clause License:
+------------------------------
+
+Copyright (c) The Regents of the University of California.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. Neither the name of the University nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
diff --git a/debian/patches/binary_name b/debian/patches/binary_name
index a8aa325..d030ef3 100644
--- a/debian/patches/binary_name
+++ b/debian/patches/binary_name
@@ -2,18 +2,18 @@
  src/CMakeLists.txt |    6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
-Index: unionfs-fuse-0.23-0.24hg20090601/src/CMakeLists.txt
+Index: unionfs.0.25/src/CMakeLists.txt
 ===================================================================
---- unionfs-fuse-0.23-0.24hg20090601.orig/src/CMakeLists.txt
-+++ unionfs-fuse-0.23-0.24hg20090601/src/CMakeLists.txt
-@@ -1,7 +1,7 @@
- set(HASHTABLE_SRCS hashtable.c hashtable_itr.c)
- set(UNIONFS_SRCS unionfs.c stats.c opts.c debug.c findbranch.c readdir.c general.c unlink.c cow.c cow_utils.c string.c rmdir.c)
+--- unionfs.0.25.orig/src/CMakeLists.txt
++++ unionfs.0.25/src/CMakeLists.txt
+@@ -2,7 +2,7 @@ set(HASHTABLE_SRCS hashtable.c hashtable
+ set(UNIONFS_SRCS unionfs.c stats.c opts.c debug.c findbranch.c readdir.c 
+     general.c unlink.c cow.c cow_utils.c string.c rmdir.c usyslog.c)
  
 -add_executable(unionfs ${UNIONFS_SRCS} ${HASHTABLE_SRCS})
--target_link_libraries(unionfs fuse pthread m rt)
+-target_link_libraries(unionfs fuse pthread rt)
 +add_executable(unionfs-fuse ${UNIONFS_SRCS} ${HASHTABLE_SRCS})
-+target_link_libraries(unionfs-fuse fuse pthread m rt)
++target_link_libraries(unionfs-fuse fuse pthread rt)
  
 -INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/unionfs DESTINATION bin)
 +INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/unionfs-fuse DESTINATION bin)
diff --git a/debian/rules b/debian/rules
index 0284d1f..5c3425c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,10 @@
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
+QUILT_STAMPFN := patch-stamp
+include /usr/share/quilt/quilt.make
+
+
 CFLAGS = -pipe -W -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -32,7 +36,7 @@ configure-stamp:
 
 build: build-stamp
 
-build-stamp: configure-stamp 
+build-stamp: $(QUILT_STAMPFN) configure-stamp 
 	dh_testdir
 
 	# Add here commands to compile the package.
@@ -43,7 +47,7 @@ build-stamp: configure-stamp
 clean: unpatch
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp
+	rm -f build-stamp configure-stamp $(QUILT_STAMPFN)
 
 	# Add here commands to clean up after the build process.
 	rm -fr debian/build