[SCM] idjc packaging branch, master, updated. upstream/0.8.2-19-g9dfdc63

[quadrispro-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1f2a9e12221e9656a4e64ed243cc040c18c6b80c
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Wed Apr 28 15:21:11 2010 +0200

    Switch to debhelper 7 + quilt, drop CDBS

diff --git a/debian/control b/debian/control
index f9e4422..2151806 100644
--- a/debian/control
+++ b/debian/control
@@ -6,10 +6,9 @@ Uploaders: Free Ekanayaka <freee at debian.org>,
  Reinhard Tartler <siretart at tauware.de>,
  Alessio Treglia <quadrispro at ubuntu.com>
 XS-Python-Version: >= 2.6
-Build-Depends: debhelper (>= 5.0.38),
+Build-Depends: debhelper (>= 7.0.50~),
  autotools-dev,
- quilt,
- cdbs (>= 0.4.49),
+ quilt (0.46-7~),
  python2.6-dev (>= 2.3.5-11),
  python-central (>= 0.5.6),
  libjack-dev,
diff --git a/debian/rules b/debian/rules
index 998301a..052bfd3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,38 +1,41 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+%:
+	dh --with quilt $@
 
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-rpath --disable-static --libexecdir=/usr/bin
+override_dh_auto_configure:
+	ln -s -f /usr/share/misc/config.guess
+	ln -s -f /usr/share/misc/config.sub
+	dh_auto_configure -- --disable-rpath --disable-static --libexecdir=/usr/bin
 
+override_dh_auto_build:
 ifneq (,$(findstring doopt,$(DEB_BUILD_OPTIONS)))
 # do optimization for the different architectures
-  ifneq (,$(findstring i386,$(DEB_BUILD_ARCH)))
-    OPTI_FLAGS := -D_REENTRANT -O3 -fomit-frame-pointer -ffast-math -fstrength-reduce -funroll-loops -mmmx -msse -mfpmath=sse -march=pentium4
-    CXXFLAGS += $(OPTI_FLAGS)
-    CFLAGS += $(OPTI_FLAGS)
-  endif
+ifneq (,$(findstring i386,$(DEB_BUILD_ARCH)))
+	OPTI_FLAGS := -D_REENTRANT -O3 -fomit-frame-pointer -ffast-math -fstrength-reduce -funroll-loops -mmmx -msse -mfpmath=sse -march=pentium4
+	CXXFLAGS += $(OPTI_FLAGS)
+	CFLAGS += $(OPTI_FLAGS)
 endif
+endif
+	dh_auto_build
 
-cleanbuilddir/idjc::
+override_dh_auto_clean:
 	rm -f AUTHORS.gz  ChangeLog.gz  NEWS.gz  README.gz
 	rm -f idjcctrl idjcskype idjc
 	rm -f artwork/idjc.png
 	rm -fr libshout
+	dh_auto_clean
 #	rm -fv idjcpython/idjc_config.py
 
-install/idjc::
+override_dh_auto_install:
+	dh_auto_install
 	dh_installdirs -pidjc usr/share/doc/idjc/html
-	cp -a $(DEB_SRCDIR)/doc/* $(DEB_DESTDIR)/usr/share/doc/idjc/html/
+	cp -a doc/* debian/idjc/usr/share/doc/idjc/html/
 	# Delete auto-installed docs in wrong dir (rather than patching Makefiles)
-	rm -rf $(DEB_DESTDIR)/usr/share/doc/idjc-*
+	rm -rf debian/idjc/usr/share/doc/idjc-*
 	# Fix permission problem
 	-chmod u+x $(DEB_DESTDIR)/usr/lib/python*/*-packages/idjc/IDJCmultitagger.py
 	# remove pyc files
-	find $(DEB_DESTDIR) -name \*.pyc -exec rm -v {} +
-	find $(DEB_DESTDIR) -type d -empty -delete
-
-binary-install/idjc::
+	find debian/idjc/ -name \*.pyc -exec rm -v {} +
+	find debian/idjc -type d -empty -delete
 	dh_pycentral -pidjc

-- 
idjc packaging