diff --git a/flaim/ChangeLog.ubuntu b/flaim/ChangeLog.ubuntu index c1c2df0..8cc9d0b 100644 --- a/flaim/ChangeLog.ubuntu +++ b/flaim/ChangeLog.ubuntu @@ -1,16 +1,18 @@ +libflaim (4.9.1053) edgy; urgency=low + + * Updates for Hardy + + -- Andrew Hodgkinson (Sr. Software Engineer) Thu, 1 May 2008 13:31:00 -0600 + libflaim (4.9.1003-0ubuntu1) edgy; urgency=low - * Added support for 64-bit libraries - * Removed /zp1 compiler switch and added pragmas to do one-byte packing on structures - * Fixed mis-typed member of OPT_INFO structure - * Corrected errors in the spec file - - -- Andrew Hodgkinson (Sr. Software Engineer) Wed, 4 Oct 2006 11:50:56 -0600 - -libflaim (4.9.0-0ubuntu1) edgy; urgency=low - * Removed shared libraries from the development package * Removed debian/docs + * Added support for 64-bit libraries + * Removed /zp1 compiler switch and added pragmas to + do one-byte packing on structures + * Fixed mis-typed member of OPT_INFO structure + * Corrected errors in the spec file -- Andrew Hodgkinson (Sr. Software Engineer) Wed, 4 Oct 2006 11:50:56 -0600 diff --git a/flaim/Makefile b/flaim/Makefile index 1770df8..157dac7 100644 --- a/flaim/Makefile +++ b/flaim/Makefile @@ -43,8 +43,8 @@ project_brief_desc = Embeddable cross-platform database engine # -- Maintainers -- -ahodgkinson_info = Andrew Hodgkinson -dsanders_info = Daniel Sanders +ahodgkinson_info = Andrew Hodgkinson (Sr. Software Engineer) +dsanders_info = Daniel Sanders (Sr. Software Engineer) # -- Versions -- @@ -672,6 +672,13 @@ ifneq (,$(findstring ubuntusrc,$(MAKECMDGOALS))) endif endif +ifneq (,$(findstring ubuntubin,$(MAKECMDGOALS))) + calc_svn_revision = 1 + ifndef ignore_local_mods + local_mods_ok = + endif +endif + ifneq (,$(findstring docs,$(MAKECMDGOALS))) calc_svn_revision = 1 ifndef ignore_local_mods @@ -799,8 +806,7 @@ debian_stage_dir = $(package_dir)/debian_stage debian_pkginfo_dir = $(debian_stage_dir)/DEBIAN package_ubuntu_dir = $(package_dir)/UBUNTU -package_version_ubuntu = $(version)-0ubuntu1 -package_distro_ubuntu = edgy +package_distro_ubuntu = hardy ubuntu_stage_dir = $(package_dir)/ubuntu_stage ubuntu_pkginfo_dir = $(ubuntu_stage_dir)/DEBIAN ubuntu_proj_name_and_ver = $(package_proj_name)_$(version) @@ -2040,6 +2046,93 @@ rpms: dist spec $(ec)find $(package_dir) -name *.rpm | xargs chmod 775 $(ec)$(gprintf) "Source and binary RPMs created.\n" +# -- Ubuntu Binary Package -- + +.PHONY : ubuntubin +ubuntubin: bindist + $(ec)$(gprintf) "Creating Ubuntu binary package ...\n" + + -$(ec)$(call rmdircmd,$(ubuntu_stage_dir)) + $(ec)$(call mkdircmd,$(ubuntu_stage_dir)) + $(ec)$(call mkdircmd,$(ubuntu_pkginfo_dir)) + + $(ec)$(gprintf) "Creating Ubuntu control file ...\n" + $(ec)$(gprintf) "Package: $(package_proj_name)\n" > $(ubuntu_pkginfo_dir)/control + $(ec)$(gprintf) "Version: $(version)\n" >> $(ubuntu_pkginfo_dir)/control + $(ec)$(gprintf) "Section: libs\n" >> $(ubuntu_pkginfo_dir)/control + $(ec)$(gprintf) "Priority: optional\n" >> $(ubuntu_pkginfo_dir)/control + $(ec)$(gprintf) "Architecture: $(debian_arch)\n" >> $(ubuntu_pkginfo_dir)/control + $(ec)$(gprintf) "Depends:\n" >> $(ubuntu_pkginfo_dir)/control + $(ec)$(gprintf) "Maintainer: $(ahodgkinson_info)\n" >> $(ubuntu_pkginfo_dir)/control + $(ec)$(gprintf) "Description: $(project_brief_desc)\n" >> $(ubuntu_pkginfo_dir)/control + $(ec)$(gprintf) " A flexible database engine for semi-structured data.\n" >> $(ubuntu_pkginfo_dir)/control + + $(ec)$(gprintf) "Creating Ubuntu post install file ...\n" + $(ec)$(gprintf) "#!/bin/bash\n" > $(ubuntu_pkginfo_dir)/postinst +ifneq ($(so_age),0) +ifneq ($(so_revision),0) + $(ec)$(gprintf) "ln -fs $(ftk_shared_lib) /usr/lib/$(lib_prefix)$(project_name).so.$(so_current).$(so_revision)\n" >> $(ubuntu_pkginfo_dir)/postinst +endif +endif +ifneq ($(so_revision),0) + $(ec)$(gprintf) "ln -fs $(ftk_shared_lib) /usr/lib/$(lib_prefix)$(project_name).so.$(so_current)\n" >> $(ubuntu_pkginfo_dir)/postinst +endif + $(ec)$(gprintf) "ln -fs $(ftk_shared_lib) /usr/lib/$(lib_prefix)$(project_name).so\n" >> $(ubuntu_pkginfo_dir)/postinst + $(ec)$(gprintf) "ldconfig /usr/lib/$(ftk_shared_lib)\n" >> $(ubuntu_pkginfo_dir)/postinst + $(ec)chmod 0755 $(ubuntu_pkginfo_dir)/postinst + + $(ec)$(gprintf) "Creating Ubuntu pre-uninstall file ...\n" + $(ec)$(gprintf) "#!/bin/bash\n" > $(ubuntu_pkginfo_dir)/postrm +ifneq ($(so_age),0) +ifneq ($(so_revision),0) + $(ec)$(gprintf) "rm -f /usr/lib/$(lib_prefix)$(project_name).so.$(so_current).$(so_revision)\n" >> $(ubuntu_pkginfo_dir)/postrm +endif +endif +ifneq ($(so_revision),0) + $(ec)$(gprintf) "rm -f /usr/lib/$(lib_prefix)$(project_name).so.$(so_current)\n" >> $(ubuntu_pkginfo_dir)/postrm +endif + $(ec)$(gprintf) "rm -f /usr/lib/$(lib_prefix)$(project_name).so\n" >> $(ubuntu_pkginfo_dir)/postrm + $(ec)chmod 0755 $(ubuntu_pkginfo_dir)/postrm + + $(ec)$(gprintf) "Creating Ubuntu shlibs file ...\n" + $(ec)$(gprintf) "$(lib_prefix)$(project_name) $(shared_lib_version)\n" > $(ubuntu_pkginfo_dir)/shlibs + $(ec)chmod 0644 $(ubuntu_pkginfo_dir)/shlibs + + -$(ec)$(call rmdircmd,$(ubuntu_stage_dir)/tmp) + $(ec)$(call mkdircmd,$(ubuntu_stage_dir)/tmp) + $(ec)$(call copycmd,$(bin_package_dir)/$(bin_package_name),$(ubuntu_stage_dir)/tmp) + $(ec)$(call extract_archive,$(ubuntu_stage_dir)/tmp,$(bin_package_base_name)) + $(ec)$(call mkdircmd,$(ubuntu_stage_dir)/usr) + $(ec)$(call mkdircmd,$(ubuntu_stage_dir)/usr/lib) + $(ec)$(call mkdircmd,$(ubuntu_stage_dir)/usr/include) + $(ec)$(call mkdircmd,$(ubuntu_stage_dir)/usr/share/doc/$(package_proj_name)) + + $(ec)$(gprintf) "Creating Ubuntu changelog file ...\n" + $(ec)cat ChangeLog.ubuntu >> $(ubuntu_stage_dir)/usr/share/doc/$(package_proj_name)/changelog + $(ec)gzip -f --best $(ubuntu_stage_dir)/usr/share/doc/$(package_proj_name)/changelog + + $(ec)$(call copycmd,$(ubuntu_stage_dir)/tmp/$(package_proj_name_and_ver)/COPYRIGHT,$(ubuntu_stage_dir)/usr/share/doc/$(package_proj_name)/copyright) + $(ec)$(call copycmd,$(ubuntu_stage_dir)/tmp/$(package_proj_name_and_ver)/$(target_os_family)-$(target_processor_family)-$(target_word_size)/release/lib/shared/*,$(ubuntu_stage_dir)/usr/lib) + $(ec)$(call copycmd,$(ubuntu_stage_dir)/tmp/$(package_proj_name_and_ver)/$(target_os_family)-$(target_processor_family)-$(target_word_size)/release/lib/static/*,$(ubuntu_stage_dir)/usr/lib) + $(ec)strip $(ubuntu_stage_dir)/usr/lib/* + $(ec)$(call copycmd,$(ubuntu_stage_dir)/tmp/$(package_proj_name_and_ver)/$(target_os_family)-$(target_processor_family)-$(target_word_size)/release/lib/static/*,$(ubuntu_stage_dir)/usr/lib) + $(ec)$(call copycmd,$(ubuntu_stage_dir)/tmp/$(package_proj_name_and_ver)/include/*,$(ubuntu_stage_dir)/usr/include) + $(ec)$(call rmdircmd,$(ubuntu_stage_dir)/tmp) + $(ec)chmod 0644 $(ubuntu_stage_dir)/usr/lib/* + $(ec)fakeroot dpkg-deb -b $(ubuntu_stage_dir) $(package_dir)/$(package_proj_name)_$(version)-$(debian_arch).deb + + $(ec)$(gprintf) "Checking Ubuntu package ...\n" + $(ec)lintian -i -X bin,shl $(package_dir)/$(package_proj_name)_$(version)-$(debian_arch).deb + + $(ec)$(gprintf) "Moving package to UBUNTU directory ...\n" + $(ec)$(call copycmd,$(package_dir)/$(package_proj_name)_$(version)-$(debian_arch).deb,$(package_ubuntu_dir)) + $(ec)$(call rmcmd,$(package_dir)/$(package_proj_name)_$(version)-$(debian_arch).deb) + + $(ec)$(gprintf) "Removing temporary files ...\n" + $(ec)$(call rmdircmd,$(ubuntu_stage_dir)) + + $(ec)$(gprintf) "Done.\n" + # -- Ubuntu Source Package -- .PHONY : ubuntusrc @@ -2048,42 +2141,49 @@ ubuntusrc: srcdist -$(ec)$(call rmdircmd,$(ubuntu_stage_dir)) $(ec)$(call mkdircmd,$(ubuntu_stage_dir)) - $(ec)$(call copycmd,$(src_package_dir)/$(src_package_name),$(ubuntu_stage_dir)/$(src_package_base_name).orig.tar.gz) - $(ec)$(call extract_archive,$(ubuntu_stage_dir),$(src_package_base_name).orig) - $(ec)$(call rmcmd,$(ubuntu_stage_dir)/$(src_package_base_name).orig.tar) - $(ec)$(call copycmd,$(src_package_dir)/$(src_package_name),$(ubuntu_stage_dir)/$(ubuntu_proj_name_and_ver).orig.tar.gz) - - $(ec)$(call copycmd,$(ubuntu_stage_dir)/$(package_proj_name_and_ver)/COPYRIGHT,$(ubuntu_stage_dir)/$(package_proj_name_and_ver)/debian/copyright) + $(ec)$(call copycmd,$(src_package_dir)/$(src_package_name),$(ubuntu_stage_dir)) + $(ec)$(call extract_archive,$(ubuntu_stage_dir),$(src_package_base_name)) $(ec)$(gprintf) "Creating Ubuntu changelog file ...\n" - $(ec)$(gprintf) "$(package_proj_name) ($(package_version_ubuntu)) $(package_distro_ubuntu); urgency=low\n\n" > $(ubuntu_stage_dir)/$(package_proj_name_and_ver)/debian/changelog - $(ec)$(gprintf) " * Package update for Ubuntu.\n\n" >> $(ubuntu_stage_dir)/$(package_proj_name_and_ver)/debian/changelog - $(ec)$(gprintf) " -- Andrew Hodgkinson (Sr. Software Engineer) " >> $(ubuntu_stage_dir)/$(package_proj_name_and_ver)/debian/changelog - $(ec)822-date >> $(ubuntu_stage_dir)/$(package_proj_name_and_ver)/debian/changelog - $(ec)$(gprintf) "\n" >> $(ubuntu_stage_dir)/$(package_proj_name_and_ver)/debian/changelog $(ec)cat ChangeLog.ubuntu >> $(ubuntu_stage_dir)/$(package_proj_name_and_ver)/debian/changelog - $(ec)cd $(ubuntu_stage_dir)/$(package_proj_name_and_ver); debuild -S -sa + $(ec)$(gprintf) "Creating Ubuntu control file ...\n" + $(ec)$(gprintf) "Source: $(package_proj_name)\n" > $(ubuntu_stage_dir)/$(package_proj_name_and_ver)/debian/control + $(ec)$(gprintf) "Section: libs\n" >> $(ubuntu_stage_dir)/$(package_proj_name_and_ver)/debian/control + $(ec)$(gprintf) "Priority: optional\n" >> $(ubuntu_stage_dir)/$(package_proj_name_and_ver)/debian/control + $(ec)$(gprintf) "Maintainer: $(ahodgkinson_info)\n" >> $(ubuntu_stage_dir)/$(package_proj_name_and_ver)/debian/control + $(ec)$(gprintf) "Build-Depends: debhelper (>= 4.0.0), ncurses-dev\n" >> $(ubuntu_stage_dir)/$(package_proj_name_and_ver)/debian/control + $(ec)$(gprintf) "Standards-Version: 3.7.3\n" >> $(ubuntu_stage_dir)/$(package_proj_name_and_ver)/debian/control + $(ec)$(gprintf) "\n" >> $(ubuntu_stage_dir)/$(package_proj_name_and_ver)/debian/control + $(ec)$(gprintf) "Package: $(package_proj_name)\n" >> $(ubuntu_stage_dir)/$(package_proj_name_and_ver)/debian/control + $(ec)$(gprintf) "Architecture: any\n" >> $(ubuntu_stage_dir)/$(package_proj_name_and_ver)/debian/control + $(ec)$(gprintf) "Depends: ${shlibs:Depends}, ${misc:Depends}\n" >> $(ubuntu_stage_dir)/$(package_proj_name_and_ver)/debian/control + $(ec)$(gprintf) "Description: $(project_brief_desc)\n" >> $(ubuntu_stage_dir)/$(package_proj_name_and_ver)/debian/control + $(ec)$(gprintf) " A flexible database engine for semi-structured data.\n" >> $(ubuntu_stage_dir)/$(package_proj_name_and_ver)/debian/control + + $(ec)$(call copycmd,$(ubuntu_stage_dir)/$(package_proj_name_and_ver)/COPYRIGHT,$(ubuntu_stage_dir)/$(package_proj_name_and_ver)/debian/copyright) + + $(ec)$(call rmcmd,$(ubuntu_stage_dir)/$(package_proj_name_and_ver)/debian/*.ex) + $(ec)$(call rmcmd,$(ubuntu_stage_dir)/$(package_proj_name_and_ver)/debian/*.EX) + + $(ec)cd $(ubuntu_stage_dir)/$(package_proj_name_and_ver); dpkg-buildpackage -S -rfakeroot $(ec)$(gprintf) "Checking Ubuntu package ...\n" - $(ec)lintian -i $(ubuntu_stage_dir)/$(package_proj_name)_$(package_version_ubuntu).dsc - $(ec)linda -i $(ubuntu_stage_dir)/$(package_proj_name)_$(package_version_ubuntu).dsc + $(ec)lintian -i $(ubuntu_stage_dir)/$(package_proj_name)_$(version).dsc $(ec)$(gprintf) "Moving packages to UBUNTU directory ...\n" - $(ec)$(call copycmd,$(ubuntu_stage_dir)/*.dsc,$(package_ubuntu_dir)) - $(ec)$(call rmcmd,$(ubuntu_stage_dir)/*.dsc) - $(ec)$(call copycmd,$(ubuntu_stage_dir)/*.diff.gz,$(package_ubuntu_dir)) - $(ec)$(call rmcmd,$(ubuntu_stage_dir)/*.diff.gz) - $(ec)$(call copycmd,$(ubuntu_stage_dir)/*.tar.gz,$(package_ubuntu_dir)) - $(ec)$(call rmcmd,$(ubuntu_stage_dir)/*.tar.gz) - $(ec)$(call copycmd,$(ubuntu_stage_dir)/*.changes,$(package_ubuntu_dir)) - $(ec)$(call rmcmd,$(ubuntu_stage_dir)/*.changes) + $(ec)$(call copycmd,$(ubuntu_stage_dir)/$(package_proj_name)_$(version).dsc,$(package_ubuntu_dir)) + $(ec)$(call rmcmd,$(ubuntu_stage_dir)/$(package_proj_name)_$(version).dsc) + $(ec)$(call copycmd,$(ubuntu_stage_dir)/$(package_proj_name)_$(version).tar.gz,$(package_ubuntu_dir)) + $(ec)$(call rmcmd,$(ubuntu_stage_dir)/$(package_proj_name)_$(version).tar.gz) + $(ec)$(call copycmd,$(ubuntu_stage_dir)/$(package_proj_name)_$(version)_source.changes,$(package_ubuntu_dir)) + $(ec)$(call rmcmd,$(ubuntu_stage_dir)/$(package_proj_name)_$(version)_source.changes) $(ec)$(gprintf) "Removing temporary files ...\n" $(ec)$(call rmdircmd,$(ubuntu_stage_dir)) $(ec)$(gprintf) "Done.\n" - + # -- Documentation -- .PHONY : docs diff --git a/flaim/debian/rules b/flaim/debian/rules index e3b1d0a..686a561 100644 --- a/flaim/debian/rules +++ b/flaim/debian/rules @@ -1,9 +1,9 @@ #!/usr/bin/make -f -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -OSTYPE ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS) -HOSTTYPE ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +OSTYPE ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS) +HOSTTYPE ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU) CFLAGS = -Wall -g PLAT64BIT = no @@ -40,9 +40,9 @@ clean: dh_testdir dh_testroot rm -f build-stamp configure-stamp - -$(MAKE) clean OSTYPE=$(OSTYPE) HOSTTYPE=$(HOSTTYPE) -j 2 + $(MAKE) clean OSTYPE=$(OSTYPE) HOSTTYPE=$(HOSTTYPE) -j 2 ifeq ($(PLAT64BIT),yes) - -$(MAKE) 32bit clean OSTYPE=$(OSTYPE) HOSTTYPE=$(HOSTTYPE) -j 2 + $(MAKE) 32bit clean OSTYPE=$(OSTYPE) HOSTTYPE=$(HOSTTYPE) -j 2 endif dh_clean diff --git a/flaim/util/view.h b/flaim/util/view.h index d95ead3..83c26f3 100644 --- a/flaim/util/view.h +++ b/flaim/util/view.h @@ -55,7 +55,7 @@ #define LFH_OPTION_LAST_BLOCK 0x2000 #define BLK_OPTION_CHILD_BLOCK 0x1000 -EXTERN char * Labels[] +EXTERN const char * Labels[] #ifdef MAIN_MODULE = { "File Header", /*0*/ diff --git a/flaim/util/viewmenu.cpp b/flaim/util/viewmenu.cpp index 490f1d2..307aaf8 100644 --- a/flaim/util/viewmenu.cpp +++ b/flaim/util/viewmenu.cpp @@ -26,7 +26,7 @@ #include "view.h" -FSTATIC char * Months[] = { +FSTATIC const char * Months[] = { "Jan", "Feb", "Mar",