--- gpp4-1.3.0.orig/debian/libgpp4-doc.docs +++ gpp4-1.3.0/debian/libgpp4-doc.docs @@ -0,0 +1 @@ +doc/html --- gpp4-1.3.0.orig/debian/libgpp4f-dev.install +++ gpp4-1.3.0/debian/libgpp4f-dev.install @@ -0,0 +1,3 @@ +usr/lib/libgpp4f.a +usr/lib/libgpp4f.so +usr/lib/pkgconfig/gpp4f.pc --- gpp4-1.3.0.orig/debian/watch +++ gpp4-1.3.0/debian/watch @@ -0,0 +1,3 @@ +version=3 +https://launchpad.net/gpp4/+download http://launchpad.net/gpp4/.*/gpp4-([\.\d]*).tar.gz + --- gpp4-1.3.0.orig/debian/libgpp4-0.docs +++ gpp4-1.3.0/debian/libgpp4-0.docs @@ -0,0 +1 @@ +README --- gpp4-1.3.0.orig/debian/libgpp4-dev.install +++ gpp4-1.3.0/debian/libgpp4-dev.install @@ -0,0 +1,4 @@ +usr/include/gpp4 +usr/lib/libgpp4.a +usr/lib/libgpp4.so +usr/lib/pkgconfig/gpp4.pc --- gpp4-1.3.0.orig/debian/changelog +++ gpp4-1.3.0/debian/changelog @@ -0,0 +1,63 @@ +gpp4 (1.3.0-0ubuntu1) natty; urgency=low + + * New upstream release 1.3.0 + * debian/control: Add ${misc:Depends}, bump standards-version + * Patched to address various compiler warnings. + + -- Morten Kjeldgaard Tue, 11 Jan 2011 13:47:36 +0100 + +gpp4 (1.2.1-0ubuntu1) lucid; urgency=low + + * New upstream release 1.2.1. + * Packaging moved to bzr, added Vcs-Bzr: line to + debian/control. + + -- Morten Kjeldgaard Mon, 25 Jan 2010 19:33:04 +0100 + +gpp4 (1.2.0-0ubuntu1) lucid; urgency=low + + * New upstream version 1.2.0. + * New binary packages added to isolate the mmdb dependency in the + Fortran API libraries. + + -- Morten Kjeldgaard Mon, 09 Nov 2009 16:41:48 +0100 + +gpp4 (1.1.0-0ubuntu2) karmic; urgency=low + + * debian/control: Homepage updated + * debian/watch: Use new Launchpad project download. + + -- Morten Kjeldgaard Tue, 08 Sep 2009 12:41:59 +0200 + +gpp4 (1.1.0-0ubuntu1) jaunty; urgency=low + + * New upstream version (LP: #322205) + * Some compilation warnings fixed, patch 01-ubuntu-fixes + sent upstream. + + -- Morten Kjeldgaard Wed, 03 Dec 2008 11:21:42 +0100 + +gpp4 (1.0.4-0ubuntu4) jaunty; urgency=low + + * FTBFS error on the ARMEL platform fixed + * Bumped standards version to 3.8.0 + + -- Morten Kjeldgaard Mon, 01 Dec 2008 13:39:16 +0100 + +gpp4 (1.0.4-0ubuntu3) hardy; urgency=low + + * FTBFS error on the hppa platform fixed (LP: #193289) + + -- Morten Kjeldgaard Tue, 19 Feb 2008 15:32:00 +0100 + +gpp4 (1.0.4-0ubuntu2) hardy; urgency=low + + * Removed dependency to non-existent package libgpp4-data (LP: #186393) + + -- Morten Kjeldgaard Sun, 27 Jan 2008 18:12:07 +0100 + +gpp4 (1.0.4-0ubuntu1) hardy; urgency=low + + * Initial release (LP: #176209) + + -- Morten Kjeldgaard Thu, 10 Jan 2008 00:06:26 +0100 --- gpp4-1.3.0.orig/debian/libgpp4-doc.doc-base +++ gpp4-1.3.0/debian/libgpp4-doc.doc-base @@ -0,0 +1,9 @@ +Document: gpp4 +Title: gpp4 Programmers Manual +Author: Various +Abstract: This manual is generated from the source code of libgpp4. +Section: Devel + +Format: HTML +Index: /usr/share/doc/libgpp4-doc/html/index.html +Files: /usr/share/doc/libgpp4-doc/html/*.html --- gpp4-1.3.0.orig/debian/libgpp4-0.symbols +++ gpp4-1.3.0/debian/libgpp4-0.symbols @@ -0,0 +1,391 @@ +libgpp4.so.0 libgpp4-0 #MINVER# + ASU_1b@Base 1.0.4 + ASU_2_m@Base 1.0.4 + ASU_3b@Base 1.0.4 + ASU_3bm@Base 1.0.4 + ASU_3bmx@Base 1.0.4 + ASU_4_m@Base 1.0.4 + ASU_4_mmm@Base 1.0.4 + ASU_6_m@Base 1.0.4 + ASU_6_mmm@Base 1.0.4 + ASU_m3b@Base 1.0.4 + ASU_m3bm@Base 1.0.4 + ASU_mmm@Base 1.0.4 + CFile_Perror@Base 1.0.4 + MtzAddColumn@Base 1.0.4 + MtzAddDataset@Base 1.0.4 + MtzAddHistory@Base 1.0.4 + MtzAddXtal@Base 1.0.4 + MtzArrayToBatch@Base 1.0.4 + MtzAssignColumn@Base 1.0.4 + MtzAssignHKLtoBase@Base 1.0.4 + MtzBatchToArray@Base 1.0.4 + MtzCallocHist@Base 1.0.4 + MtzColLookup@Base 1.0.4 + MtzColPath@Base 1.0.4 + MtzColSet@Base 1.0.4 + MtzColType@Base 1.0.4 + MtzColsInSet@Base 1.0.4 + MtzDebugHierarchy@Base 1.0.4 + MtzDeleteRefl@Base 1.0.4 + MtzFindInd@Base 1.0.4 + MtzFree@Base 1.0.4 + MtzFreeBatch@Base 1.0.4 + MtzFreeCol@Base 1.0.4 + MtzFreeHist@Base 1.0.4 + MtzGet@Base 1.0.4 + MtzGetUserCellTolerance@Base 1.0.4 + MtzHklcoeffs@Base 1.0.4 + MtzIcolInSet@Base 1.0.4 + MtzInd2reso@Base 1.0.4 + MtzIsetInXtal@Base 1.0.4 + MtzIxtal@Base 1.0.4 + MtzListColumn@Base 1.0.4 + MtzListInputColumn@Base 1.0.4 + MtzMalloc@Base 1.0.4 + MtzMallocBatch@Base 1.0.4 + MtzMallocCol@Base 1.0.4 + MtzNbat@Base 1.0.4 + MtzNbatchesInSet@Base 1.0.4 + MtzNcol@Base 1.0.4 + MtzNcolsInSet@Base 1.0.4 + MtzNref@Base 1.0.4 + MtzNset@Base 1.0.4 + MtzNsetsInXtal@Base 1.0.4 + MtzNumActiveCol@Base 1.0.4 + MtzNumActiveColsInSet@Base 1.0.4 + MtzNumActiveSet@Base 1.0.4 + MtzNumActiveSetsInXtal@Base 1.0.4 + MtzNumActiveXtal@Base 1.0.4 + MtzNumSourceCol@Base 1.0.4 + MtzNumSourceColsInSet@Base 1.0.4 + MtzNxtal@Base 1.0.4 + MtzOpenForWrite@Base 1.0.4 + MtzParseLabin@Base 1.0.4 + MtzPathMatch@Base 1.0.4 + MtzPrintBatchHeader@Base 1.0.4 + MtzPut@Base 1.0.4 + MtzRJustPath@Base 1.0.4 + MtzResLimits@Base 1.0.4 + MtzRrefl@Base 1.0.4 + MtzSetLookup@Base 1.0.4 + MtzSetPath@Base 1.0.4 + MtzSetSortOrder@Base 1.0.4 + MtzSetXtal@Base 1.0.4 + MtzSetsInXtal@Base 1.0.4 + MtzSpacegroupNumber@Base 1.0.4 + MtzToggleColumn@Base 1.0.4 + MtzWhdrLine@Base 1.0.4 + MtzWrefl@Base 1.0.4 + MtzXtalLookup@Base 1.0.4 + MtzXtalPath@Base 1.0.4 + MtzXtals@Base 1.0.4 + all_factors_le_19@Base 1.0.4 + bits@Base 1.1.0 + ccp4Callback@Base 1.1.0 + ccp4InvokeCallback@Base 1.1.0 + ccp4NullCallback@Base 1.1.0 + ccp4ProgramName@Base 1.0.4 + ccp4ProgramTime@Base 1.0.4 + ccp4RCSDate@Base 1.0.4 + ccp4SetCallback@Base 1.1.0 + ccp4VerbosityLevel@Base 1.0.4 + ccp4_3matmul@Base 1.0.4 + ccp4_4matmul@Base 1.0.4 + ccp4_banner@Base 1.0.4 + ccp4_cmap_close@Base 1.0.4 + ccp4_cmap_closemode@Base 1.0.4 + ccp4_cmap_get_cell@Base 1.0.4 + ccp4_cmap_get_datamode@Base 1.0.4 + ccp4_cmap_get_dim@Base 1.0.4 + ccp4_cmap_get_grid@Base 1.0.4 + ccp4_cmap_get_label@Base 1.0.4 + ccp4_cmap_get_local_header@Base 1.0.4 + ccp4_cmap_get_mapstats@Base 1.0.4 + ccp4_cmap_get_mask@Base 1.0.4 + ccp4_cmap_get_order@Base 1.0.4 + ccp4_cmap_get_origin@Base 1.0.4 + ccp4_cmap_get_spacegroup@Base 1.0.4 + ccp4_cmap_get_symop@Base 1.0.4 + ccp4_cmap_get_title@Base 1.0.4 + ccp4_cmap_num_symop@Base 1.0.4 + ccp4_cmap_number_label@Base 1.0.4 + ccp4_cmap_open@Base 1.0.4 + ccp4_cmap_read_data@Base 1.0.4 + ccp4_cmap_read_row@Base 1.0.4 + ccp4_cmap_read_section@Base 1.0.4 + ccp4_cmap_read_section_header@Base 1.0.4 + ccp4_cmap_seek_data@Base 1.0.4 + ccp4_cmap_seek_row@Base 1.0.4 + ccp4_cmap_seek_section@Base 1.0.4 + ccp4_cmap_seek_symop@Base 1.0.4 + ccp4_cmap_set_cell@Base 1.0.4 + ccp4_cmap_set_datamode@Base 1.0.4 + ccp4_cmap_set_dim@Base 1.0.4 + ccp4_cmap_set_grid@Base 1.0.4 + ccp4_cmap_set_label@Base 1.0.4 + ccp4_cmap_set_local_header@Base 1.0.4 + ccp4_cmap_set_mapstats@Base 1.0.4 + ccp4_cmap_set_mask@Base 1.0.4 + ccp4_cmap_set_order@Base 1.0.4 + ccp4_cmap_set_origin@Base 1.0.4 + ccp4_cmap_set_spacegroup@Base 1.0.4 + ccp4_cmap_set_symop@Base 1.0.4 + ccp4_cmap_set_title@Base 1.0.4 + ccp4_cmap_write_data@Base 1.0.4 + ccp4_cmap_write_row@Base 1.0.4 + ccp4_cmap_write_section@Base 1.0.4 + ccp4_cmap_write_section_header@Base 1.0.4 + ccp4_dcross@Base 1.0.4 + ccp4_errno@Base 1.0.4 + ccp4_error@Base 1.0.4 + ccp4_fatal@Base 1.0.4 + ccp4_file_byte@Base 1.0.4 + ccp4_file_clearerr@Base 1.0.4 + ccp4_file_close@Base 1.0.4 + ccp4_file_error@Base 1.0.4 + ccp4_file_fatal@Base 1.0.4 + ccp4_file_feof@Base 1.0.4 + ccp4_file_flush@Base 1.0.4 + ccp4_file_is_append@Base 1.0.4 + ccp4_file_is_buffered@Base 1.0.4 + ccp4_file_is_read@Base 1.0.4 + ccp4_file_is_scratch@Base 1.0.4 + ccp4_file_is_write@Base 1.0.4 + ccp4_file_itemsize@Base 1.0.4 + ccp4_file_length@Base 1.0.4 + ccp4_file_mode@Base 1.0.4 + ccp4_file_name@Base 1.0.4 + ccp4_file_open@Base 1.0.4 + ccp4_file_open_fd@Base 1.0.4 + ccp4_file_open_file@Base 1.0.4 + ccp4_file_print@Base 1.0.4 + ccp4_file_rarch@Base 1.0.4 + ccp4_file_raw_read@Base 1.0.4 + ccp4_file_raw_seek@Base 1.0.4 + ccp4_file_raw_setstamp@Base 1.0.4 + ccp4_file_raw_write@Base 1.0.4 + ccp4_file_read@Base 1.0.4 + ccp4_file_readchar@Base 1.0.4 + ccp4_file_readcomp@Base 1.0.4 + ccp4_file_readfloat@Base 1.0.4 + ccp4_file_readint@Base 1.0.4 + ccp4_file_readshort@Base 1.0.4 + ccp4_file_readshortcomp@Base 1.0.4 + ccp4_file_rewind@Base 1.0.4 + ccp4_file_seek@Base 1.0.4 + ccp4_file_setbyte@Base 1.0.4 + ccp4_file_setmode@Base 1.0.4 + ccp4_file_setstamp@Base 1.0.4 + ccp4_file_status@Base 1.0.4 + ccp4_file_tell@Base 1.0.4 + ccp4_file_warch@Base 1.0.4 + ccp4_file_write@Base 1.0.4 + ccp4_file_writechar@Base 1.0.4 + ccp4_file_writecomp@Base 1.0.4 + ccp4_file_writefloat@Base 1.0.4 + ccp4_file_writeint@Base 1.0.4 + ccp4_file_writeshort@Base 1.0.4 + ccp4_file_writeshortcomp@Base 1.0.4 + ccp4_int_compare@Base 1.0.4 + ccp4_ismnf@Base 1.0.4 + ccp4_keymatch@Base 1.0.4 + ccp4_lhprt@Base 1.0.4 + ccp4_lhprt_adv@Base 1.0.4 + ccp4_liberr_verbosity@Base 1.0.4 + ccp4_licence_exists@Base 1.0.4 + ccp4_lrassn@Base 1.0.4 + ccp4_lrbat@Base 1.0.4 + ccp4_lrbats@Base 1.0.4 + ccp4_lrcell@Base 1.0.4 + ccp4_lrhist@Base 1.0.4 + ccp4_lridx@Base 1.0.4 + ccp4_lrreff@Base 1.0.4 + ccp4_lrrefl@Base 1.0.4 + ccp4_lrsort@Base 1.0.4 + ccp4_lrsymi@Base 1.0.4 + ccp4_lrsymi_c@Base 1.3.0 + ccp4_lrsymm@Base 1.0.4 + ccp4_lrtitl@Base 1.0.4 + ccp4_lwassn@Base 1.0.4 + ccp4_lwbat@Base 1.0.4 + ccp4_lwbsetid@Base 1.0.4 + ccp4_lwidx@Base 1.0.4 + ccp4_lwrefl@Base 1.0.4 + ccp4_lwsymconf@Base 1.3.0 + ccp4_lwsymm@Base 1.0.4 + ccp4_lwsymm_c@Base 1.3.0 + ccp4_lwtitl@Base 1.0.4 + ccp4_nan@Base 1.0.4 + ccp4_parse@Base 1.0.4 + ccp4_parse_comments@Base 1.0.4 + ccp4_parse_delimiters@Base 1.0.4 + ccp4_parse_end@Base 1.0.4 + ccp4_parse_init_token@Base 1.0.4 + ccp4_parse_maxmin@Base 1.0.4 + ccp4_parse_reset@Base 1.0.4 + ccp4_parse_start@Base 1.0.4 + ccp4_parser@Base 1.0.4 + ccp4_pow_ii@Base 1.0.4 + ccp4_prog_vers@Base 1.0.4 + ccp4_signal@Base 1.0.4 + ccp4_spg_get_centering@Base 1.0.4 + ccp4_spgrp_equal@Base 1.0.4 + ccp4_spgrp_equal_order@Base 1.1.0 + ccp4_spgrp_reverse_lookup@Base 1.0.4 + ccp4_strerror@Base 1.0.4 + ccp4_symop_code@Base 1.0.4 + ccp4_symop_invert@Base 1.0.4 + ccp4_utils_basename@Base 1.0.4 + ccp4_utils_bml@Base 1.0.4 + ccp4_utils_calloc@Base 1.0.4 + ccp4_utils_chmod@Base 1.0.4 + ccp4_utils_date@Base 1.0.4 + ccp4_utils_etime@Base 1.0.4 + ccp4_utils_extension@Base 1.0.4 + ccp4_utils_flength@Base 1.0.4 + ccp4_utils_hgetlimits@Base 1.0.4 + ccp4_utils_idate@Base 1.0.4 + ccp4_utils_isnan@Base 1.0.4 + ccp4_utils_itime@Base 1.0.4 + ccp4_utils_joinfilenames@Base 1.0.4 + ccp4_utils_malloc@Base 1.0.4 + ccp4_utils_mkdir@Base 1.0.4 + ccp4_utils_noinpbuf@Base 1.0.4 + ccp4_utils_outbuf@Base 1.0.4 + ccp4_utils_pathname@Base 1.0.4 + ccp4_utils_print@Base 1.0.4 + ccp4_utils_realloc@Base 1.0.4 + ccp4_utils_setenv@Base 1.0.4 + ccp4_utils_time@Base 1.0.4 + ccp4_utils_translate_mode_float@Base 1.0.4 + ccp4_utils_username@Base 1.0.4 + ccp4_utils_wrg@Base 1.0.4 + ccp4array_append_@Base 1.0.4 + ccp4array_append_list_@Base 1.0.4 + ccp4array_append_n_@Base 1.0.4 + ccp4array_delete_@Base 1.0.4 + ccp4array_delete_last_@Base 1.0.4 + ccp4array_delete_ordered_@Base 1.0.4 + ccp4array_free_@Base 1.0.4 + ccp4array_insert_@Base 1.0.4 + ccp4array_new_@Base 1.0.4 + ccp4array_new_size_@Base 1.0.4 + ccp4array_reserve_@Base 1.0.4 + ccp4array_resize_@Base 1.0.4 + ccp4array_size_@Base 1.0.4 + ccp4fyp@Base 1.0.4 + ccp4fyp_cleanup@Base 1.1.0 + ccp4printf@Base 1.0.4 + ccp4setenv@Base 1.0.4 + ccp4setenv_cleanup@Base 1.1.0 + ccp4spg_centric_phase@Base 1.0.4 + ccp4spg_check_centric_zone@Base 1.0.4 + ccp4spg_check_epsilon_zone@Base 1.0.4 + ccp4spg_check_symm_cell@Base 1.0.4 + ccp4spg_describe_centric_zone@Base 1.0.4 + ccp4spg_describe_epsilon_zone@Base 1.0.4 + ccp4spg_do_chb@Base 1.0.4 + ccp4spg_free@Base 1.0.4 + ccp4spg_generate_indices@Base 1.0.4 + ccp4spg_generate_origins@Base 1.0.4 + ccp4spg_get_multiplicity@Base 1.0.4 + ccp4spg_is_centric@Base 1.0.4 + ccp4spg_is_in_asu@Base 1.0.4 + ccp4spg_is_in_pm_asu@Base 1.0.4 + ccp4spg_is_sysabs@Base 1.0.4 + ccp4spg_load_by_ccp4_num@Base 1.0.4 + ccp4spg_load_by_ccp4_spgname@Base 1.0.4 + ccp4spg_load_by_spgname@Base 1.0.4 + ccp4spg_load_by_standard_num@Base 1.0.4 + ccp4spg_load_laue@Base 1.0.4 + ccp4spg_load_spacegroup@Base 1.0.4 + ccp4spg_name_de_colon@Base 1.0.4 + ccp4spg_name_equal@Base 1.0.4 + ccp4spg_name_equal_to_lib@Base 1.0.4 + ccp4spg_norm_trans@Base 1.0.4 + ccp4spg_pgname_equal@Base 1.0.4 + ccp4spg_phase_shift@Base 1.0.4 + ccp4spg_print_centric_zones@Base 1.0.4 + ccp4spg_print_epsilon_zones@Base 1.0.4 + ccp4spg_print_recip_ops@Base 1.0.4 + ccp4spg_print_recip_spgrp@Base 1.0.4 + ccp4spg_put_in_asu@Base 1.0.4 + ccp4spg_set_centric_zones@Base 1.0.4 + ccp4spg_set_epsilon_zones@Base 1.0.4 + ccp4spg_symbol_Hall@Base 1.0.4 + ccp4spg_to_shortname@Base 1.0.4 + ccp4uc_calc_cell_volume@Base 1.0.4 + ccp4uc_calc_rcell@Base 1.0.4 + ccp4uc_cells_differ@Base 1.0.4 + ccp4uc_frac_orth_mat@Base 1.0.4 + ccp4uc_frac_to_orth@Base 1.0.4 + ccp4uc_fracu_to_orthu@Base 1.0.4 + ccp4uc_is_hexagonal@Base 1.0.4 + ccp4uc_is_rhombohedral@Base 1.0.4 + ccp4uc_orth_to_frac@Base 1.0.4 + ccp4uc_orthu_to_fracu@Base 1.0.4 + ccperror@Base 1.0.4 + ccperror_noexit@Base 1.0.4 + ccpexists@Base 1.0.4 + ccpputenv@Base 1.0.4 + charmatch@Base 1.0.4 + diff_longs@Base 1.1.0 + diff_words@Base 1.1.0 + doublefromstr@Base 1.0.4 + get_grid_sample@Base 1.0.4 + gpp4_open_syminfo_file@Base 1.1.0 + html_log_output@Base 1.0.4 + imsiz_c@Base 1.1.0 + imsiz_f_@Base 1.1.0 + init_cmap_read@Base 1.0.4 + init_cmap_write@Base 1.0.4 + invert3matrix@Base 1.0.4 + invert4matrix@Base 1.0.4 + is_cmap@Base 1.0.4 + long_to_char@Base 1.1.0 + mat4_to_recip_symop@Base 1.0.4 + mat4_to_rotandtrn@Base 1.0.4 + mat4_to_symop@Base 1.0.4 + mirror_longimg@Base 1.1.0 + mirror_wordimg@Base 1.1.0 + number_sections@Base 1.0.4 + pack_chunk@Base 1.1.0 + pack_longimage_c@Base 1.1.0 + pack_longimage_copen@Base 1.1.0 + pack_longimage_f_@Base 1.1.0 + pack_longs@Base 1.1.0 + pack_wordimage_c@Base 1.1.0 + pack_wordimage_copen@Base 1.1.0 + pack_wordimage_f_@Base 1.1.0 + parse_mapheader@Base 1.0.4 + parse_maplabels@Base 1.0.4 + range_to_limits@Base 1.0.4 + readpack_long_c@Base 1.1.0 + readpack_long_f_@Base 1.1.0 + readpack_word_c@Base 1.1.0 + readpack_word_f_@Base 1.1.0 + rotandtrn_to_mat4@Base 1.0.4 + rotandtrn_to_symop@Base 1.0.4 + set_fft_grid@Base 1.0.4 + skew_set@Base 1.0.4 + sort_batches@Base 1.0.4 + stats_update@Base 1.0.4 + strmatch@Base 1.0.4 + strtolower@Base 1.0.4 + strtoupper@Base 1.0.4 + summary_output@Base 1.0.4 + symop_to_mat4@Base 1.0.4 + symop_to_rotandtrn@Base 1.0.4 + unpack_long@Base 1.1.0 + unpack_word@Base 1.1.0 + v2bits@Base 1.1.0 + v2pack_chunk@Base 1.1.0 + v2pack_longimage_c@Base 1.1.0 + v2pack_longimage_f_@Base 1.1.0 + v2pack_wordimage_c@Base 1.1.0 + v2pack_wordimage_f_@Base 1.1.0 + v2unpack_long@Base 1.1.0 + v2unpack_word@Base 1.1.0 + write_mapheader@Base 1.0.4 + write_maplabels@Base 1.0.4 --- gpp4-1.3.0.orig/debian/compat +++ gpp4-1.3.0/debian/compat @@ -0,0 +1 @@ +5 --- gpp4-1.3.0.orig/debian/control +++ gpp4-1.3.0/debian/control @@ -0,0 +1,93 @@ +Source: gpp4 +Section: science +Priority: optional +Maintainer: Morten Kjeldgaard +Homepage: https://launchpad.net/gpp4 +Build-Depends: debhelper (>= 5), autotools-dev, quilt, pkg-config, + libmmdb-dev, gfortran, m4 +Build-Depends-Indep: doxygen +Standards-Version: 3.9.1 +Vcs-Bzr: http://bazaar.launchpad.net/~mok0/gpp4/ubuntu + +Package: libgpp4-0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: shared library for CCP4 compatible programs + The goal of the ggp4 project is to provide a standalone replacement for + the CCP4 library for macromolecular crystallography. The library performs + a number of common tasks in standardized manner. These tasks include file + opening, parsing keyworded input, and reading and writing of standard data + formats for electron density maps and X-Ray diffraction data. Programs may + call this library to ensure compatibility with the CCP4 program suite, as + well as a similar look-and-feel. + . + This package provides a shared library needed to run programs that + have been linked to libgpp4.so. + +Package: libgpp4-dev +Section: libdevel +Architecture: any +Suggests: libgpp4-doc +Depends: libgpp4-0 (= ${binary:Version}), ${misc:Depends} +Description: development environment for CCP4 compatible programs + The goal of the ggp4 project is to provide a standalone replacement for + the CCP4 library for macromolecular crystallography. The library performs + a number of common tasks in standardized manner. These tasks include file + opening, parsing keyworded input, and reading and writing of standard data + formats for electron density maps and X-Ray diffraction data. Programs may + call this library to ensure compatibility with the CCP4 program suite, as + well as a similar look-and-feel. + . + This package provides header files and library for developing free + CCP4 compatible programs. + +Package: libgpp4f-0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, libgpp4-0 (= ${binary:Version}), libmmdb0, ${misc:Depends} +Description: shared library for CCP4 compatible programs + The goal of the ggp4 project is to provide a standalone replacement for + the CCP4 library for macromolecular crystallography. The library performs + a number of common tasks in standardized manner. These tasks include file + opening, parsing keyworded input, and reading and writing of standard data + formats for electron density maps and X-Ray diffraction data. Programs may + call this library to ensure compatibility with the CCP4 program suite, as + well as a similar look-and-feel. + . + This package provides a shared library needed to run programs that + make use of libgpp4's FORTRAN API. + +Package: libgpp4f-dev +Section: libdevel +Architecture: any +Suggests: libgpp4-doc +Depends: libgpp4-0 (= ${binary:Version}), libgpp4f-0 (= ${binary:Version}), ${misc:Depends} +Description: development environment for CCP4 compatible programs + The goal of the ggp4 project is to provide a standalone replacement for + the CCP4 library for macromolecular crystallography. The library performs + a number of common tasks in standardized manner. These tasks include file + opening, parsing keyworded input, and reading and writing of standard data + formats for electron density maps and X-Ray diffraction data. Programs may + call this library to ensure compatibility with the CCP4 program suite, as + well as a similar look-and-feel. + . + This package provides the FOTRAN API library for developing free + CCP4 compatible programs. + +Package: libgpp4-doc +Section: doc +Architecture: all +Suggests: www-browser +Depends: ${misc:Depends} +Enhances: libgpp4-dev +Description: doxygen generated documentation for libgpp4 + The goal of the ggp4 project is to provide a standalone replacement for + the CCP4 library for macromolecular crystallography. The library performs + a number of common tasks in standardized manner. These tasks include file + opening, parsing keyworded input, and reading and writing of standard data + formats for electron density maps and X-Ray diffraction data. Programs may + call this library to ensure compatibility with the CCP4 program suite, as + well as a similar look-and-feel. + . + This package provides doxygen generated documentation for the library. --- gpp4-1.3.0.orig/debian/libgpp4-0.install +++ gpp4-1.3.0/debian/libgpp4-0.install @@ -0,0 +1,2 @@ +usr/lib/libgpp4.so.* +usr/share/gpp4 --- gpp4-1.3.0.orig/debian/copyright +++ gpp4-1.3.0/debian/copyright @@ -0,0 +1,72 @@ +X-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat +X-Debianized-By: Morten Kjeldgaard +X-Debianized-Date: Thu, 9 Aug 2007 18:26:38 +0200. +X-Source-Downloaded-From: ftp://ftp.bioxray.au.dk/pub/mok/src +X-Upstream-Author: Morten Kjeldgaard + +Files: src/* +Copyright: © 2001 CCLRC (Central Laboratory of the Research Councils) + © 2001 Charles Ballard + © 2001-2003 Martyn Winn + © 2001 Eugene Krissinel + © 2001, 2003 Peter Briggs + © 2002 Kevin Cowtan + © 2005 Ralf Grosse-Kunstleve + © 2005 Paul Emsley + © 2007-2010 Morten Kjeldgaard +License: LGPL-2+ + This package is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + . + You should have received a copy of the GNU Lesser General Public + License along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +Files: data/* +Copyright: © 2001-2007 CCLRC (Central Laboratory of the Research Councils) +License: LGPL-2+ + +Files: debian/*, configure.ac, */Makefile.am, test/* +Copyright: © 2007, Morten Kjeldgaard +License: LGPL-2+ + +Files: config/config.guess, config/config.sub, config/depcomp, config/ltmain.sh, + config/missing, aclocal.m4 +Copyright: © 1992-2004 Free Software Foundation, Inc. + © 1996 Gordon Matzigkeit , 1996 +License: GPL-2+ + +Files: config/install-sh +Copyright: © 1994 X Consortium +License: MIT + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to + deal in the Software without restriction, including without limitation the + rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + sell copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- + TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + . + Except as contained in this notice, the name of the X Consortium shall not + be used in advertising or otherwise to promote the sale, use or other deal- + ings in this Software without prior written authorization from the X Consor- + tium. + +X-Comment: On Debian GNU/Linux systems, the complete text of the GNU Lesser + General Public License can be found in `/usr/share/common-licenses/LGPL-2.1'. --- gpp4-1.3.0.orig/debian/rules +++ gpp4-1.3.0/debian/rules @@ -0,0 +1,104 @@ +#!/usr/bin/make -f +# -*- mode: makefile; mode: font-lock -*- + +include /usr/share/quilt/quilt.make + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# Export DH_OPTIONS to save options for binary-common +export DH_OPTIONS + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 -D_REENTRANT +else + CFLAGS += -O2 -D_REENTRANT +endif + +config.status: patch configure + dh_testdir + ./configure --prefix=/usr + +build: build-arch + +build-arch: build-arch-stamp +build-arch-stamp: config.status + dh_testdir + + # Build the libary + $(MAKE) CFLAGS="$(CFLAGS)" + touch $@ + +# The build-indep target is called from install-indep only +# This is to avoid generating the doxygen docs in a -B build +build-indep: build-indep-stamp +build-indep-stamp: + dh_testdir + + # create the doxygen documentation + doxygen + touch $@ + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-arch-stamp build-indep-stamp + + # Clean up after the build process. + [ ! -f Makefile ] || $(MAKE) distclean + + # remove the doxygen-generated tree + rm -rf doc/ + + dh_clean + +install: install-indep install-arch + +install-indep: build-indep + +install-arch: + dh_testdir + dh_testroot + dh_clean -k + + # Install the compiled library in debian/tmp tree + $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install + dh_install -a --sourcedir=debian/tmp + +# Build architecture-independent packages +binary-indep: build-indep install-indep + dh_testdir + dh_testroot + # Now call make recursively to execute the common bits + $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common + +# Build architecture-dependent package +binary-arch: build-arch install-arch + dh_testdir + dh_testroot + dh_strip + dh_makeshlibs + dh_shlibdeps + # Now call make recursively to execute the common bits + $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common + +# These are the debhelpers common to both indep and arch-dependent +binary-common: + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_compress + dh_fixperms + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch + +.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch build-indep build-indep-stamp build-arch build-arch-stamp + +#### --- gpp4-1.3.0.orig/debian/libgpp4f-0.install +++ gpp4-1.3.0/debian/libgpp4f-0.install @@ -0,0 +1,2 @@ +usr/lib/libgpp4f.so.* + --- gpp4-1.3.0.orig/debian/patches/series +++ gpp4-1.3.0/debian/patches/series @@ -0,0 +1 @@ +compiler-warnings --- gpp4-1.3.0.orig/debian/patches/compiler-warnings +++ gpp4-1.3.0/debian/patches/compiler-warnings @@ -0,0 +1,432 @@ +Description: Fix compiler warnings appearing in gcc 4.5 +Forwarded: yes +Author: Morten Kjeldgaard +Last-Update: 2011-01-13 + + +--- ubuntu.orig/src/cmtzlib.c ++++ ubuntu/src/cmtzlib.c +@@ -1233,7 +1233,7 @@ + for (j = 0; j < mtz->xtal[i]->nset; ++j) { + /* Loop over columns for each dataset */ + for (k = 0; k < mtz->xtal[i]->set[j]->ncol; ++k) { +- if (colin = mtz->xtal[i]->set[j]->col[k]->source) { ++ if ( (colin = mtz->xtal[i]->set[j]->col[k]->source) ) { + if (strcmp(mtz->xtal[i]->set[j]->col[k]->type,"Y") == 0 && + strcmp(mtz->xtal[i]->set[j]->col[k]->label,"M_ISYM") == 0) { + strcpy(clabs[colin - 1],"M/ISYM"); +@@ -1523,7 +1523,7 @@ + for (i = 0; i < mtz->nxtal; ++i) { + for (j = 0; j < mtz->xtal[i]->nset; ++j) { + for (k = 0; k < mtz->xtal[i]->set[j]->ncol; ++k) { +- if (colin = mtz->xtal[i]->set[j]->col[k]->source) { ++ if ( (colin = mtz->xtal[i]->set[j]->col[k]->source) ) { + if (mtz->refs_in_memory) { + adata[colin - 1] = mtz->xtal[i]->set[j]->col[k]->ref[iref-1]; + } else { +@@ -1597,7 +1597,7 @@ + adata[icol] = lookup[icol]->ref[iref-1]; + logmss[icol] = ccp4_ismnf(mtz, adata[icol]); + } else { +- if (colin = lookup[icol]->source) { ++ if ( (colin = lookup[icol]->source) ) { + adata[icol] = refldata[colin - 1]; + logmss[icol] = ccp4_ismnf(mtz, adata[icol]); + } else { +@@ -1665,7 +1665,7 @@ + printf(" * Title:\n\n"); + printf(" %s\n\n",mtz->title); + +- if (baseset = MtzSetLookup(mtz,"HKL_base/HKL_base")) { ++ if ( (baseset = MtzSetLookup(mtz,"HKL_base/HKL_base")) ) { + if ( MtzNumActiveColsInSet(baseset) || + MtzNbatchesInSet(mtz,baseset) ) { + printf(" * Base dataset:\n\n"); +@@ -1776,18 +1776,19 @@ + for (i = 0; i < mtz->nxtal; ++i) { + for (j = 0; j < mtz->xtal[i]->nset; ++j) { + for (k = 0; k < mtz->xtal[i]->set[j]->ncol; ++k) { +- if (mtz->xtal[i]->set[j]->col[k]->active) +- if (strcmp(mtz->xtal[i]->set[j]->col[k]->type,"Y") == 0 && +- strcmp(mtz->xtal[i]->set[j]->col[k]->label,"M_ISYM") == 0) { +- printf(" M/ISYM %2s %19.4f %19.4f %8d \n", +- mtz->xtal[i]->set[j]->col[k]->type, +- mtz->xtal[i]->set[j]->col[k]->min,mtz->xtal[i]->set[j]->col[k]->max, +- mtz->xtal[i]->set[j]->setid); +- } else { +- printf(" %-30s %2s %19.4f %19.4f %8d \n", +- mtz->xtal[i]->set[j]->col[k]->label,mtz->xtal[i]->set[j]->col[k]->type, +- mtz->xtal[i]->set[j]->col[k]->min,mtz->xtal[i]->set[j]->col[k]->max, +- mtz->xtal[i]->set[j]->setid); ++ if (mtz->xtal[i]->set[j]->col[k]->active) { ++ if (strcmp(mtz->xtal[i]->set[j]->col[k]->type,"Y") == 0 && ++ strcmp(mtz->xtal[i]->set[j]->col[k]->label,"M_ISYM") == 0) { ++ printf(" M/ISYM %2s %19.4f %19.4f %8d \n", ++ mtz->xtal[i]->set[j]->col[k]->type, ++ mtz->xtal[i]->set[j]->col[k]->min,mtz->xtal[i]->set[j]->col[k]->max, ++ mtz->xtal[i]->set[j]->setid); ++ } else { ++ printf(" %-30s %2s %19.4f %19.4f %8d \n", ++ mtz->xtal[i]->set[j]->col[k]->label,mtz->xtal[i]->set[j]->col[k]->type, ++ mtz->xtal[i]->set[j]->col[k]->min,mtz->xtal[i]->set[j]->col[k]->max, ++ mtz->xtal[i]->set[j]->setid); ++ } + } + } + } +@@ -2681,7 +2682,7 @@ + mtz->xtal[i]->cell[1],mtz->xtal[i]->cell[2],mtz->xtal[i]->cell[3], + mtz->xtal[i]->cell[4],mtz->xtal[i]->cell[5]); + MtzWhdrLine(fileout,65,hdrrec); +- if (xtl = MtzXtalLookup(mtz,"HKL_base")) ++ if ( (xtl = MtzXtalLookup(mtz,"HKL_base")) ) + for (j = 0; j < 6; ++j) + xtl->cell[j] = mtz->xtal[i]->cell[j]; + glob_cell_written=1; +@@ -2690,7 +2691,7 @@ + } + /* if no suitable cell found, then try HKL_base cell */ + if (!glob_cell_written) { +- if (xtl = MtzXtalLookup(mtz,"HKL_base")) { ++ if ( (xtl = MtzXtalLookup(mtz,"HKL_base")) ) { + sprintf(hdrrec,"CELL %9.4f %9.4f %9.4f %9.4f %9.4f %9.4f",xtl->cell[0], + xtl->cell[1],xtl->cell[2],xtl->cell[3],xtl->cell[4],xtl->cell[5]); + MtzWhdrLine(fileout,65,hdrrec); +--- ubuntu.orig/src/ccp4_program.c ++++ ubuntu/src/ccp4_program.c +@@ -44,7 +44,6 @@ + char *ccp4_prog_vers(const char *progvers) + { + static char programversion[MAXLEN_PROGVERSION]=""; +- int i; + + if (progvers) { + strncpy(programversion, progvers, MAXLEN_PROGVERSION); +--- ubuntu.orig/test/load_syminfo.c ++++ ubuntu/test/load_syminfo.c +@@ -24,7 +24,7 @@ + #include "ccp4_general.h" + #include "ccp4_program.h" + +-main () ++int main () + { + CCP4SPG *spg; + +@@ -38,6 +38,8 @@ + ccp4spg_print_epsilon_zones(spg); + ccp4spg_print_recip_spgrp(spg); + ccp4spg_print_recip_ops(spg); ++ ++ return 0; + } + + +--- ubuntu.orig/test/mtzhdr.c ++++ ubuntu/test/mtzhdr.c +@@ -23,6 +23,8 @@ + */ + + #include "cmtzlib.h" ++#include "ccp4_program.h" ++#include "ccp4_general.h" + #include + #include + +--- ubuntu.orig/test/checkarch.c ++++ ubuntu/test/checkarch.c +@@ -53,7 +53,7 @@ + + int process_file (char *fnam, int verbose) + { +- int stamp_loc; ++ int stamp_loc = 0; + union { + unsigned int i; + unsigned char mtstring[4]; +--- ubuntu.orig/test/maphdr.c ++++ ubuntu/test/maphdr.c +@@ -22,6 +22,8 @@ + */ + + #include "cmaplib.h" ++#include "ccp4_program.h" ++#include "ccp4_general.h" + + void maphdrout(CMMFile *map) + { +--- ubuntu.orig/src_f/ccp4_diskio_f.c ++++ ubuntu/src_f/ccp4_diskio_f.c +@@ -107,7 +107,7 @@ + (int *iunit, fpstr lognam, int lognam_len, fpstr atbuta, int atbuta_len)) + { + char *atbut2, *temp_lognam, *fname; +- int istat; ++ int istat = 0; + + atbut2 = ccp4_FtoCString(FTN_STR(atbuta), FTN_LEN(atbuta)); + +@@ -380,12 +380,13 @@ + (int *iunit, uint8 *buffer, int *nitems, int *result)) + { + *result = 0; +- if ( ccp4_file_read (_ioChannels[*iunit]->iobj, buffer, *nitems) != *nitems) ++ if ( ccp4_file_read (_ioChannels[*iunit]->iobj, buffer, *nitems) != *nitems) { + if ( ccp4_file_feof(_ioChannels[*iunit]->iobj) ) + *result = -1; + else + ccp4_signal(CCP4_ERRLEVEL(4) | CCP4_ERRNO(CIO_ReadFail), + "QREAD", NULL); ++ } + } + + /** +@@ -408,12 +409,13 @@ + (int *iunit, uint8* buffer, int *nitems, int *result)) + { + *result = 0; +- if ( ccp4_file_readint (_ioChannels[*iunit]->iobj, buffer, *nitems) != *nitems) ++ if ( ccp4_file_readint (_ioChannels[*iunit]->iobj, buffer, *nitems) != *nitems) { + if ( ccp4_file_feof(_ioChannels[*iunit]->iobj) ) + *result = -1; + else + ccp4_signal(CCP4_ERRLEVEL(4) | CCP4_ERRNO(CIO_ReadFail), + "QREADI", NULL); ++ } + } + + /** +@@ -436,12 +438,13 @@ + (int *iunit, uint8* buffer, int *nitems, int *result)) + { + *result = 0; +- if ( ccp4_file_readshort (_ioChannels[*iunit]->iobj, buffer, *nitems) != *nitems) ++ if ( ccp4_file_readshort (_ioChannels[*iunit]->iobj, buffer, *nitems) != *nitems) { + if ( ccp4_file_feof(_ioChannels[*iunit]->iobj) ) + *result = -1; + else + ccp4_signal(CCP4_ERRLEVEL(4) | CCP4_ERRNO(CIO_ReadFail), + "QREADI2", NULL); ++ } + } + + /** +@@ -464,12 +467,13 @@ + (int *iunit, uint8* buffer, int *nitems, int *result)) + { + *result = 0; +- if ( ccp4_file_readfloat (_ioChannels[*iunit]->iobj, buffer, *nitems) != *nitems) ++ if ( ccp4_file_readfloat (_ioChannels[*iunit]->iobj, buffer, *nitems) != *nitems) { + if ( ccp4_file_feof(_ioChannels[*iunit]->iobj) ) + *result = -1; + else + ccp4_signal(CCP4_ERRLEVEL(4) | CCP4_ERRNO(CIO_ReadFail), + "QREADR", NULL); ++ } + } + + /** +@@ -492,12 +496,13 @@ + (int *iunit, uint8* buffer, int *nitems, int *result)) + { + *result = 0; +- if ( ccp4_file_readcomp (_ioChannels[*iunit]->iobj, buffer, *nitems) != *nitems) ++ if ( ccp4_file_readcomp (_ioChannels[*iunit]->iobj, buffer, *nitems) != *nitems) { + if ( ccp4_file_feof(_ioChannels[*iunit]->iobj) ) + *result = -1; + else + ccp4_signal(CCP4_ERRLEVEL(4) | CCP4_ERRNO(CIO_ReadFail), + "QREADQ", NULL); ++ } + } + + /** +@@ -706,10 +711,12 @@ + log_name = strdup("diskio.dft"); + if (!(file_name = getenv(log_name))) + file_name = log_name; +- for ( *istrm = 1; *istrm == MAXFILES; *istrm++) +- if (!strcmp(file_name,_ioChannels[*istrm]->iobj->name)) break; ++ for ( *istrm = 1; *istrm < MAXFILES; *istrm++) { ++ if (!strcmp(file_name,_ioChannels[*istrm]->iobj->name)) ++ break; ++ } + } +- if (*istrm != MAXFILES) { ++ if (*istrm < MAXFILES) { + *length = ccp4_file_length(_ioChannels[*istrm]->iobj); + strncpy(FTN_STR(filename), _ioChannels[*istrm]->iobj->name, + MIN(strlen(_ioChannels[*istrm]->iobj->name), +--- ubuntu.orig/src_f/cmaplib_f.c ++++ ubuntu/src_f/cmaplib_f.c +@@ -227,8 +227,7 @@ + float sign = 1.0f, value = 0.0f, value2; + char *cp, *ptr_symchs = symchs_begin, ch; + int j,k; /* loop variables */ +- unsigned char Isep = FALSE; /* parsed seperator? * +-/ ++ unsigned char Isep = FALSE; /* parsed seperator? */ + + /* initialise and clear the relevant */ + /* use knowledge that are using [4][4] for rot */ +@@ -680,7 +679,7 @@ + + ioArray[ii] = (IOConvMap *) malloc(sizeof(IOConvMap)); + +- if ((ioArray[ii]->mapfile = ccp4_cmap_open(file, O_RDONLY)) == NULL) ++ if ((ioArray[ii]->mapfile = ccp4_cmap_open(file, O_RDONLY)) == NULL) { + if (!(*ifail)) { + ccp4_signal(CCP4_ERRLEVEL(3) | CMAP_ERRNO(CMERR_CantOpenFile), + "MRDHDS", NULL); +@@ -691,6 +690,7 @@ + *ifail = -1; + return ; + } ++ } + ioArray[ii]->ipc = *iunit; + ioArray[ii]->logname = strdup(temp_map); + +@@ -747,7 +747,7 @@ + + ioArray[ii] = (IOConvMap *) malloc(sizeof(IOConvMap)); + +- if ((ioArray[ii]->mapfile = ccp4_cmap_open(file, O_RDONLY)) == NULL) ++ if ((ioArray[ii]->mapfile = ccp4_cmap_open(file, O_RDONLY)) == NULL) { + if (!(*ifail)) { + ccp4_signal(CCP4_ERRLEVEL(3) | CMAP_ERRNO(CMERR_CantOpenFile), + "MRDHDS", NULL); +@@ -758,6 +758,7 @@ + *ifail = -1; + return; + } ++ } + ioArray[ii]->ipc = *iunit; + ioArray[ii]->logname = strdup(temp_map); + +@@ -1780,8 +1781,10 @@ + int ii,jj, nsym, i; + char symop[81]; + +- if ( (ii = GetChannel(*iunit)) == MAXFILES || !ioArray[ii]->mapfile +- || (jj = GetChannel(*ounit)) == MAXFILES || !ioArray[jj]->mapfile) ++ ii = GetChannel(*iunit); ++ jj = GetChannel(*ounit); ++ ++ if ( ii == MAXFILES || !ioArray[ii]->mapfile || jj == MAXFILES || !ioArray[jj]->mapfile) + ccp4_signal(CCP4_ERRLEVEL(4) | CMAP_ERRNO(CMERR_NoChannel), + "MSYCPY", NULL); + +@@ -1807,8 +1810,10 @@ + int ii,jj, nsym, i; + char symop[81]; + +- if ( (ii = GetChannel(*iunit)) == MAXFILES || !ioArray[ii]->mapfile +- || (jj = GetChannel(*ounit)) == MAXFILES || !ioArray[jj]->mapfile) ++ ii = GetChannel(*iunit); ++ jj = GetChannel(*ounit); ++ ++ if ( ii == MAXFILES || !ioArray[ii]->mapfile || jj == MAXFILES || !ioArray[jj]->mapfile) + ccp4_signal(CCP4_ERRLEVEL(4) | CMAP_ERRNO(CMERR_NoChannel), + "MSYCPY", NULL); + +--- ubuntu.orig/src_f/ccp4_general_f.c ++++ ubuntu/src_f/ccp4_general_f.c +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include "ccp4_errno.h" + #include "ccp4_fortran.h" + #include "ccp4_parser.h" +--- ubuntu.orig/src_f/cmtzlib_f.c ++++ ubuntu/src_f/cmtzlib_f.c +@@ -90,12 +90,12 @@ + static char user_label_out[MFILES][MCOLUMNS][2][31]; + static MTZCOL *collookup[MFILES][MCOLUMNS]; + static MTZCOL *collookup_out[MFILES][MCOLUMNS]; +-static int sortorder[MFILES][5] = {0}; ++static int sortorder[MFILES][5] = {{0},{0},{0},{0},{0}}; + static int logmss[MFILES][MCOLUMNS]; + static int ndatmss[MFILES]; + static MTZBAT *rbat[MFILES]; + static int nbatw[MFILES] = {0}; +-static double coefhkl[MFILES][6] = {0}; ++static double coefhkl[MFILES][6] = {{0},{0},{0},{0},{0},{0}}; + + /* MVS defaults to int and doesn't like it */ + #ifdef _MSC_VER +@@ -907,7 +907,7 @@ + int *isets, float *datcell, float *datwave, + int *ndatasets)) + { +- int i,j,k,x,d,iset; ++ int j,k,x,d,iset; + char cxname[64], cdname[64], cpname[64]; + int cisets; + float cdatcell[6], cdatwave; +@@ -1032,7 +1032,7 @@ + int *isets, float *datcell, float *datwave, + int *ndatasets)) + { +- int i,j,k,x,d,iset; ++ int j,k,x,d,iset; + char cxname[64], cdname[64], cpname[64]; + int cisets; + float cdatcell[6], cdatwave; +@@ -1092,7 +1092,7 @@ + fpstr dataset_name, int dataset_name_len, + int *isets, int *ndatasets)) + { +- int i,j,k,x,d,iset; ++ int j,k,x,d,iset; + char cxname[64], cdname[64], cpname[64]; + int cisets; + float cdatcell[6], cdatwave; +@@ -1199,7 +1199,7 @@ + (const int *mindx, float *resol, float adata[], ftn_logical *eof), + (const int *mindx, float *resol, float adata[], ftn_logical *eof)) + { +- int i,ieof,mcol,biomol,mindex; ++ int ieof,biomol,mindex; + + /* CMTZLIB_DEBUG(puts("CMTZLIB_F: LRREFF");) */ + +@@ -1714,7 +1714,7 @@ + for (i = 0; i < mtzdata[*mindx-1]->nxtal; ++i) + for (j = 0; j < mtzdata[*mindx-1]->xtal[i]->nset; ++j) + for (k = 0; k < mtzdata[*mindx-1]->xtal[i]->set[j]->ncol; ++k) +- if (icol = mtzdata[*mindx-1]->xtal[i]->set[j]->col[k]->source) ++ if ( (icol = mtzdata[*mindx-1]->xtal[i]->set[j]->col[k]->source) ) + collookup_out[*mindx-1][icol-1] = mtzdata[*mindx-1]->xtal[i]->set[j]->col[k]; + } + +@@ -2147,7 +2147,7 @@ + (const int *mindx, int *nlprgo, fpstr xname, fpstr dname, int *iappnd), + (const int *mindx, int *nlprgo, fpstr xname, int xname_len, + fpstr dname, int dname_len, int *iappnd)) +-{int i,j,k,istart; ++{int i,j,istart; + char *crystal_name; + char *dataset_name; + MTZSET *baseset=NULL; +--- ubuntu.orig/src_f/library_f.c ++++ ubuntu/src_f/library_f.c +@@ -111,7 +111,7 @@ + + temp_name = ccp4_FtoCString(FTN_STR(str), FTN_LEN(str)); + +- if (*result = ccp4_utils_setenv (temp_name)) ++ if ( (*result = ccp4_utils_setenv (temp_name)) ) + ccp4_fatal("USTENV/CCP4_SETENV: Memory allocation failure"); + free(temp_name); + } +@@ -222,7 +222,7 @@ + (int) sizeof (int), /* 5: not used */ + (int) sizeof (int) /* 6: integers */ + }; +- int i, size, *leng[13]; ++ int i, size = 0, *leng[13]; + void *pointer[13]; + + for (i=0; i<*n; i++) {