[DRE-commits] [SCM] tdiary.git branch, master, updated. debian/3.0.1-1-14-g063e683

[Taku YASUI]

The following commit has been merged in the master branch:
commit 21c3cef2da904ef4053441ce82dbdd6cbd84433b
Author: Taku YASUI <tach at debian.org>
Date:   Fri May 4 18:47:45 2012 +0900

    Use quilt instead of dpatch

diff --git a/debian/control b/debian/control
index 8c56c46..53ba77e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: web
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Daigo Moriwaki <daigo at debian.org>, Taku YASUI <tach at debian.org>
-Build-Depends: debhelper (>> 5), dpatch, docbook-to-man
+Build-Depends: debhelper (>> 5), quilt (>= 0.40), docbook-to-man
 Standards-Version: 3.9.1
 Homepage: http://www.tdiary.org/
 
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index fb8ed0a..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-10_core
diff --git a/debian/patches/10_core.dpatch b/debian/patches/10_core.dpatch
deleted file mode 100755
index 806e822..0000000
--- a/debian/patches/10_core.dpatch
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## core.dpatch by Daigo Moriwaki <daigo at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad 2.0.2+20060303~/dot.htaccess 2.0.2+20060303/dot.htaccess
---- 2.0.2+20060303~/dot.htaccess	2006-03-04 01:25:00.000000000 +0900
-+++ 2.0.2+20060303/dot.htaccess	2006-03-04 23:45:38.000000000 +0900
-@@ -1,6 +1,8 @@
- Options +ExecCGI
- 
- # if you run tDiary with symbolic link, use settings below.
-+# Confirm that /etc/apache/httpd.conf allows these options
-+# with AllowOverride.
- #Options +FollowSymLinks
- 
- # if making anchor style as 'YYYYMMDD.html', add some settings below.
-@@ -24,3 +26,9 @@
- 	Require user  foo
- </Files>
- 
-+<Files squeeze.rb>
-+	AuthName      tDiary
-+	AuthType      Basic
-+	AuthUserFile  /home/foo/.htpasswd
-+	Require user  foo
-+</Files>
-diff -urNad 2.0.2+20060303~/misc/plugin/squeeze.rb 2.0.2+20060303/misc/plugin/squeeze.rb
---- 2.0.2+20060303~/misc/plugin/squeeze.rb	2006-03-04 01:24:55.000000000 +0900
-+++ 2.0.2+20060303/misc/plugin/squeeze.rb	2006-03-04 23:33:59.000000000 +0900
-@@ -22,7 +22,8 @@
- 
- if mode == "CMD" || mode == "CGI"
- 	output_path = "./html/"
--	tdiary_path = "."
-+#	tdiary_path = "." 2003/11/16 Daigo Moriwaki
-+	tdiary_path = "/usr/share/tdiary"
- 	tdiary_conf = "."
- 	suffix = ''
- 	all_data = false
diff --git a/debian/patches/10_core.patch b/debian/patches/10_core.patch
new file mode 100644
index 0000000..a4bc51d
--- /dev/null
+++ b/debian/patches/10_core.patch
@@ -0,0 +1,35 @@
+Author: Daigo Moriwaki <daigo at debian.org>
+Description: No description.
+--- a/dot.htaccess
++++ b/dot.htaccess
+@@ -1,6 +1,8 @@
+ Options +ExecCGI
+ 
+ # if you run tDiary with symbolic link, use settings below.
++# Confirm that /etc/apache/httpd.conf allows these options
++# with AllowOverride.
+ #Options +FollowSymLinks
+ 
+ # if making anchor style as 'YYYYMMDD.html', add some settings below.
+@@ -25,3 +27,9 @@
+ 	Require user  foo
+ </Files>
+ 
++<Files squeeze.rb>
++	AuthName      tDiary
++	AuthType      Basic
++	AuthUserFile  /home/foo/.htpasswd
++	Require user  foo
++</Files>
+--- a/misc/plugin/squeeze.rb
++++ b/misc/plugin/squeeze.rb
+@@ -21,7 +21,8 @@
+ 
+ if mode == "CMD" || mode == "CGI"
+ 	output_path = "./html/"
+-	tdiary_path = "."
++#	tdiary_path = "." 2003/11/16 Daigo Moriwaki
++	tdiary_path = "/usr/share/tdiary"
+ 	tdiary_conf = "."
+ 	suffix = ''
+ 	all_data = false
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d5cf415
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+10_core.patch
diff --git a/debian/rules b/debian/rules
index 13eb6da..548f4cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,7 @@ TDIARY=$(BUILDROOT)/usr/share/tdiary
 DOC_TDIARY=$(BUILDROOT)/usr/share/doc/tdiary
 WWW=$(TDIARY)
 MANDEST=$(BUILDROOT)/usr/share/man/man1
+QUILT_STAMPFN=patch-stamp
 
 manpages = tdiary-setup.1 tdiary-convert2.1
 
@@ -23,6 +24,8 @@ build-stamp: patch $(manpages)
 
 
 clean: clean1 unpatch
+	rm -f debian/*.debhelper.log
+
 clean1:
 	@echo "--- Cleaning"
 	dh_testdir
@@ -123,14 +126,14 @@ binary-indep: build install
 
 # You can do more things with dpatch, like having patches only applied on
 # a special architecture - see the non-dh version of the sample for this!
-patch: patch-stamp
-patch-stamp:
-	dpatch apply-all
-	#dpatch call-all -a=pkg-info >patch-stamp
+patch: $(QUILT_STAMPFN)
+$(QUILT_STAMPFN):
+	dh_quilt_patch
+	touch $(QUILT_STAMPFN)
 
 unpatch:
-	dpatch deapply-all
-	rm -rf patch-stamp debian/patched
+	dh_quilt_unpatch
+	rm -rf $(QUILT_STAMPFN)
 
 # Build architecture-dependent files here.
 binary-arch: build install

-- 
tdiary.git