[Pkg-opt-media-team] [SCM] dvd+rw-tools packaging branch, master, updated. debian/7.1-6-11-g524f4d2

Rogério Brito rbrito at ime.usp.br
Tue Aug 24 13:50:42 UTC 2010


The following commit has been merged in the master branch:
commit 524f4d2b684f5b8b70b8754d41cccd857e71b921
Author: Rogério Brito <rbrito at ime.usp.br>
Date:   Tue Aug 24 10:48:34 2010 -0300

    Update to source format "3.0 (quilt)"
    
    As a step in that direction, remove README.source, remove explicit
    dependency on quilt from debian/control, remove explicit calls regarding
    quilt in debian/rules and create the debian/source/format file.

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index b0c6142..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,4 +0,0 @@
-The source package uses quilt for the modifications of the upstream source. 
-If you want to change something it is best to use the quilt approach as
-documented in 
-        /usr/share/doc/quilt/README.source
diff --git a/debian/control b/debian/control
index 71faeb0..596e4ff 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,7 @@ Uploaders: TANIGUCHI Takaki <takaki at debian.org>,
         Rogério Brito <rbrito at ime.usp.br>
 DM-Upload-Allowed: yes
 Build-Depends:
- debhelper (>= 7), libcam-dev [kfreebsd-i386 kfreebsd-amd64], m4, sharutils,
- quilt
+ debhelper (>= 7), libcam-dev [kfreebsd-i386 kfreebsd-amd64], m4, sharutils
 Standards-Version: 3.8.4
 Vcs-Browser: http://git.debian.org/?p=pkg-opt-media/dvd%2Brw-tools.git
 Vcs-Git: git://git.debian.org/pkg-opt-media/dvd+rw-tools.git
diff --git a/debian/rules b/debian/rules
index d8741a6..2bbc977 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,6 @@
 #!/usr/bin/make -f
 
-include /usr/share/quilt/quilt.make
-
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
@@ -13,7 +11,7 @@ clean: unpatch
 	dh_clean
 
 build: build-stamp
-build-stamp: patch
+build-stamp:
 	dh_testdir
 
 	CFLAGS="$(CFLAGS)" $(MAKE) WARN=-DI_KNOW_ALL_ABOUT_SUDO
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)

-- 
dvd+rw-tools packaging



More information about the Pkg-opt-media-team mailing list