[med-svn] r17564 - trunk/packages/adun.app/trunk/debian

[Yavor Doganov]

Author: yavor-guest
Date: 2014-07-30 10:14:18 +0000 (Wed, 30 Jul 2014)
New Revision: 17564

Modified:
   trunk/packages/adun.app/trunk/debian/changelog
   trunk/packages/adun.app/trunk/debian/control
   trunk/packages/adun.app/trunk/debian/rules
Log:
rules: Simplify.  Require gnustep-make (>= 2.6.6-2) for GNUSTEP_* variables.


Modified: trunk/packages/adun.app/trunk/debian/changelog
===================================================================
--- trunk/packages/adun.app/trunk/debian/changelog	2014-07-30 10:06:38 UTC (rev 17563)
+++ trunk/packages/adun.app/trunk/debian/changelog	2014-07-30 10:14:18 UTC (rev 17564)
@@ -5,18 +5,11 @@
   * debian/patches/enable-scripting-extension.patch:
   * debian/patches/enable-sql-extension.patch: New.
   * debian/patches/series: Update.
-  * debian/rules: Include /usr/share/dpkg/buildflags.mk, enable hardening
-    build.
-    (override_dh_auto_build): Use CPPFLAGS/CFLAGS/OBJCFLAGS.
-    (mipsen-flags): Remove; binutils bug fixed long time ago.
-    (override_dh_clean): Merge into the auto_clean override.
-    (override_dh_install): Reshuffle to cope with the package split.
-    (override_dh_fixperms): Merge into the install override.
-    (override_dh_strip, override_dh_makeshlibs): New rules.
+  * debian/rules: Simplify.
   * debian/control (Section): Change to "science", more appropriate.
     (Standards-Version): Bump to 3.9.5 (no changes needed).
     (Build-Depends): Add libsteptalk-dev and libsqlclient-dev for the
-    scripting and SQL extensions.
+    scripting and SQL extensions.  Require gnustep-make (>= 2.6.6-2).
     (Depends): Add steptalk; temporary solution until it is fixed.
     (adun-core, adun.app-dbg): New packages (Closes: #671226).  Amend
     descriptions and package relationships accordingly.

Modified: trunk/packages/adun.app/trunk/debian/control
===================================================================
--- trunk/packages/adun.app/trunk/debian/control	2014-07-30 10:06:38 UTC (rev 17563)
+++ trunk/packages/adun.app/trunk/debian/control	2014-07-30 10:14:18 UTC (rev 17564)
@@ -5,7 +5,7 @@
 Section: science
 Priority: optional
 Build-Depends: debhelper (>= 9),
-               gnustep-make,
+               gnustep-make (>= 2.6.6-2),
                libgnustep-gui-dev,
 	       libsteptalk-dev,
 	       libsqlclient-dev,

Modified: trunk/packages/adun.app/trunk/debian/rules
===================================================================
--- trunk/packages/adun.app/trunk/debian/rules	2014-07-30 10:06:38 UTC (rev 17563)
+++ trunk/packages/adun.app/trunk/debian/rules	2014-07-30 10:14:18 UTC (rev 17564)
@@ -2,13 +2,10 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/dpkg/buildflags.mk
 include /usr/share/GNUstep/debian/config.mk
-
-export GNUSTEP_MAKEFILES := $(GS_MAKE_DIR)
-
 d_app := $(CURDIR)/debian/tmp
-LDFLAGS += -Wl,-z,defs -Wl,--as-needed -Wl,-rpath,/usr/lib/adun.app
+export DEB_LDFLAGS_MAINT_APPEND := -Wl,--no-undefined -Wl,--as-needed \
+				     -Wl,-rpath,/usr/lib/adun.app
 
 # Avoid building the bundled StepTalk framework.
 export external := no
@@ -33,40 +30,19 @@
 # even if no -j option is used.  GNUSTEP_MAKE_PARALLEL_BUILDING=no
 # prevents messing the MAKELEVEL again.
 	MAKELEVEL=0 $(MAKE) GNUSTEP_MAKE_PARALLEL_BUILDING=no $(optim) \
-	  messages=yes CPPFLAGS="$(CPPFLAGS)" ADDITIONAL_CFLAGS="$(CFLAGS)" \
-	  OBJCFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+	  messages=yes $(shell dpkg-buildflags --export=cmdline)
 	convert UL/Resources/icon.tiff -resize 32x32 adun.xpm
 
-override_dh_auto_clean:
-ifdef GS_MAKE_DIR
-# This conditional and the ignored config.mk include at the top is to
-# make life easier for the usual debian-med contributors who do not
-# have gnustep-make installed.  Otherwise, the package will fail to
-# build before pbuilder/etc. even manage to install the build-deps
-# because the clean rule is doomed to fail.
-	$(MAKE) distclean
-endif
+override_dh_clean:
 	dh_clean adun.xpm
 
 override_dh_auto_install:
 	$(MAKE) install messages=yes DESTDIR=$(d_app) \
 	  GNUSTEP_SYSTEM_LIBRARIES=/usr/lib/adun.app \
 	  GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
-
-ifeq ($(GS_USE_FHS),yes)
-# On (official) Debian systems, this conditional is always true --
-# arch-independent Resources are moved to /usr/share, and the
-# Resources dir in the app bundle is a symlink (this approach was
-# explicitly approved by the Debian Release Team back in 2005).
-# The GNUstep LiveCD is based on Debian and its maintainer (who as a
-# coincident :-) is also a member of the Debian GNUstep team) doesn't
-# like FHS very much.  Setting GS_USE_FHS=no allows to rebuild the
-# package(s) with more relaxed (and not Debian Policy-compliant)
-# layout.
 	mkdir -p $(d_app)/usr/share/GNUstep
 	mv $(d_app)$(GNUSTEP_SYSTEM_APPS)/UL.app/Resources \
 	   $(d_app)/usr/share/GNUstep/UL.app
-endif
 # Delete empty directories (fixes a lintian warning).
 	rm -r $(d_app)/usr/include/GNUstep/Framework \
 	      $(d_app)/usr/lib/GNUstep/Tools
@@ -74,7 +50,6 @@
 	rm $(d_app)/usr/share/GNUstep/UL.app/*.desktop
 	find $(d_app)/usr/share/GNUstep/UL.app -type f -exec chmod -x '{}' \;
 	chmod -x $(d_app)/usr/lib/GNUstep/Frameworks/ULFramework.framework/Versions/0/Resources/ForceFields/Enzymix/*.ffml
-	dh_install
 
 override_dh_strip:
 	dh_strip --dbg-package=adun.app-dbg
@@ -83,7 +58,6 @@
 	dh_gnustep
 	dh_link usr/share/GNUstep/UL.app \
 	  $(GNUSTEP_SYSTEM_APPS)/UL.app/Resources
-	dh_link
 
 # We install the libraries at /usr/lib/adun.app.
 override_dh_makeshlibs: