/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to debian/rules

  • Committer: Teddy Hogeborn
  • Date: 2019-03-12 20:24:58 UTC
  • Revision ID: teddy@recompile.se-20190312202458-14d4f7bvc61kwp2l
mandos-ctl: Refactor

* mandos-ctl (milliseconds_to_string): Move to
  "PrintTableCmd.TableOfClients.milliseconds_to_string".
  (PrintTableCmd.TableOfClients.valuetostring): Change to a class
                                                method to be able to
                                                call
                                         cls.milliseconds_to_string().
  (TestCmd.other_client): Change "ApprovalDuration" to a more odd
                          value to compensate for the removal of
                          "Test_milliseconds_to_string", which
                          contained a test for this value.  All users
                          changed.
  (Test_milliseconds_to_string): Remove.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/rules
43
43
        dh_fixperms --exclude etc/mandos/clients.conf
44
44
 
45
45
override_dh_auto_test-arch: ;
 
46
 
 
47
#bpo## dpkg-shlibdeps sees the "libgnutls28-dev (>= 3.6.6) |
 
48
#bpo## libgnutls28-dev (<< 3.6.0)," in the build-dependencies not as two
 
49
#bpo## alternatives, but as an absolute dependency on libgnutls30 >= 3.6.6.
 
50
#bpo## So we have to do this ugly hack to hide this build dependency if we
 
51
#bpo## compiled with libgnutls30 << 3.6.0.
 
52
#bpo#override_dh_shlibdeps-arch:
 
53
#bpo#   -gnutls_version=$$(dpkg-query --showformat='$${Version}' \
 
54
#bpo#           --show libgnutls30); \
 
55
#bpo#   dpkg --compare-versions $$gnutls_version lt 3.6.0 \
 
56
#bpo#           && { cp --archive debian/control debian/control.orig; sed --expression='s/libgnutls28-dev (>= 3\.6\.6) |//' debian/control; }
 
57
#bpo#   dh_shlibdeps
 
58
#bpo#   -gnutls_version=$$(dpkg-query --showformat='$${Version}' \
 
59
#bpo#           --show libgnutls30); \
 
60
#bpo#   dpkg --compare-versions $$gnutls_version lt 3.6.0 \
 
61
#bpo#           && mv debian/control.orig debian/control