← Back to branch summary

~ubuntu-branches/ubuntu/utopic/openvpn/utopic-proposed

« back to all changes in this revision

Viewing changes to install-win32/Makefile.in

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2011-12-31 04:55:56 UTC
  • mfrom: (1.1.18) (10.2.16 sid)
  • Revision ID: package-import@ubuntu.com-20111231045556-3fwmrbggevr9iqxd
Tags: 2.2.1-3ubuntu1
https://launchpad.net/bugs/794916
* Merge from Debian testing.  Remaining changes:
 + debian/openvpn.init.d:
    - Do not use start-stop-daemon and </dev/null to avoid blocking boot.
    - Show per-VPN result messages.
    - Add "--script-security 2" by default for backwards compatabliity.
  + debian/control: Add lsb-base >= 3.2-14 to allow status_of_proc()
  + debian/update-resolv-conf: Support multiple domains.
  + fix bug where '--script-security 2' would be passed for all
    daemons after the first. (LP: #794916)

Show diffs side-by-side

added added

removed removed

Lines of Context:
install-win32/Makefile.in
221
221
@WIN32_TRUE@nodist_doc_DATA = tmp/license.txt
222
222
@WIN32_TRUE@confdir = $(win32datadir)/config
223
223
@WIN32_TRUE@nodist_conf_DATA = \
224
 
@WIN32_TRUE@    tmp/openssl.cnf.sample \
 
224
@WIN32_TRUE@    tmp/openssl-1.0.0.cnf \
225
225
@WIN32_TRUE@    tmp/client.ovpn \
226
226
@WIN32_TRUE@    tmp/server.ovpn
227
227
 
542
542
@WIN32_TRUE@tmp/license.txt:    tmp $(top_srcdir)/COPYING $(top_srcdir)/COPYRIGHT.GPL
543
543
@WIN32_TRUE@    cat $(top_srcdir)/COPYING $(top_srcdir)/COPYRIGHT.GPL > tmp/license.txt
544
544
 
545
 
@WIN32_TRUE@tmp/openssl.cnf.sample:     tmp $(top_srcdir)/easy-rsa/2.0/openssl.cnf
546
 
@WIN32_TRUE@    cp $(top_srcdir)/easy-rsa/2.0/openssl.cnf tmp/openssl.cnf.sample
 
545
@WIN32_TRUE@tmp/openssl-1.0.0.cnf:      tmp $(top_srcdir)/easy-rsa/2.0/openssl-1.0.0.cnf
 
546
@WIN32_TRUE@    cp $(top_srcdir)/easy-rsa/2.0/openssl-1.0.0.cnf tmp/openssl-1.0.0.cnf
547
547
 
548
548
@WIN32_TRUE@clean-local:
549
549
@WIN32_TRUE@    -rm -fr tmp