Your message dated Thu, 23 Jan 2020 00:25:55 +1100 with message-id <2386128.0F9uS2zy5T@simurgh> and subject line Re: Bug#949458: liggghts: git repo does not contain correct source and is not buildable has caused the Debian Bug report #949458, regarding liggghts: git repo does not contain correct source and is not buildable to be marked as done.
This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact [email protected] immediately.) -- 949458: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=949458 Debian Bug Tracking System Contact [email protected] with problems
--- Begin Message ---Source: liggghts Version: 3.8.0+repack1-1 Severity: important Dear Maintainer, The current git master branch is not descended from the upstream branch and, worse, has lots of merge conflicts committed to the tree. The solution appears to be to do a synthetic merge of the upstream branch into the current master and ensure that everything outside of the debian directory comes only from the upstream branch. The git history will not match the archive reality, but at least git will be buildable and the next upstream update has a chance of being applied. I'll attempt to do this later. Stuart Fix up incorrect merge of previous upstream release src/atom_vec_ellipsoid.cpp | 6 - src/atom_vec_sphere.cpp | 3 - src/comm.cpp | 15 -- src/comm.h | 3 - src/comm_I.h | 16 -- src/compute_erotate_sphere.cpp | 3 - src/container_base.cpp | 18 -- src/container_base.h | 8 - src/domain.cpp | 4 - src/domain.h | 25 -- src/fix_ave_spatial.cpp | 73 ------ src/fix_cfd_coupling_force_implicit.cpp | 35 --- src/fix_massflow_mesh.cpp | 16 -- src/fix_mesh_surface_stress_servo.cpp | 878 -------------------------------------------------------------------- src/fix_neighlist_mesh.cpp | 5 - src/fix_property_atom_tracer.cpp | 5 - src/general_container.h | 5 - src/general_container_I.h | 67 ------ src/lammps.cpp | 6 - src/modify_liggghts.cpp | 17 -- src/multi_vector_container.h | 9 - src/neighbor.cpp | 8 - src/pair_gran_hooke.cpp | 267 --------------------- src/pair_gran_hooke_history.cpp | 826 ---------------------------------------------------------------- src/pair_hybrid.cpp | 20 -- src/pair_sph.cpp | 16 -- src/read_data.cpp | 36 --- src/scalar_container.h | 15 -- src/set.h | 4 - 29 files changed, 2409 deletions(-) -- System Information: Debian Release: 10.2 APT prefers stable-updates APT policy: (550, 'stable-updates'), (550, 'proposed-updates'), (550, 'stable'), (500, 'stable-debug'), (500, 'stable'), (60, 'unstable') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.19.0-6-amd64 (SMP w/4 CPU cores) Locale: LANG=en_AU.UTF-8, LC_CTYPE=en_AU.UTF-8 (charmap=UTF-8), LANGUAGE=en_AU:en (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled
--- End Message ---
--- Begin Message ---Version: 3.8.0+repack1-5 -- Stuart Prescott http://www.nanonanonano.net/ [email protected] Debian Developer http://www.debian.org/ [email protected] GPG fingerprint 90E2 D2C1 AD14 6A1B 7EBB 891D BBC1 7EBB 1396 F2F7
--- End Message ---
