[med-svn] r15219 - trunk/packages/adun.app/trunk/debian
Andreas Tille
tille at moszumanska.debian.org
Wed Nov 20 22:07:52 UTC 2013
Author: tille
Date: 2013-11-20 22:07:52 +0000 (Wed, 20 Nov 2013)
New Revision: 15219
Modified:
trunk/packages/adun.app/trunk/debian/changelog
trunk/packages/adun.app/trunk/debian/compat
trunk/packages/adun.app/trunk/debian/control
trunk/packages/adun.app/trunk/debian/rules
Log:
Mass commit for 0.81-6
Modified: trunk/packages/adun.app/trunk/debian/changelog
===================================================================
--- trunk/packages/adun.app/trunk/debian/changelog 2013-11-20 22:07:24 UTC (rev 15218)
+++ trunk/packages/adun.app/trunk/debian/changelog 2013-11-20 22:07:52 UTC (rev 15219)
@@ -1,4 +1,4 @@
-adun.app (0.81-6) UNRELEASED; urgency=low
+adun.app (0.81-6) unstable; urgency=low
[ Charles Plessy ]
* Renamed debian/upstream-metadata.yaml to debian/upstream
@@ -7,11 +7,16 @@
* debian/source/format: 3.0 (quilt)
* debian/upstream: Small modifications to better match
definition of References
+ * debian/control:
+ - cme fix dpkg-control
+ * debian/rules:
+ - dh
+ - hardening
[ Thorsten Alteholz ]
* debian/rules: target get-orig-source added
- -- Andreas Tille <tille at debian.org> Tue, 28 Jun 2011 11:12:46 +0200
+ -- Andreas Tille <tille at debian.org> Fri, 15 Nov 2013 13:54:30 +0100
adun.app (0.81-5) unstable; urgency=low
Modified: trunk/packages/adun.app/trunk/debian/compat
===================================================================
--- trunk/packages/adun.app/trunk/debian/compat 2013-11-20 22:07:24 UTC (rev 15218)
+++ trunk/packages/adun.app/trunk/debian/compat 2013-11-20 22:07:52 UTC (rev 15219)
@@ -1 +1 @@
-8
+9
Modified: trunk/packages/adun.app/trunk/debian/control
===================================================================
--- trunk/packages/adun.app/trunk/debian/control 2013-11-20 22:07:24 UTC (rev 15218)
+++ trunk/packages/adun.app/trunk/debian/control 2013-11-20 22:07:52 UTC (rev 15219)
@@ -1,25 +1,24 @@
Source: adun.app
-Section: gnustep
-Priority: optional
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-DM-Upload-Allowed: yes
Uploaders: Andreas Tille <tille at debian.org>,
- Yavor Doganov <yavor at gnu.org>
-Build-Depends: debhelper (>= 8),
- quilt,
- libgnustep-gui-dev,
- libgsl0-dev,
- imagemagick
-Standards-Version: 3.9.2
+ Yavor Doganov <yavor at gnu.org>
+Section: gnustep
+Priority: optional
+Build-Depends: debhelper (>= 9),
+ gnustep-make,
+ libgnustep-gui-dev,
+ libgsl0-dev,
+ imagemagick
+Standards-Version: 3.9.4
+Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/adun.app/trunk/
+Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/adun.app/trunk/
Homepage: http://diana.imim.es/Adun
-Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/adun.app/trunk/
-Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/adun.app/trunk/
Package: adun.app
Architecture: any
Depends: ${shlibs:Depends},
- ${misc:Depends},
- ${gnustep:Depends}
+ ${misc:Depends},
+ ${gnustep:Depends}
Recommends: gnuplot
Description: Molecular Simulator for GNUstep
Adun is a biomolecular simulator that also includes data management and
Modified: trunk/packages/adun.app/trunk/debian/rules
===================================================================
--- trunk/packages/adun.app/trunk/debian/rules 2013-11-20 22:07:24 UTC (rev 15218)
+++ trunk/packages/adun.app/trunk/debian/rules 2013-11-20 22:07:52 UTC (rev 15219)
@@ -2,13 +2,12 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/quilt/quilt.make
--include /usr/share/GNUstep/debian/config.mk
+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
+LDFLAGS += -Wl,-z,defs -Wl,--as-needed -Wl,-rpath,/usr/lib/adun.app
# Avoid building the bundled StepTalk framework.
export external := no
@@ -22,10 +21,10 @@
mipsen-flags := ADDITIONAL_OBJCFLAGS=-g0 ADDITIONAL_CFLAGS=-g0
endif
-build: patch build-stamp
+%:
+ dh $@
-build-stamp:
- dh_testdir
+override_dh_auto_build:
# Upstream's makefiles have conditionals based on $(MAKELEVEL) so that
# building separate components and the whole package from toplevel
# works. They all evaluate to false when building the Debian package,
@@ -38,15 +37,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 LDFLAGS="$(LDFLAGS)" $(mipsen-flags)
+ messages=yes ADDITIONAL_CFLAGS="$(CFLAGS)" \
+ LDFLAGS="$(LDFLAGS)" \
+ $(mipsen-flags)
convert UL/Resources/icon.tiff -resize 32x32 adun.xpm
- touch $@
-clean: clean-patched unpatch
+## tried for hardening but does not help
+## if all four variables below are set the build even fails
+# ADDITIONAL_LDFLAGS="$(LDFLAGS)" \
+# ADDITIONAL_OBJC_LIBS="$(LDFLAGS)" \
+# ADDITIONAL_TOOL_LIBS="$(LDFLAGS)" \
+# ADDITIONAL_GUI_LIBS="$(LDFLAGS)" \
-clean-patched:
- dh_testdir
- dh_testroot
+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
@@ -55,45 +58,33 @@
# because the clean rule is doomed to fail.
$(MAKE) distclean
endif
- dh_clean build-stamp adun.xpm
-install: build
- dh_testdir
- dh_testroot
- dh_prep
-# Install private libraries in /usr/lib/adun.app; fixes a Policy
-# `SHOULD' violation (10.2).
- dh_installdirs usr/lib/adun.app
+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
- find $(d_app)/usr/lib/GNUstep/Applications/UL.app/Resources \
- -type f -exec chmod -x '{}' \;
- chmod -x $(d_app)/usr/lib/GNUstep/Frameworks/ULFramework.framework/Versions/0/Resources/ForceFields/Enzymix/*.ffml
+override_dh_install:
+ dh_install
# Delete empty directories (fixes a lintian warning).
rm -r $(d_app)/usr/include/GNUstep/Framework \
$(d_app)/usr/lib/GNUstep/Tools
# Delete the invalid .desktop file and install ours.
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/
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
+override_dh_fixperms:
+ dh_fixperms
+ find $(d_app)/usr/share/GNUstep/UL.app -type f -exec chmod -x '{}' \;
+ find $(d_app)/usr/lib/GNUstep/Applications/UL.app/Resources -type f -exec chmod -x '{}' \;
+ chmod -x $(d_app)/usr/lib/GNUstep/Frameworks/ULFramework.framework/Versions/0/Resources/ForceFields/Enzymix/*.ffml
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installmenu
- dh_installman
+# hack: no idea when and how to call dh_gnustep - just enforce it after dh_links
+override_dh_link:
dh_link
- gsdh_gnustep
+ dh_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
@@ -110,17 +101,13 @@
dh_link usr/share/GNUstep/UL.app \
$(GNUSTEP_SYSTEM_APPS)/UL.app/Resources
endif
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+# lintian claims that postinst + postrm have useless call to ldconfig
+# the following code would remove these files totally but than update-menus
+# would be left out ... leaving the lintian warning for somebody else
+#override_dh_installdeb:
+# dh_installdeb
+# find debian \( -name postinst -o -name postrm \) -delete
get-orig-source:
mkdir -p ../tarballs
More information about the debian-med-commit
mailing list