- If necessary, patch po/Makefile.in from po-Makefile.in.in.diff to

get DESTDIR installation (required to get locales installed
correctly).
- Use dh_perl to get accurate perl dependencies.

diff --git a/debian/changelog b/debian/changelog
index 6db75e92d13a79fd328b1c9999505389ba351510..fc2b8b8756ea365e5a90c3b5eb0adb0ebd39aa4b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
-tinc (1.0pre3-0.1) unstable; urgency=low
+tinc (1.0pre3-0.2) unstable; urgency=low
 
   * New upstream version (1.0pre3) (Closes: #71274).
   * Better Depends and Build-Depends lines.
   * Dropped dependencies on libgmp, added libssl.
   * doc-base.tinc: New file.
   * Deleted the file shlibs, as there on longer is a libblowfish.
+  * Patch po/Makefile.in.in from po-Makefile.in.in.diff if necessary.
+  * Use dh_perl to get accurate perl dependencies.
 
  -- Ivo Timmermans <ivo@debian.org>  Thu,  2 Nov 2000 16:53:52 +0100
 

diff --git a/debian/control b/debian/control
index 21b624c07b1dd821b76d9294bbb590ad2a4d0839..4938b7bbceb985ec6762509d4442679b0ef61086 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: libc6-dev, libssl095a-dev, autoconf (>= 2.12),
 
 Package: tinc
 Architecture: i386
-Depends: ${shlibs:Depends}, (libssl095a|libssl095|libssl09), perl5
+Depends: ${shlibs:Depends}, ${perl:Depends}
 Description: Virtual Private Network daemon
  tinc is a daemon with which you can create a virtual private network
  (VPN).  One daemon can handle multiple connections, so you can

diff --git a/debian/po-Makefile.in.in.diff b/debian/po-Makefile.in.in.diff
new file mode 100644 (file)
index 0000000..b33223a
--- /dev/null
+++ b/debian/po-Makefile.in.in.diff
@@ -0,0 +1,32 @@
+--- Makefile.in.in.orig        Thu Nov  2 20:02:58 2000
++++ Makefile.in.in     Thu Nov  2 23:25:42 2000
+@@ -24,6 +24,8 @@
+ gettextsrcdir = $(prefix)/share/gettext/po
+ subdir = po
+ 
++DESTDIR = 
++
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
+@@ -111,16 +113,16 @@
+ install-data-no: all
+ install-data-yes: all
+       if test -r "$(MKINSTALLDIRS)"; then \
+-        $(MKINSTALLDIRS) $(datadir); \
++        $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
+       else \
+-        $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
++        $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
+       fi
+       @catalogs='$(CATALOGS)'; \
+       for cat in $$catalogs; do \
+         cat=`basename $$cat`; \
+         case "$$cat" in \
+-          *.gmo) destdir=$(gnulocaledir);; \
+-          *)     destdir=$(localedir);; \
++          *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \
++          *)     destdir=$(DESTDIR)$(localedir);; \
+         esac; \
+         lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+         dir=$$destdir/$$lang/LC_MESSAGES; \

diff --git a/debian/rules b/debian/rules
index 397e998b3c8cfa9a24b063047d298e7c0881f686..421d544ba7584cb548d6eaaf26abd219a9ec627d 100644 (file)
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,12 @@ build: build-stamp
 build-stamp:
        dh_testdir
 
+#      # If the Makefile.in.in file in po/ already contains DESTDIR support, skip the patching.
+       cd `pwd`/po ; ( \
+         if ! grep DESTDIR Makefile.in.in > /dev/null ; then \
+           patch -Ns -p0 < `pwd`/../debian/po-Makefile.in.in.diff || true ;\
+         fi ;\
+       )
        ./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc
        $(MAKE)
 
@@ -36,7 +42,6 @@ install: build
        mkdir -p `pwd`/debian/tmp/etc/tinc/example
        cp doc/tinc.conf.sample `pwd`/debian/tmp/etc/tinc/example/tinc.conf
        ln -s /usr/share/doc/tinc/README.Debian `pwd`/debian/tmp/etc/tinc/example/README
-       rm -f `pwd`/debian/tmp/usr/lib/tinc/libblowfish.so
 
 
 # Build architecture-independent files here.
@@ -45,30 +50,20 @@ binary-indep: build install
 
 # Build architecture-dependent files here.
 binary-arch: build install
-#      dh_testversion
        dh_testdir
        dh_testroot
-#      dh_installdebconf       
        dh_installdocs
        dh_installexamples
-#      dh_installmenu
-#      dh_installemacsen
-#      dh_installpam
        dh_installinit
-#      dh_installcron
        dh_installmanpages
        dh_installinfo
-#      dh_undocumented
        dh_installchangelogs ChangeLog
        dh_link
        dh_strip
        dh_compress
        dh_fixperms
-#      # You may want to make some executables suid here.
-#      dh_suidregister
-#      dh_makeshlibs
        dh_installdeb
-#      dh_perl
+       dh_perl
        dh_shlibdeps
        dh_gencontrol
        dh_md5sums