versions of ".example" to the original as mandated by RFC 2606.
* Convert de.po from ISO-8859-1 to UTF-8.
* debian/control: change my email address.
+ * Switch patch system from dpatch to quilt.
-- gregor herrmann <gregoa@debian.org> Wed, 28 May 2008 19:15:50 +0200
Priority: extra
Maintainer: gregor herrmann <gregoa@debian.org>
Uploaders: tony mancill <tmancill@debian.org>
-Build-Depends: debhelper (>= 6), po-debconf, zlib1g-dev, dpatch, check
+Build-Depends: debhelper (>= 6), po-debconf, zlib1g-dev, quilt (>= 0.40), check
Standards-Version: 3.7.3
Homepage: http://code.kryo.se/iodine
Vcs-Svn: http://svn.toastfreeware.priv.at/debian/iodine/trunk/
+++ /dev/null
-01_mandir
-02_make
-03_cflags
-04_base64
+++ /dev/null
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_mandir.dpatch by <gregor+debian@comodo.priv.at>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: escape - in manpage
-
-@DPATCH@
-diff -urNad iodine~/man/iodine.8 iodine/man/iodine.8
---- iodine~/man/iodine.8 2007-12-01 01:54:27.000000000 +0100
-+++ iodine/man/iodine.8 2007-12-01 01:54:39.000000000 +0100
-@@ -124,13 +124,13 @@
- .TP
- Try it out within your own LAN! Follow these simple steps:
- .TP
--- On your server, run: ./iodined -f 10.0.0.1 test.asdf
-+- On your server, run: ./iodined \-f 10.0.0.1 test.asdf
- (If you already use the 10.0.0.0 network, use another internal net like
- 172.16.0.0)
- .TP
- - Enter a password
- .TP
--- On the client, run: ./iodine -f 192.168.0.1 test.asdf
-+- On the client, run: ./iodine \-f 192.168.0.1 test.asdf
- (Replace 192.168.0.1 with the server's ip address)
- .TP
- - Enter the same password
-@@ -160,10 +160,10 @@
- Now any DNS querys for domains ending with tunnel1.mytunnnel.com will be sent
- to your server. Start iodined on the server. The first argument is the tunnel
- IP address (like 192.168.99.1) and the second is the assigned domain (in this
--case tunnel1.mytunnel.com). The -f argument will keep iodined running in the
-+case tunnel1.mytunnel.com). The \-f argument will keep iodined running in the
- foreground, which helps when testing. iodined will start a virtual interface,
- and also start listening for DNS queries on UDP port 53. Either enter a
--password on the commandline (-P pass) or after the server has started. Now
-+password on the commandline (\-P pass) or after the server has started. Now
- everything is ready for the client.
- .TP
- .B Client side:
--- /dev/null
+Author: <gregor+debian@comodo.priv.at>
+Description: escape - in manpage
+--- iodine.orig/man/iodine.8
++++ iodine/man/iodine.8
+@@ -124,13 +124,13 @@
+ .TP
+ Try it out within your own LAN! Follow these simple steps:
+ .TP
+-- On your server, run: ./iodined -f 10.0.0.1 test.asdf
++- On your server, run: ./iodined \-f 10.0.0.1 test.asdf
+ (If you already use the 10.0.0.0 network, use another internal net like
+ 172.16.0.0)
+ .TP
+ - Enter a password
+ .TP
+-- On the client, run: ./iodine -f 192.168.0.1 test.asdf
++- On the client, run: ./iodine \-f 192.168.0.1 test.asdf
+ (Replace 192.168.0.1 with the server's ip address)
+ .TP
+ - Enter the same password
+@@ -160,10 +160,10 @@
+ Now any DNS querys for domains ending with tunnel1.mytunnnel.com will be sent
+ to your server. Start iodined on the server. The first argument is the tunnel
+ IP address (like 192.168.99.1) and the second is the assigned domain (in this
+-case tunnel1.mytunnel.com). The -f argument will keep iodined running in the
++case tunnel1.mytunnel.com). The \-f argument will keep iodined running in the
+ foreground, which helps when testing. iodined will start a virtual interface,
+ and also start listening for DNS queries on UDP port 53. Either enter a
+-password on the commandline (-P pass) or after the server has started. Now
++password on the commandline (\-P pass) or after the server has started. Now
+ everything is ready for the client.
+ .TP
+ .B Client side:
+++ /dev/null
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_make.dpatch by <gregor+debian@comodo.priv.at>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Always use $(MAKE)
-
-@DPATCH@
-diff -urNad iodine~/Makefile iodine/Makefile
---- iodine~/Makefile 2007-12-01 01:54:27.000000000 +0100
-+++ iodine/Makefile 2007-12-01 02:22:04.000000000 +0100
-@@ -35,7 +35,7 @@
- test: all
- @echo "!! The check library is required for compiling and running the tests"
- @echo "!! Get it at http://check.sf.net"
-- @(cd tests; make all)
-+ @(cd tests; $(MAKE) all)
-
- clean:
- @echo "Cleaning..."
--- /dev/null
+Author: <gregor+debian@comodo.priv.at>
+Description: Always use $(MAKE)
+--- iodine.orig/Makefile
++++ iodine/Makefile
+@@ -35,7 +35,7 @@
+ test: all
+ @echo "!! The check library is required for compiling and running the tests"
+ @echo "!! Get it at http://check.sf.net"
+- @(cd tests; make all)
++ @(cd tests; $(MAKE) all)
+
+ clean:
+ @echo "Cleaning..."
+++ /dev/null
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_cflags.dpatch by <gregor+debian@comodo.priv.at>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Combine upstream CFLAGS with CFLAGS from debian/rules.
-
-@DPATCH@
-diff -urNad iodine~/src/Makefile iodine/src/Makefile
---- iodine~/src/Makefile 2008-02-05 17:26:08.000000000 +0100
-+++ iodine/src/Makefile 2008-02-05 17:27:44.000000000 +0100
-@@ -9,7 +9,7 @@
- ARCH = `uname -m`
-
- LDFLAGS = -lz
--CFLAGS = -c -g -Wall -D$(OS) -pedantic
-+CFLAGS += -c -D$(OS) -pedantic
-
- all: stateos $(CLIENT) $(SERVER) $(TESTSUITE)
-
-diff -urNad iodine~/tests/Makefile iodine/tests/Makefile
---- iodine~/tests/Makefile 2008-02-04 17:30:39.000000000 +0100
-+++ iodine/tests/Makefile 2008-02-05 17:27:55.000000000 +0100
-@@ -6,7 +6,7 @@
- OS = `uname | tr "a-z" "A-Z"`
-
- LDFLAGS = -L/usr/local/lib -lcheck
--CFLAGS = -g -Wall -D$(OS) -I../src -I/usr/local/include -pedantic
-+CFLAGS += -D$(OS) -I../src -I/usr/local/include -pedantic
-
- all: $(TEST)
- @./$(TEST)
--- /dev/null
+Author: <gregor+debian@comodo.priv.at>
+Description: Combine upstream CFLAGS with CFLAGS from debian/rules.
+--- iodine.orig/src/Makefile
++++ iodine/src/Makefile
+@@ -9,7 +9,7 @@
+ ARCH = `uname -m`
+
+ LDFLAGS = -lz
+-CFLAGS = -c -g -Wall -D$(OS) -pedantic
++CFLAGS += -c -D$(OS) -pedantic
+
+ all: stateos $(CLIENT) $(SERVER) $(TESTSUITE)
+
+--- iodine.orig/tests/Makefile
++++ iodine/tests/Makefile
+@@ -6,7 +6,7 @@
+ OS = `uname | tr "a-z" "A-Z"`
+
+ LDFLAGS = -L/usr/local/lib -lcheck
+-CFLAGS = -g -Wall -D$(OS) -I../src -I/usr/local/include -pedantic
++CFLAGS += -D$(OS) -I../src -I/usr/local/include -pedantic
+
+ all: $(TEST)
+ @./$(TEST)
+++ /dev/null
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_base64.dpatch by <gregor+debian@comodo.priv.at>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Don't build/test base64.*; causes a build failure on hppa,
-## DP: and isn't used anyway.
-
-@DPATCH@
-diff -urNad iodine~/src/Makefile iodine/src/Makefile
---- iodine~/src/Makefile 2008-03-01 18:52:44.000000000 +0100
-+++ iodine/src/Makefile 2008-03-01 18:53:00.000000000 +0100
-@@ -1,5 +1,5 @@
- CC = gcc
--COMMONOBJS = tun.o dns.o read.o encoding.o login.o base32.o base64.o md5.o common.o
-+COMMONOBJS = tun.o dns.o read.o encoding.o login.o base32.o md5.o common.o
- CLIENTOBJS = iodine.o
- CLIENT = ../bin/iodine
- SERVEROBJS = iodined.o user.o
-diff -urNad iodine~/tests/Makefile iodine/tests/Makefile
---- iodine~/tests/Makefile 2008-03-01 18:52:44.000000000 +0100
-+++ iodine/tests/Makefile 2008-03-01 18:53:37.000000000 +0100
-@@ -1,7 +1,7 @@
- CC = gcc
- TEST = test
--OBJS = test.o base32.o base64.o read.o dns.o encoding.o login.o user.o
--SRCOBJS = ../src/base32.o ../src/base64.o ../src/read.o ../src/dns.o ../src/encoding.o ../src/login.o ../src/md5.o ../src/user.o
-+OBJS = test.o base32.o read.o dns.o encoding.o login.o user.o
-+SRCOBJS = ../src/base32.o ../src/read.o ../src/dns.o ../src/encoding.o ../src/login.o ../src/md5.o ../src/user.o
-
- OS = `uname | tr "a-z" "A-Z"`
-
-diff -urNad iodine~/tests/test.c iodine/tests/test.c
---- iodine~/tests/test.c 2007-12-01 01:43:06.000000000 +0100
-+++ iodine/tests/test.c 2008-03-01 18:53:46.000000000 +0100
-@@ -49,9 +49,6 @@
- test = test_base32_create_tests();
- suite_add_tcase(iodine, test);
-
-- test = test_base64_create_tests();
-- suite_add_tcase(iodine, test);
--
- test = test_dns_create_tests();
- suite_add_tcase(iodine, test);
-
--- /dev/null
+Author: <gregor+debian@comodo.priv.at>
+Description: Don't build/test base64.*; causes a build failure on hppa,
+and isn't used anyway.
+--- iodine.orig/src/Makefile
++++ iodine/src/Makefile
+@@ -1,5 +1,5 @@
+ CC = gcc
+-COMMONOBJS = tun.o dns.o read.o encoding.o login.o base32.o base64.o md5.o common.o
++COMMONOBJS = tun.o dns.o read.o encoding.o login.o base32.o md5.o common.o
+ CLIENTOBJS = iodine.o
+ CLIENT = ../bin/iodine
+ SERVEROBJS = iodined.o user.o
+--- iodine.orig/tests/Makefile
++++ iodine/tests/Makefile
+@@ -1,7 +1,7 @@
+ CC = gcc
+ TEST = test
+-OBJS = test.o base32.o base64.o read.o dns.o encoding.o login.o user.o
+-SRCOBJS = ../src/base32.o ../src/base64.o ../src/read.o ../src/dns.o ../src/encoding.o ../src/login.o ../src/md5.o ../src/user.o
++OBJS = test.o base32.o read.o dns.o encoding.o login.o user.o
++SRCOBJS = ../src/base32.o ../src/read.o ../src/dns.o ../src/encoding.o ../src/login.o ../src/md5.o ../src/user.o
+
+ OS = `uname | tr "a-z" "A-Z"`
+
+--- iodine.orig/tests/test.c
++++ iodine/tests/test.c
+@@ -49,9 +49,6 @@
+ test = test_base32_create_tests();
+ suite_add_tcase(iodine, test);
+
+- test = test_base64_create_tests();
+- suite_add_tcase(iodine, test);
+-
+ test = test_dns_create_tests();
+ suite_add_tcase(iodine, test);
+
--- /dev/null
+01_mandir.patch
+02_make.patch
+03_cflags.patch
+04_base64.patch
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
CFLAGS = -Wall -g
endif
configure: configure-stamp
-configure-stamp: $(DPATCH_STAMPFN)
+configure-stamp: $(QUILT_STAMPFN)
dh_testdir
touch $@
ToastFreeware / debian / iodine.git / commitdiff