[med-svn] r3235 - trunk/packages/sequenceconverter.app/trunk/debian
yavor-guest at alioth.debian.org
yavor-guest at alioth.debian.org
Mon Mar 30 21:43:37 UTC 2009
Author: yavor-guest
Date: 2009-03-30 21:43:37 +0000 (Mon, 30 Mar 2009)
New Revision: 3235
Removed:
trunk/packages/sequenceconverter.app/trunk/debian/dirs
trunk/packages/sequenceconverter.app/trunk/debian/lintian-override
Modified:
trunk/packages/sequenceconverter.app/trunk/debian/changelog
trunk/packages/sequenceconverter.app/trunk/debian/control
trunk/packages/sequenceconverter.app/trunk/debian/menu
trunk/packages/sequenceconverter.app/trunk/debian/rules
Log:
Make the package FHS-compliant, generate XPM icon, noopt support.
* debian/control (Build-Depends): Drop gnustep-make and
gnustep-back0.14. Add imagemagick for the icon conversion.
(Depends): Add ${gnustep:Depends}.
* debian/rules: Use automatic variables where possible.
(GNUSTEP_MAKEFILES): Don't define; not needed.
(d_app): Define for convenience.
(LDFLAGS): Use --as-needed to strip unnecessary dependencies.
(OPTFLAG): Define conditionally based on the presence of `noopt' in
DEB_BUILD_OPTIONS.
(build-stamp): Pass messages=yes, OPTFLAG and LDFLAGS to gs_make.
Convert the icon in XPM format.
(clean): Do not call the clean target, distclean is sufficient.
Delete the generated icon.
(install): Use $(d_app). Install the XPM icon.
(binary-arch): Invoke gsdh_gnustep. Don't install the lintian
override. Conditionally move arch-indpendent Resources to /usr/share.
* debian/dirs:
* debian/lintian-override: Delete.
* debian/menu: Wrap fields for readability. Add icon and longtitle.
Modified: trunk/packages/sequenceconverter.app/trunk/debian/changelog
===================================================================
--- trunk/packages/sequenceconverter.app/trunk/debian/changelog 2009-03-30 21:32:40 UTC (rev 3234)
+++ trunk/packages/sequenceconverter.app/trunk/debian/changelog 2009-03-30 21:43:37 UTC (rev 3235)
@@ -13,6 +13,27 @@
biococoa package.
* Standards-Version: 3.8.1 (no changes needed)
+ [ Yavor Doganov ]
+ * debian/control (Build-Depends): Drop gnustep-make and
+ gnustep-back0.14. Add imagemagick for the icon conversion.
+ (Depends): Add ${gnustep:Depends}.
+ * debian/rules: Use automatic variables where possible.
+ (GNUSTEP_MAKEFILES): Don't define; not needed.
+ (d_app): Define for convenience.
+ (LDFLAGS): Use --as-needed to strip unnecessary dependencies.
+ (OPTFLAG): Define conditionally based on the presence of `noopt' in
+ DEB_BUILD_OPTIONS.
+ (build-stamp): Pass messages=yes, OPTFLAG and LDFLAGS to gs_make.
+ Convert the icon in XPM format.
+ (clean): Do not call the clean target, distclean is sufficient.
+ Delete the generated icon.
+ (install): Use $(d_app). Install the XPM icon.
+ (binary-arch): Invoke gsdh_gnustep. Don't install the lintian
+ override. Conditionally move arch-indpendent Resources to /usr/share.
+ * debian/dirs:
+ * debian/lintian-override: Delete.
+ * debian/menu: Wrap fields for readability. Add icon and longtitle.
+
-- Andreas Tille <tille at debian.org> Wed, 25 Mar 2009 07:27:46 +0100
biococoa.app (1.6.0-8) unstable; urgency=low
Modified: trunk/packages/sequenceconverter.app/trunk/debian/control
===================================================================
--- trunk/packages/sequenceconverter.app/trunk/debian/control 2009-03-30 21:32:40 UTC (rev 3234)
+++ trunk/packages/sequenceconverter.app/trunk/debian/control 2009-03-30 21:43:37 UTC (rev 3235)
@@ -4,7 +4,7 @@
Maintainer: Debian-Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
DM-Upload-Allowed: yes
Uploaders: Scott Christley <schristley at mac.com>, Andreas Tille <tille at debian.org>, Charles Plessy <plessy at debian.org>
-Build-Depends: debhelper (>= 5), gnustep-make, libgnustep-gui-dev (>= 0.12.0), gnustep-back0.14, quilt
+Build-Depends: debhelper (>= 5), libgnustep-gui-dev (>= 0.12.0), quilt, imagemagick
Standards-Version: 3.8.1
Homepage: http://bioinformatics.org/biococoa/
Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/sequenceconverter/trunk/?rev=0&sc=0
@@ -12,7 +12,7 @@
Package: sequenceconverter.app
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${gnustep:Depends}
Replaces: biococoa.app
Provides: biococoa.app
Conflicts: biococoa.app
Deleted: trunk/packages/sequenceconverter.app/trunk/debian/dirs
===================================================================
--- trunk/packages/sequenceconverter.app/trunk/debian/dirs 2009-03-30 21:32:40 UTC (rev 3234)
+++ trunk/packages/sequenceconverter.app/trunk/debian/dirs 2009-03-30 21:43:37 UTC (rev 3235)
@@ -1,2 +0,0 @@
-usr/bin
-usr/share/lintian/overrides
Deleted: trunk/packages/sequenceconverter.app/trunk/debian/lintian-override
===================================================================
--- trunk/packages/sequenceconverter.app/trunk/debian/lintian-override 2009-03-30 21:32:40 UTC (rev 3234)
+++ trunk/packages/sequenceconverter.app/trunk/debian/lintian-override 2009-03-30 21:43:37 UTC (rev 3235)
@@ -1 +0,0 @@
-sequenceconverter.app: image-file-in-usr-lib
Modified: trunk/packages/sequenceconverter.app/trunk/debian/menu
===================================================================
--- trunk/packages/sequenceconverter.app/trunk/debian/menu 2009-03-30 21:32:40 UTC (rev 3234)
+++ trunk/packages/sequenceconverter.app/trunk/debian/menu 2009-03-30 21:43:37 UTC (rev 3235)
@@ -1,2 +1,5 @@
-?package(sequenceconverter.app):needs="X11" section="Applications/Science/Biology"\
- title="SequenceConverter" command="SequenceConverter"
+?package(sequenceconverter.app):needs="X11"\
+ section="Applications/Science/Biology"\
+ title="SequenceConverter" command="SequenceConverter"\
+ icon="/usr/share/pixmaps/biococoa.xpm"\
+ longtitle="Biological sequence file format converter for GNUstep"
Modified: trunk/packages/sequenceconverter.app/trunk/debian/rules
===================================================================
--- trunk/packages/sequenceconverter.app/trunk/debian/rules 2009-03-30 21:32:40 UTC (rev 3234)
+++ trunk/packages/sequenceconverter.app/trunk/debian/rules 2009-03-30 21:43:37 UTC (rev 3235)
@@ -5,32 +5,43 @@
include /usr/share/quilt/quilt.make
include /usr/share/GNUstep/debian/config.mk
-GNUSTEP_MAKEFILES=$(GS_MAKE_DIR)
+d_app := $(CURDIR)/debian/sequenceconverter.app
+LDFLAGS := -Wl,-z,defs -Wl,--as-needed
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+OPTFLAG := -O0
+else
+OPTFLAG := -O2
+endif
+
build: patch build-stamp
build-stamp:
dh_testdir
cp BioCocoaInfo.plist SequenceConverterInfo.plist
- gs_make
- touch build-stamp
+ gs_make OPTFLAG=$(OPTFLAG) LDFLAGS="$(LDFLAGS)" messages=yes
+ convert biococoa.tiff -resize 32x32 biococoa.xpm
+ touch $@
clean: unpatch
dh_testdir
dh_testroot
- rm -f build-stamp
- gs_make distclean clean
- dh_clean SequenceConverterInfo.plist
+ $(RM) build-stamp
+ gs_make distclean
+ dh_clean SequenceConverterInfo.plist biococoa.xpm
install: build
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
- gs_make install DESTDIR=$(CURDIR)/debian/sequenceconverter.app GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
- find `pwd`/debian/sequenceconverter.app -name "*.plist" -exec chmod -x {} \;
+ gs_make install DESTDIR=$(d_app) GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
+ find $(d_app) -name "*.plist" -exec chmod -x {} \;
dh_install debian/*.desktop usr/share/applications/
- rm $(CURDIR)/debian/*.app/usr/lib/GNUstep/Applications/*.app/Resources/*.desktop
+ rm $(d_app)/usr/lib/GNUstep/Applications/*.app/Resources/*.desktop
+# Install the XPM icon.
+ install -D -m 644 biococoa.xpm $(d_app)/usr/share/pixmaps/biococoa.xpm
# Build architecture-independent files here.
binary-indep: build install
@@ -41,10 +52,19 @@
dh_testdir
dh_testroot
dh_installchangelogs
- install -m 644 debian/lintian-override $(CURDIR)/debian/sequenceconverter.app/usr/share/lintian/overrides/sequenceconverter.app
dh_installdocs
dh_installmenu
dh_installman
+ gsdh_gnustep
+# Conditionally move Resources to /usr/share for full FHS compliance.
+# Some downstream distros (e.g. the GNUstep LiveCD) dislike this.
+ifeq ($(GS_USE_FHS),yes)
+ dh_installdirs usr/share/GNUstep
+ mv $(d_app)$(GNUSTEP_SYSTEM_APPS)/SequenceConverter.app/Resources \
+ $(d_app)/usr/share/GNUstep/SequenceConverter.app
+ dh_link usr/share/GNUstep/SequenceConverter.app \
+ $(GNUSTEP_SYSTEM_APPS)/SequenceConverter.app/Resources
+endif
dh_strip
dh_compress
dh_fixperms
More information about the debian-med-commit
mailing list