[SCM] rem/master: Cosmetic changes

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

The following commit has been merged in the master branch:
commit 656c8e0360bd6b824869a2fe8f82dca888339b0b
Author: Vasudev Kamath <kamathvasudev at gmail.com>
Date:   Fri Jan 15 23:36:25 2016 +0530

    Cosmetic changes

diff --git a/debian/rules b/debian/rules
index c8f6f97..ea5dca6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,13 @@
 #!/usr/bin/make -f
 
-EXTRA_CFLAGS := "$(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)"
-EXTRA_LFLAGS := "$(shell dpkg-buildflags --get LDFLAGS) -Wl,-soname,librem.so.0"
-
 major := $(shell perl -ne '/\bVER_MAJOR := (\d+)/ and print $$1' Makefile)
 lib = librem
 pkg-lib = $(lib)$(major)
 
+# TODO: Drop this when makefile.mk from CDBS can handle the package.
+EXTRA_CFLAGS := "$(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)"
+EXTRA_LFLAGS := "$(shell dpkg-buildflags --get LDFLAGS) -Wl,-soname,librem.so.0"
+
 DEB_PHONY_RULES += debina/control.in
 
 debian/control:: debian/control.in
@@ -31,13 +32,13 @@ DEB_UPSTREAM_TARBALL_MD5 = 888c3000aa002790cc7129fa72d39a58
 # Skip checking some images (in addition to the defaults)
 DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^(docs/images/.*\.png|debian/(changelog|compat|copyright(|_hints|_newhints)))$
 
-
 # Build depends
 CDBS_BUILD_DEPENDS +=, d-shlibs, libre-dev, libssl-dev, zlib1g-dev
 
 # LIBDIR for installation
 LIBDIR=/usr/lib/
 
+# TODO: Drop when makefiles.mk can handle the package
 common-build-arch common-build-indep:: build_rem_package
 build_rem_package:
 	make info all RELEASE=1 \

-- 
rem packaging