[SCM] lash packaging branch, master, updated. upstream/0.5.4-7-g2d35379

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 894af05791c21a9f7a168cce960062a84ce93af6
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Apr 17 23:59:26 2010 +0200

    use source format 3.0 (quilt), refresh patches, and stop including CDBS rule simple-patchsys.mk.

diff --git a/debian/patches/00_include-headers.patch b/debian/patches/00_include-headers.patch
index 8f0c38e..f27de5c 100644
--- a/debian/patches/00_include-headers.patch
+++ b/debian/patches/00_include-headers.patch
@@ -1,6 +1,5 @@
-diff -Nur lash-0.5.4/lash/Makefile.in lash-0.5.4.new/lash/Makefile.in
---- lash/Makefile.in	2007-11-14 23:00:10.000000000 +0100
-+++ lash/Makefile.in	2007-11-21 20:17:00.000000000 +0100
+--- a/lash/Makefile.in
++++ b/lash/Makefile.in
 @@ -209,19 +209,18 @@
  lashinclude_HEADERS = \
  	types.h \
diff --git a/debian/patches/01_install_docs.patch b/debian/patches/01_install_docs.patch
index ddefc68..52d01d6 100644
--- a/debian/patches/01_install_docs.patch
+++ b/debian/patches/01_install_docs.patch
@@ -1,6 +1,5 @@
-diff -Nur lash-0.5.4/docs/lash-manual-html-one-page/Makefile.in lash-0.5.4.new/docs/lash-manual-html-one-page/Makefile.in
---- lash-0.5.4/docs/lash-manual-html-one-page/Makefile.in	2007-11-14 23:00:10.000000000 +0100
-+++ lash-0.5.4.new/docs/lash-manual-html-one-page/Makefile.in	2007-11-21 23:23:19.000000000 +0100
+--- a/docs/lash-manual-html-one-page/Makefile.in
++++ b/docs/lash-manual-html-one-page/Makefile.in
 @@ -318,6 +318,9 @@
  info-am:
  
diff --git a/debian/patches/02_version_name.patch b/debian/patches/02_version_name.patch
index 89ab5e2..1a69dc2 100644
--- a/debian/patches/02_version_name.patch
+++ b/debian/patches/02_version_name.patch
@@ -1,6 +1,5 @@
-diff -Nur lash-0.5.4/liblash/Makefile.am lash-0.5.4.new/liblash/Makefile.am
---- lash-0.5.4/liblash/Makefile.am	2007-11-14 22:58:02.000000000 +0100
-+++ lash-0.5.4.new/liblash/Makefile.am	2007-11-21 20:12:23.000000000 +0100
+--- a/liblash/Makefile.am
++++ b/liblash/Makefile.am
 @@ -27,7 +27,7 @@
  	-lpthread
  
@@ -10,9 +9,8 @@ diff -Nur lash-0.5.4/liblash/Makefile.am lash-0.5.4.new/liblash/Makefile.am
  
  #
  # Library versions
-diff -Nur lash-0.5.4/liblash/Makefile.in lash-0.5.4.new/liblash/Makefile.in
---- lash-0.5.4/liblash/Makefile.in	2007-11-14 23:00:11.000000000 +0100
-+++ lash-0.5.4.new/liblash/Makefile.in	2007-11-21 20:12:20.000000000 +0100
+--- a/liblash/Makefile.in
++++ b/liblash/Makefile.in
 @@ -253,7 +253,7 @@
  	-lpthread
  
diff --git a/debian/patches/03_netdb.patch b/debian/patches/03_netdb.patch
index b427cae..5b02500 100644
--- a/debian/patches/03_netdb.patch
+++ b/debian/patches/03_netdb.patch
@@ -1,6 +1,5 @@
-diff -Nur -x '*.orig' -x '*~' lash-0.5.4/build-tree/lash-0.5.4/liblash/socket.c lash-0.5.4.new/build-tree/lash-0.5.4/liblash/socket.c
---- lash-0.5.4/liblash/socket.c	2006-09-16 15:25:31.000000000 -0400
-+++ lash-0.5.4/liblash/socket.c	2009-09-17 23:06:33.000000000 -0400
+--- a/liblash/socket.c
++++ b/liblash/socket.c
 @@ -19,6 +19,7 @@
   */
  
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2d3461e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+00_include-headers.patch
+01_install_docs.patch
+02_version_name.patch
+03_netdb.patch
diff --git a/debian/rules b/debian/rules
index b40e8fa..2c961e6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,6 @@
 LDFLAGS += -luuid
 
 include /usr/share/cdbs/1/rules/upstream-tarball.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
lash packaging