[med-svn] r4809 - in trunk/packages/adun.app/trunk/debian: . source

Thu May 20 14:08:17 UTC 2010

Author: yavor-guest
Date: 2010-05-20 14:08:06 +0000 (Thu, 20 May 2010)
New Revision: 4809

Added:
   trunk/packages/adun.app/trunk/debian/source/
   trunk/packages/adun.app/trunk/debian/source/format
Modified:
   trunk/packages/adun.app/trunk/debian/changelog
   trunk/packages/adun.app/trunk/debian/control
   trunk/packages/adun.app/trunk/debian/rules
Log:
* debian/rules: Export GNUSTEP_MAKEFILES and avoid gs_make.  All uses
  updated.  Add verbose comments about GNUstep-specific stuff for the
  benefit of other debian-med contributors.
  (OPTFLAG): Remove and simplify noopt handling to be compatible with
  gnustep-make/2.4.x (Closes: #581886).
* debian/control (Depends): Add ${misc:Depends}.
  (Standards-Version): Compliant with 3.8.4 (no changes needed).
* debian/source/format: New file.



Modified: trunk/packages/adun.app/trunk/debian/changelog
===================================================================

--- trunk/packages/adun.app/trunk/debian/changelog	2010-05-20 13:18:42 UTC (rev 4808)
+++ trunk/packages/adun.app/trunk/debian/changelog	2010-05-20 14:08:06 UTC (rev 4809)
@@ -1,9 +1,20 @@
 adun.app (0.81-3) UNRELEASED; urgency=low
 
+  [ Charles Plessy ]
   * Documented informations in ‘debian/upstream-metadata.yaml’.
 
- -- Charles Plessy <plessy at debian.org>  Sun, 03 Jan 2010 20:28:50 +0900
+  [ Yavor Doganov ]
+  * debian/rules: Export GNUSTEP_MAKEFILES and avoid gs_make.  All uses
+    updated.  Add verbose comments about GNUstep-specific stuff for the
+    benefit of other debian-med contributors.
+    (OPTFLAG): Remove and simplify noopt handling to be compatible with
+    gnustep-make/2.4.x (Closes: #581886).
+  * debian/control (Depends): Add ${misc:Depends}.
+    (Standards-Version): Compliant with 3.8.4 (no changes needed).
+  * debian/source/format: New file.
 
+ -- Yavor Doganov <yavor at gnu.org>  Thu, 20 May 2010 17:06:31 +0300
+
 adun.app (0.81-2) unstable; urgency=high
 
   * debian/rules (build-stamp): Pass GNUSTEP_MAKE_PARALLEL_BUILDING=no;

Modified: trunk/packages/adun.app/trunk/debian/control
===================================================================
--- trunk/packages/adun.app/trunk/debian/control	2010-05-20 13:18:42 UTC (rev 4808)
+++ trunk/packages/adun.app/trunk/debian/control	2010-05-20 14:08:06 UTC (rev 4809)
@@ -10,7 +10,7 @@
 	       libgnustep-gui-dev (>= 0.12.0),
 	       libgsl0-dev,
 	       imagemagick
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage: http://diana.imim.es/Adun
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/adun.app/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/adun.app/trunk/
@@ -18,6 +18,7 @@
 Package: adun.app
 Architecture: any
 Depends: ${shlibs:Depends},
+	 ${misc:Depends},
 	 ${gnustep:Depends}
 Recommends: gnuplot
 Description: Molecular Simulator for GNUstep

Modified: trunk/packages/adun.app/trunk/debian/rules
===================================================================
--- trunk/packages/adun.app/trunk/debian/rules	2010-05-20 13:18:42 UTC (rev 4808)
+++ trunk/packages/adun.app/trunk/debian/rules	2010-05-20 14:08:06 UTC (rev 4809)
@@ -5,6 +5,8 @@
 include /usr/share/dpatch/dpatch.make
 -include /usr/share/GNUstep/debian/config.mk
 
+export GNUSTEP_MAKEFILES := $(GS_MAKE_DIR)
+
 d_app := $(CURDIR)/debian/adun.app
 LDFLAGS := -Wl,-z,defs -Wl,--as-needed -Wl,-rpath,/usr/lib/adun.app
 
@@ -12,9 +14,7 @@
 export external := no
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-OPTFLAG := -O0
-else
-OPTFLAG := -O2
+optim := debug=yes
 endif
 
 build: patch build-stamp
@@ -33,8 +33,8 @@
 # even if no -j option is used.  GNUSTEP_MAKE_PARALLEL_BUILDING=no
 # prevents messing the MAKELEVEL again.
 	GNUSTEP_MAKEFILES=/usr/share/GNUstep/Makefiles MAKELEVEL=0 \
-	  $(MAKE) GNUSTEP_MAKE_PARALLEL_BUILDING=no OPTFLAG=$(OPTFLAG) \
-	  LDFLAGS="$(LDFLAGS)" messages=yes
+	  $(MAKE) GNUSTEP_MAKE_PARALLEL_BUILDING=no $(optim) messages=yes \
+	  LDFLAGS="$(LDFLAGS)"
 	convert UL/Resources/icon.tiff -resize 32x32 adun.xpm
 	touch $@
 
@@ -43,11 +43,15 @@
 clean-patched:
 	dh_testdir
 	dh_testroot
-	$(RM) build-stamp
 ifdef GS_MAKE_DIR
-	gs_make distclean
+# 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
-	dh_clean adun.xpm
+	dh_clean build-stamp adun.xpm
 
 install: build
 	dh_testdir
@@ -56,7 +60,7 @@
 # Install private libraries in /usr/lib/adun.app; fixes a Policy
 # `SHOULD' violation (10.2).
 	dh_installdirs usr/lib/adun.app
-	gs_make install messages=yes DESTDIR=$(d_app) \
+	$(MAKE) install messages=yes DESTDIR=$(d_app) \
 	  GNUSTEP_SYSTEM_LIBRARIES=/usr/lib/adun.app \
 	  GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
 
@@ -67,7 +71,7 @@
 	rm -r $(d_app)/usr/include/GNUstep/Framework \
 	      $(d_app)/usr/lib/GNUstep/Tools
 # Delete the invalid .desktop file and install ours.
-	rm $(CURDIR)/debian/*.app/usr/lib/GNUstep/Applications/*.app/Resources/*.desktop
+	rm $(d_app)/usr/lib/GNUstep/Applications/*.app/Resources/*.desktop
 	install -D -m 644 debian/*.desktop \
 	  $(d_app)/usr/share/applications/UL.desktop
 	dh_install adun.xpm usr/share/pixmaps/
@@ -87,6 +91,15 @@
 	dh_link
 	gsdh_gnustep
 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.
 	dh_installdirs usr/share/GNUstep
 	mv $(d_app)$(GNUSTEP_SYSTEM_APPS)/UL.app/Resources \
 	   $(d_app)/usr/share/GNUstep/UL.app

Added: trunk/packages/adun.app/trunk/debian/source/format
===================================================================
--- trunk/packages/adun.app/trunk/debian/source/format	                        (rev 0)
+++ trunk/packages/adun.app/trunk/debian/source/format	2010-05-20 14:08:06 UTC (rev 4809)
@@ -0,0 +1 @@
+1.0


