[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 6eb5a4711e8b1fc2c3d0042f522288dd82d657ee
Author: Taku YASUI <tach at debian.org>
Date:   Fri May 4 19:31:23 2012 +0900

    Update for 3.0 quilt

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index eeb7306..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,4 +0,0 @@
-Consult /usr/share/doc/dpatch/README.source.gz.
-
----
-2010-03-09 Daigo Moriwaki <daigo at debian dot org>
diff --git a/debian/changelog b/debian/changelog
index 6b8a3d2..69dea74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,10 @@
 tdiary (3.0.1-2) unstable; urgency=low
 
   * Change maintainer to Debian Ruby Extras Maintainers for collective
-    management
-    - Former maintainer Daigo Moriwaki is moved to uploaders
-  * Add Taku YASUI <tach at debian.org> to the uploaders
-  * Use quilt instead of dpatch
-  * Change source format to 3.0 (quilt)
+    management.
+    - Former maintainer Daigo Moriwaki is moved to uploaders.
+  * Add Taku YASUI <tach at debian.org> to the uploaders.
+  * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
   * Add debian/copyright file
 
  -- Taku YASUI <tach at debian.org>  Fri, 04 May 2012 19:18:55 +0900
diff --git a/debian/rules b/debian/rules
index 548f4cc..3ffcdb7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,14 +16,14 @@ $(manpages): %.1: debian/%.sgml
 	docbook-to-man $< > $@
  
 build: build-stamp
-build-stamp: patch $(manpages)
+build-stamp: $(manpages)
 	@echo "--- Compiling"
 	dh_testdir
 	# Do something to build your package here
 	# touch build-stamp
 
 
-clean: clean1 unpatch
+clean: clean1
 	rm -f debian/*.debhelper.log
 
 clean1:
@@ -121,23 +121,9 @@ binary-indep: build install
 	dh_md5sums -i
 	dh_builddeb -i
 
-
-# And now the simple things for dpatch. Here we only apply/unapply the patches.
-
-# 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: $(QUILT_STAMPFN)
-$(QUILT_STAMPFN):
-	dh_quilt_patch
-	touch $(QUILT_STAMPFN)
-
-unpatch:
-	dh_quilt_unpatch
-	rm -rf $(QUILT_STAMPFN)
-
 # Build architecture-dependent files here.
 binary-arch: build install
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch
+.PHONY: build clean binary-indep binary-arch binary install
 

-- 
tdiary.git