[SCM] clalsadrv packaging branch, master, updated. debian/1.2.2-1-10-gc004173
quadrispro-guest at users.alioth.debian.org
quadrispro-guest at users.alioth.debian.org
Wed Mar 17 10:06:49 UTC 2010
The following commit has been merged in the master branch:
commit d21daa7cabd32269ce66d4609885f6bbc7d88dde
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date: Wed Mar 17 11:05:37 2010 +0100
Replace dpatch with quilt, convert all patches to the quilt format.
diff --git a/Makefile b/Makefile
index 82cd85b..80d6047 100644
--- a/Makefile
+++ b/Makefile
@@ -14,11 +14,12 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+DESTDIR =
# Modify as required.
#
-PREFIX = /usr
-SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
+PREFIX = $(DESTDIR)/usr
+#SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
LIBDIR = lib$(SUFFIX)
diff --git a/debian/control b/debian/control
index 7ae0e3f..7d8f51d 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,9 @@ Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alio
Uploaders: Free Ekanayaka <freee at debian.org>,
Alessio Treglia <quadrispro at ubuntu.com>
DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 4.0.0), libasound2-dev, dpatch
+Build-Depends: debhelper (>= 4.0.0),
+ libasound2-dev,
+ quilt
Standards-Version: 3.8.4
Vcs-Git: git://git.debian.org/pkg-multimedia/clalsadrv.git
Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/clalsadrv.git
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index f0be4dd..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-makefile
diff --git a/debian/patches/makefile.dpatch b/debian/patches/makefile.dpatch
deleted file mode 100644
index f37d35c..0000000
--- a/debian/patches/makefile.dpatch
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## makefile.dpatch by <@localhost.localdomain>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad clalsadrv-1.1.0+1~/Makefile clalsadrv-1.1.0+1/Makefile
---- a/Makefile 2007-03-16 10:57:43.000000000 +0000
-+++ b/Makefile 2007-05-24 09:57:30.000000000 +0000
-@@ -14,11 +14,12 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-+DESTDIR =
-
- # Modify as required.
- #
--PREFIX = /usr
--SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
-+PREFIX = $(DESTDIR)/usr
-+#SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
- LIBDIR = lib$(SUFFIX)
-
-
diff --git a/debian/rules b/debian/rules
index fc63c6a..ebc6ca6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,8 +6,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
-
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
--
clalsadrv packaging
More information about the pkg-multimedia-commits
mailing list