[Pkg-sugar-commit] [sugar-finance-activity] 02/03: Clean-up rules file.

[Martin Abente Lahaye]

This is an automated email from the git hooks/post-receive script.

tchx84-guest pushed a commit to branch master
in repository sugar-finance-activity.

commit 6a43a52642242435f8575c1cfe9db566fc8a9a1e
Author: Martin Abente Lahaye <tch at sugarlabs.org>
Date:   Wed Apr 29 16:12:00 2015 -0400

    Clean-up rules file.
    
    Move pkg and DEB_PYTHON_SUGAR_PACKAGES before CDBS includes,
    remove unused -DEB_COPYRIGHT_CHECK_IGNORE_REGEX declaration,
    simplify dependencies declarations statements and remove clean
    override.
---
 debian/rules | 33 +++++++++------------------------
 1 file changed, 9 insertions(+), 24 deletions(-)

diff --git a/debian/rules b/debian/rules
index 343432a..3a6f454 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,4 @@
 #!/usr/bin/make -f
-
 # -*- mode: makefile; coding: utf-8 -*-
 # Copyright 2008-2012, 2015 Jonas Smedegaard <dr at jones.dk>
 # Copyright 2015 Martin Abente Lahaye <tch at sugarlabs.org>
@@ -18,41 +17,27 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Suppress unneeded auto-resolved build-dependency on python-dev
-CDBS_BUILD_DEPENDS_class_python-sugar_python = python$(cdbs_python_nondefault_version)
-
-DEB_PYTHON_SUGAR_PACKAGES = $(DEB_SOURCE_PACKAGE)
+# These need to be declared before CDBS includes
+pkg = $(DEB_SOURCE_PACKAGE)
+DEB_PYTHON_SUGAR_PACKAGES = $(pkg)
 
 include /usr/share/cdbs/1/rules/upstream-tarball.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/python-sugar.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
-pkg = $(DEB_SOURCE_PACKAGE)
 DEB_SUGAR_PRIMARY_BRANCH = 0.104
-
 DEB_UPSTREAM_PACKAGE = Finance
 DEB_UPSTREAM_URL = http://download.sugarlabs.org/sources/honey/$(DEB_UPSTREAM_PACKAGE)
 DEB_UPSTREAM_TARBALL_EXTENSION = tar.bz2
 
+# Suppress unneeded auto-resolved build-dependency on python-dev
+CDBS_BUILD_DEPENDS_class_python-sugar_python = python
+
 # Override Sugar toolkit to use
 CDBS_BUILD_DEPENDS_class_python-sugar_sugar = python-sugar3, unzip
 
-# Suppress binary files to not upset dpkg
-DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^data/logo_.*\.png|debian/(changelog|copyright(|_hints|_newhints))$
-
 # Needed (always/often/seldom) at runtime
-python-deps = sugar3 gi dbus cairo
-gir-deps = glib-2.0 gtk-3.0 pango-1.0
-CDBS_DEPENDS_$(pkg) = python
-CDBS_DEPENDS_$(pkg) +=, $(patsubst %,$(comma) python-%,$(python-deps))
-CDBS_DEPENDS_$(pkg) +=, $(patsubst %,$(comma) gir1.2-%,$(gir-deps))
-CDBS_RECOMMENDS_$(pkg) = sugar-$(DEB_SUGAR_PRIMARY_BRANCH)-icon-theme | sugar-icon-theme | sugar-artwork
-
-# Ensure only one variant is installed at a time (Debian Policy 7.6.2)
-# (unneeded since Wheezy: can be dropped after Wheezy+1)
-CDBS_CONFLICTS_$(pkg) = $(DEB_SUGAR_SOURCE_PKGBASE)
-CDBS_REPLACES_$(pkg) = $(DEB_SUGAR_SOURCE_PKGBASE)
-
-clean::
-	rm -rf locale
+CDBS_DEPENDS_$(pkg) = python, python-sugar3, python-gi, python-dbus, python-cairo
+CDBS_DEPENDS_$(pkg) +=, gir1.2-glib-2.0, gir1.2-gtk-3.0, gir1.2-pango-1.0
+CDBS_RECOMMENDS_$(pkg) +=, sugar-$(DEB_SUGAR_PRIMARY_BRANCH)-icon-theme | sugar-icon-theme

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sugar/sugar-finance-activity.git