[Pkg-xfce-commits] r107 - goodies/xfmedia/debian

Yves-Alexis Perez corsac-guest@costa.debian.org
Sun, 15 May 2005 15:00:35 +0000


Author: corsac-guest
Date: 2005-05-15 15:00:35 +0000 (Sun, 15 May 2005)
New Revision: 107

Modified:
   goodies/xfmedia/debian/control
   goodies/xfmedia/debian/rules
   goodies/xfmedia/debian/xfmedia-dev.install
   goodies/xfmedia/debian/xfmedia.install
Log:
+Switched to cdbs for building and patching xfmedia


Modified: goodies/xfmedia/debian/control
===================================================================
--- goodies/xfmedia/debian/control	2005-05-15 13:25:16 UTC (rev 106)
+++ goodies/xfmedia/debian/control	2005-05-15 15:00:35 UTC (rev 107)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel@lists.alioth.debian.org>
 Uploaders: Emanuele Rocca <ema@debian.org>, Simon Huggins <huggie@earth.li>, Rudy Godoy <rudy@kernel-panik.org>, Martin Loschwitz <madkiss@debian.org>, Yves-Alexis Perez <corsac@corsac.net>
-Build-Depends: debhelper (>= 4.0.0), libxfcegui4-dev (>= 4.2.1-1), libxine-dev, libexo0.3-dev (>= 0.3.0-1), dbus-1-dev (>= 0.23), libxml-perl, libstartup-notification0-dev
+Build-Depends: debhelper (>= 4.0.0), libxfcegui4-dev (>= 4.2.1-1), libxine-dev, libexo0.3-dev (>= 0.3.0-1), dbus-1-dev (>= 0.23), libxml-perl, libstartup-notification0-dev,cdbs
 Standards-Version: 3.6.1
 
 Package: xfmedia

Modified: goodies/xfmedia/debian/rules
===================================================================
--- goodies/xfmedia/debian/rules	2005-05-15 13:25:16 UTC (rev 106)
+++ goodies/xfmedia/debian/rules	2005-05-15 15:00:35 UTC (rev 107)
@@ -1,93 +1,11 @@
 #!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/class/autotools.mk
 
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-final 
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-config.status: configure
-	dh_testdir
-	# Add here commands to configure the package.
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --enable-final
-
-
-build: build-stamp
-
-build-stamp:  config.status
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-	#docbook-to-man debian/xfmedia.sgml > xfmedia.1
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-
-	# Add here commands to clean up after the build process.
-	-$(MAKE) clean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	# Add here commands to install the package into debian/xfmedia.
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-	
+install/xfmedia::
 	rm -f $(CURDIR)/debian/tmp/usr/lib/xfmedia/*.a
 	rm -f $(CURDIR)/debian/tmp/usr/lib/xfmedia/*.la	
 
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs NEWS README README.remote TODO
-	dh_installexamples
-	dh_install --list-missing --sourcedir=debian/tmp
-	dh_installmenu
-	dh_installman debian/xfmedia.1
-	dh_desktop
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 

Modified: goodies/xfmedia/debian/xfmedia-dev.install
===================================================================
--- goodies/xfmedia/debian/xfmedia-dev.install	2005-05-15 13:25:16 UTC (rev 106)
+++ goodies/xfmedia/debian/xfmedia-dev.install	2005-05-15 15:00:35 UTC (rev 107)
@@ -1,2 +1,2 @@
-usr/include/
-usr/lib/pkgconfig/
+debian/tmp/usr/include/
+debian/tmp/usr/lib/pkgconfig/

Modified: goodies/xfmedia/debian/xfmedia.install
===================================================================
--- goodies/xfmedia/debian/xfmedia.install	2005-05-15 13:25:16 UTC (rev 106)
+++ goodies/xfmedia/debian/xfmedia.install	2005-05-15 15:00:35 UTC (rev 107)
@@ -1,4 +1,4 @@
-etc/xdg/
-usr/bin/
-usr/lib/xfmedia/
-usr/share/
+debian/tmp/etc/xdg/
+debian/tmp/usr/bin/
+debian/tmp/usr/lib/xfmedia/
+debian/tmp/usr/share/