[SCM] aeolus packaging branch, master, updated. debian/0.8.2-3-6-gafee7e3

quadrispro-guest at users.alioth.debian.org quadrispro-guest at users.alioth.debian.org
Tue Apr 13 16:35:44 UTC 2010


The following commit has been merged in the master branch:
commit afee7e372813a5550bb19d1b8a2be1bd6abc440b
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Tue Apr 13 18:35:39 2010 +0200

    Switch to debhelper 7 + quilt.

diff --git a/debian/control b/debian/control
index 73e7d67..312e527 100644
--- a/debian/control
+++ b/debian/control
@@ -5,14 +5,14 @@ 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: cdbs,
- debhelper (>= 5),
+Build-Depends: debhelper (>= 7.0.50~),
  libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libjack-dev,
  libclthreads-dev,
  libclxclient-dev (>= 3.3.1),
  libclalsadrv-dev,
- libreadline5-dev
+ libreadline5-dev,
+ quilt (>= 0.46-7~)
 Standards-Version: 3.8.4
 Vcs-Git: git://git.debian.org/pkg-multimedia/aeolus.git
 Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/aeolus.git;a=summary
diff --git a/debian/rules b/debian/rules
index 2f38585..298a905 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,15 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile.mk
+%:
+	dh --with quilt $@
 
-# Add here any variable or target overrides you need.
-DEB_MAKE_ENVVARS = CFLAGS="-Wall -I. -I/usr/X11R6/include -I/usr/include/freetype2 -fpic -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -O2"
-DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) make
-DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/aeolus/
-
-install/aeolus::
+override_dh_auto_configure:
+override_dh_auto_clean:
+	cd source && $(MAKE) clean
+override_dh_auto_build:
+	cd source && $(MAKE)
+override_dh_auto_install:
+	cd source && $(MAKE) install DESTDIR=$(CURDIR)/debian/aeolus/
 	mkdir -p $(CURDIR)/debian/aeolus/etc
 	mkdir -p $(CURDIR)/debian/aeolus/usr/share/applications
 	cp debian/aeolus.conf $(CURDIR)/debian/aeolus/etc

-- 
aeolus packaging



More information about the pkg-multimedia-commits mailing list