Author: yavor-guest
Date: 2014-06-02 21:46:34 +0000 (Mon, 02 Jun 2014)
New Revision: 17029
Added:
trunk/packages/adun.app/trunk/debian/adun-core.install
trunk/packages/adun.app/trunk/debian/adun-core.manpages
Modified:
trunk/packages/adun.app/trunk/debian/changelog
trunk/packages/adun.app/trunk/debian/control
trunk/packages/adun.app/trunk/debian/install
trunk/packages/adun.app/trunk/debian/manpages
trunk/packages/adun.app/trunk/debian/rules
Log:
Split into adun.app (UI) and adun-core. Add -dbg package.
Added: trunk/packages/adun.app/trunk/debian/adun-core.install
===================================================================
--- trunk/packages/adun.app/trunk/debian/adun-core.install
(rev 0)
+++ trunk/packages/adun.app/trunk/debian/adun-core.install 2014-06-02
21:46:34 UTC (rev 17029)
@@ -0,0 +1,4 @@
+/usr/bin/Adun*
+/usr/lib/GNUstep/Frameworks/*
+/usr/lib/adun.app/*
+/usr/include/*
Added: trunk/packages/adun.app/trunk/debian/adun-core.manpages
===================================================================
--- trunk/packages/adun.app/trunk/debian/adun-core.manpages
(rev 0)
+++ trunk/packages/adun.app/trunk/debian/adun-core.manpages 2014-06-02
21:46:34 UTC (rev 17029)
@@ -0,0 +1,2 @@
+debian/AdunCore.1
+debian/AdunServer.1
Modified: trunk/packages/adun.app/trunk/debian/changelog
===================================================================
--- trunk/packages/adun.app/trunk/debian/changelog 2014-06-02 12:28:42 UTC
(rev 17028)
+++ trunk/packages/adun.app/trunk/debian/changelog 2014-06-02 21:46:34 UTC
(rev 17029)
@@ -8,11 +8,20 @@
build.
(override_dh_auto_build): Use CPPFLAGS/CFLAGS/OBJCFLAGS.
(mipsen-flags): Remove; binutils bug fixed long time ago.
- (override_dh_makeshlibs): Add to placate lintian.
+ (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/control (Section): Change to "science", more appropriate.
(Standards-Version): Bump to 3.9.5 (no changes needed).
(Build-Depends): Add libsteptalk-dev for the scripting extension.
(Depends): Add steptalk; temporary solution until it is fixed.
+ (adun-core, adun.app-dbg): New packages (Closes: #671226). Amend
+ descriptions and package relationships accordingly.
+ * debian/install:
+ * debian/mangpages: Move items for adun-core to...
+ * debian/adun-core.install:
+ * debian/adun-core.manpages: ...new files.
-- Yavor Doganov <[email protected]> Fri, 30 May 2014 21:27:17 +0300
Modified: trunk/packages/adun.app/trunk/debian/control
===================================================================
--- trunk/packages/adun.app/trunk/debian/control 2014-06-02 12:28:42 UTC
(rev 17028)
+++ trunk/packages/adun.app/trunk/debian/control 2014-06-02 21:46:34 UTC
(rev 17029)
@@ -17,13 +17,45 @@
Package: adun.app
Architecture: any
-Depends: ${shlibs:Depends},
+Depends: adun-core (= ${binary:Version}),
+ ${shlibs:Depends},
steptalk,
${misc:Depends},
${gnustep:Depends}
Recommends: gnuplot
-Description: Molecular Simulator for GNUstep
+Description: Molecular Simulator for GNUstep (GUI)
Adun is a biomolecular simulator that also includes data management and
analysis capabilities. It was developed at the Computational Biophysics
and Biochemistry Laboratory, a part of the Research Unit on Biomedical
Informatics of the UPF.
+ .
+ This package contains UL, the Adun GUI frontend.
+
+Package: adun-core
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ ${gnustep:Depends}
+Breaks: adun.app (<< 0.81-7)
+Replaces: adun.app (<< 0.81-7)
+Description: Molecular Simulator
+ Adun is a biomolecular simulator that also includes data management and
+ analysis capabilities. It was developed at the Computational Biophysics
+ and Biochemistry Laboratory, a part of the Research Unit on Biomedical
+ Informatics of the UPF.
+ .
+ This package contains the AdunCore program and the Adun server. If
+ you want the graphical UI frontend, install the adun.app package.
+
+Package: adun.app-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: adun-core (= ${binary:Version}) | adun.app (= ${binary:Version}),
+ ${misc:Depends},
+ ${gnustep:Depends}
+Description: Molecular Simulator for GNUstep (debugging symbols)
+ Adun is a biomolecular simulator that also includes data management and
+ analysis capabilities.
+ .
+ This package contains the detached debugging symbols.
Modified: trunk/packages/adun.app/trunk/debian/install
===================================================================
--- trunk/packages/adun.app/trunk/debian/install 2014-06-02 12:28:42 UTC
(rev 17028)
+++ trunk/packages/adun.app/trunk/debian/install 2014-06-02 21:46:34 UTC
(rev 17029)
@@ -1,2 +1,6 @@
debian/*.desktop usr/share/applications
adun.xpm usr/share/pixmaps
+/usr/share/GNUstep/UL.app/*
+/usr/bin/UL
+/usr/lib/GNUstep/Applications/*
+/usr/lib/GNUstep/Bundles/*
Modified: trunk/packages/adun.app/trunk/debian/manpages
===================================================================
--- trunk/packages/adun.app/trunk/debian/manpages 2014-06-02 12:28:42 UTC
(rev 17028)
+++ trunk/packages/adun.app/trunk/debian/manpages 2014-06-02 21:46:34 UTC
(rev 17029)
@@ -1,3 +1 @@
debian/UL.1
-debian/AdunCore.1
-debian/AdunServer.1
Modified: trunk/packages/adun.app/trunk/debian/rules
===================================================================
--- trunk/packages/adun.app/trunk/debian/rules 2014-06-02 12:28:42 UTC (rev
17028)
+++ trunk/packages/adun.app/trunk/debian/rules 2014-06-02 21:46:34 UTC (rev
17029)
@@ -7,7 +7,7 @@
export GNUSTEP_MAKEFILES := $(GS_MAKE_DIR)
-d_app := $(CURDIR)/debian/adun.app
+d_app := $(CURDIR)/debian/tmp
LDFLAGS += -Wl,-z,defs -Wl,--as-needed -Wl,-rpath,/usr/lib/adun.app
# Avoid building the bundled StepTalk framework.
@@ -46,8 +46,6 @@
# because the clean rule is doomed to fail.
$(MAKE) distclean
endif
-
-override_dh_clean:
dh_clean adun.xpm
override_dh_auto_install:
@@ -55,24 +53,6 @@
GNUSTEP_SYSTEM_LIBRARIES=/usr/lib/adun.app \
GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
-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
-
-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
-
-# hack: no idea when and how to call dh_gnustep - just enforce it after
dh_links
-override_dh_link:
- dh_link
- 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
@@ -83,18 +63,32 @@
# 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
+ 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
+# Delete the invalid .desktop file and install ours.
+ 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
+
+override_dh_link:
+ dh_gnustep
dh_link usr/share/GNUstep/UL.app \
$(GNUSTEP_SYSTEM_APPS)/UL.app/Resources
-endif
+ dh_link
-# We install the libraries at /usr/lib/adun.app; dh_makeshlibs is
-# useless and just generates two lintian warnings.
-override_dh_makeshlibs: ;
+# We install the libraries at /usr/lib/adun.app.
+override_dh_makeshlibs:
+ dh_makeshlibs -n
get-orig-source:
mkdir -p ../tarballs
uscan --verbose --force-download --destdir=../tarballs
-
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
