[SCM] Packaging for Tile World branch, master, updated. debian/1.3.0-5-7-gceb0c4d

Peter Pentchev roam at ringlet.net
Fri Feb 11 10:38:04 UTC 2011


The following commit has been merged in the master branch:
commit 9c2c1859f9f252cbc97e77b2f9fcc224afd84db7
Author: Peter Pentchev <roam at ringlet.net>
Date:   Fri Feb 11 10:30:40 2011 +0200

    Convert to the 3.0 (quilt) source format.

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 3556bbc..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,2 +0,0 @@
-This package uses quilt for its patch management, see
-/usr/share/doc/quilt/README.source if you are unfamiliar with it.
diff --git a/debian/changelog b/debian/changelog
index b17be44..bc5e59f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ tworld (1.3.0-6) UNRELEASED; urgency=low
   * Add the 02-integer-types patch to fix the 32/64-bit problems.
     Closes: #427360
   * Add myself to the list of Uploaders.
+  * Convert to the 3.0 (quilt) source format.
 
  -- Peter Pentchev <roam at ringlet.net>  Thu, 10 Feb 2011 22:11:53 +0200
 
diff --git a/debian/control b/debian/control
index 7c18e70..1824e1f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Gerfried Fuchs <rhonda at debian.at>, Peter Pentchev <roam at ringlet.net>
-Build-Depends: libsdl1.2-dev, quilt
+Build-Depends: libsdl1.2-dev
 Standards-Version: 3.8.0
 Vcs-Git: git://git.debian.org/git/pkg-games/tworld.git
 Vcs-Browser: http://git.debian.org/?p=pkg-games/tworld.git
diff --git a/debian/rules b/debian/rules
index ba3769e..13ced57 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,10 +32,7 @@ ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
 	STRIP = true
 endif
 
-include /usr/share/quilt/quilt.make
-
-
-clean: unpatch
+clean:
 	$(checkdir)
 	$(checkroot)
 	[ ! -f Makefile ] || $(MAKE) clean
@@ -43,7 +40,7 @@ clean: unpatch
 		Makefile oshw-sdl/Makefile oshw install-stamp
 
 
-config.status: configure patch
+config.status: configure
 	$(checkdir)
 	CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure \
 		--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
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)

-- 
Packaging for Tile World



More information about the Pkg-games-commits mailing list