[Pkg-mozext-commits] [SCM] icedove-dispmua Debian packaging branch, master, updated. debian/1.6.3-1-9-g56b1c7b

[Christoph Goehre]

The following commit has been merged in the master branch:
commit 0ef4f79cc51ebc13d1c5c60f4480f57d2bc75edd
Author: Christoph Goehre <christoph.goehre at gmx.de>
Date:   Sat May 9 18:29:00 2009 +0200

    use cdbs to build the package

diff --git a/debian/control b/debian/control
index d66f3ca..cf2e9e8 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,14 @@ Source: icedove-dispmua
 Section: mail
 Priority: optional
 Maintainer: Christoph Goehre <christoph.goehre at gmx.de>
-Build-Depends: debhelper (>= 4.0.0), quilt
+Build-Depends: cdbs, debhelper (>= 4.0.0), quilt
 Build-Depends-Indep: zip
 DM-Upload-Allowed: yes
 Standards-Version: 3.8.0
 
 Package: icedove-dispmua
 Architecture: all
-Depends: icedove (>= 1.5.0.7), icedove (<= 2.0.0.99)
+Depends: icedove (>= 1.5.0.7), icedove (<= 2.0.0.99), ${misc:Depends}
 Description: display Mail User Agent extension for Icedove
  Adds an image on the right side of the "expanded header view" which displays
  the icon of the application with which the currently selected mail was
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index 6d10dce..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-changelog
diff --git a/debian/install b/debian/install
index 63d5b91..d363cf6 100644
--- a/debian/install
+++ b/debian/install
@@ -1,4 +1,4 @@
-build/chrome.jar  usr/lib/icedove/extensions/{F8147CF4-B9E3-445B-AA87-081ED66548F8}/chrome/
+chrome.jar       usr/lib/icedove/extensions/{F8147CF4-B9E3-445B-AA87-081ED66548F8}/chrome/
 chrome.manifest  usr/lib/icedove/extensions/{F8147CF4-B9E3-445B-AA87-081ED66548F8}/
 install.rdf      usr/lib/icedove/extensions/{F8147CF4-B9E3-445B-AA87-081ED66548F8}/
 defaults/        usr/lib/icedove/extensions/{F8147CF4-B9E3-445B-AA87-081ED66548F8}/
diff --git a/debian/rules b/debian/rules
index 034113f..9460208 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,73 +1,17 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 
-include /usr/share/quilt/quilt.make
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+DEB_INSTALL_CHANGELOGS_ALL = CHANGELOG
 
+build/icedove-dispmua:: debian/stamp-build
+debian/stamp-build:
+	cd chrome && zip -r ../chrome.jar .
+	touch $@
 
-objdir = $(CURDIR)/build
+cleanbuilddir/icedove-dispmua::
+	rm -f chrome.jar
 
-
-configure: configure-stamp
-configure-stamp: $(QUILT_STAMPFN)
-	dh_testdir
-	touch configure-stamp
-
-	# create build dir
-	mkdir $(objdir)
-
-build: build-stamp
-build-stamp: configure-stamp 
-	dh_testdir
-	touch build-stamp
-
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	# remove build tree
-	rm -rf $(objdir)
-	rm -f changelog
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	# hotfix to install changelog by dh_installdocs
-	cp CHANGELOG changelog
-	
-	# zip chrome to jar file
-	cd chrome && zip -r $(objdir)/chrome.jar .
-
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_installexamples
-	dh_install
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-# Build architecture-dependent files here.
-binary-arch: build install
-# We have nothing to do by default.
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure patch
+clean::
+	rm -f debian/stamp-build

-- 
icedove-dispmua Debian packaging