[PATCH 04/11] pick scripts by product name

[Guido Günther]

---
 debian/mozclient/icedove-3.0.mk |   23 +++++++++++++++++++++++
 debian/rules                    |    8 +++++++-
 2 files changed, 30 insertions(+), 1 deletions(-)
 create mode 100644 debian/mozclient/icedove-3.0.mk

diff --git a/debian/mozclient/icedove-3.0.mk b/debian/mozclient/icedove-3.0.mk
new file mode 100644
index 0000000..de49cdf
--- /dev/null
+++ b/debian/mozclient/icedove-3.0.mk
@@ -0,0 +1,23 @@
+# -*- mode: makefile; coding: utf-8 -*-
+
+# Copyright (c) 2009 Guido Guenther <agx at sigxcpu.org>
+# Description: Project Icedove 3.0
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+MOZCLIENT_PROJECTNAME := icedove-3.0
+include debian/mozclient/thunderbird-3.0.mk
+
+# FIXME: add branding targets here
diff --git a/debian/rules b/debian/rules
index 68c13af..c4665a8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,12 @@ DEBIAN_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: *\(.*\)$$/\1
 DEBIAN_UPSTREAM_VERSION := $(shell echo $(DEBIAN_VERSION) | sed 's/^\(.*\)-[^-]*$$/\1/')
 DEBIAN_REV_CODE := $(shell echo $(DEBIAN_VERSION) | sed 's/^.*-\([0-9]*\)[^-]*$$/0\1/ ; s/^.*\(..\)$$/\1/')
 
+ifeq ($(DEB_MOZ_NAME),icedove)
+  DEBIAN_DIST := org.debian
+else
+  DEBIAN_DIST := com.ubuntu
+endif
+
 ifeq ($(XUL_VERSION),1.9.1)
   TB_VERSION_FILE := version-191.txt
 else
@@ -111,7 +117,7 @@ DEB_CONFIGURE_USER_FLAGS= \
 	--disable-mochitest \
 	--disable-updater \
 	--enable-optimize \
-	--with-distribution-id=com.ubuntu \
+	--with-distribution-id=$(DEBIAN_DIST) \
 	$(NULL)
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-- 
1.6.2.1


--vtzGhvizbBRQ85DL
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="0005-add-branding.patch"