Version 1.3.6

diff --git a/configure.ac b/configure.ac
index 95e4f58..bb74225 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl This file is part of YAZ proxy
 dnl See the file LICENSE for details.
 AC_PREREQ(2.60)
-AC_INIT([yazproxy],[1.3.5],[adam@indexdata.dk])
+AC_INIT([yazproxy],[1.3.6],[adam@indexdata.dk])
 AC_CONFIG_SRCDIR(configure.ac)
 AC_CONFIG_AUX_DIR([config])
 AM_INIT_AUTOMAKE([1.9])
@@ -37,5 +37,4 @@ AC_OUTPUT([
        doc/common/Makefile
        doc/common/print.dsl
        etc/Makefile
-       yazproxy.spec
 ])

diff --git a/debian/changelog b/debian/changelog
index d0f3cf1..57e8676 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+yazproxy (1.3.6-1indexdata) unstable; urgency=low
+
+  * Upstream.
+
+ -- Adam Dickmeiss <adam@indexdata.dk>  Thu, 10 Feb 2011 10:28:01 +0100
+
 yazproxy (1.3.5-1indexdata) unstable; urgency=low
 
   * Upstream.

diff --git a/doc/entities.ent b/doc/entities.ent
index b645a4d..4bdb74a 100644 (file)
--- a/doc/entities.ent
+++ b/doc/entities.ent
@@ -4,4 +4,4 @@
 <!ENTITY chap-reference SYSTEM "reference.xml">
 <!ENTITY yaz-proxy-ref SYSTEM "yaz-proxy-ref.xml">
 <!ENTITY app-license SYSTEM "license.xml">
-<!ENTITY copyright-year "1998-2009">
+<!ENTITY copyright-year "1998-2011">

diff --git a/include/yazproxy/bw.h b/include/yazproxy/bw.h
index 6a3d57a..d7ca7e3 100644 (file)
--- a/include/yazproxy/bw.h
+++ b/include/yazproxy/bw.h
@@ -1,5 +1,5 @@
 /* This file is part of YAZ proxy
-   Copyright (C) 1998-2009 Index Data
+   Copyright (C) 1998-2011 Index Data
 
 YAZ proxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/include/yazproxy/limit-connect.h b/include/yazproxy/limit-connect.h
index 454ba15..0ba8fc1 100644 (file)
--- a/include/yazproxy/limit-connect.h
+++ b/include/yazproxy/limit-connect.h
@@ -1,5 +1,5 @@
 /* This file is part of YAZ proxy
-   Copyright (C) 1998-2009 Index Data
+   Copyright (C) 1998-2011 Index Data
 
 YAZ proxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/include/yazproxy/module.h b/include/yazproxy/module.h
index d238925..46b5bb9 100644 (file)
--- a/include/yazproxy/module.h
+++ b/include/yazproxy/module.h
@@ -1,5 +1,5 @@
 /* This file is part of YAZ proxy
-   Copyright (C) 1998-2009 Index Data
+   Copyright (C) 1998-2011 Index Data
 
 YAZ proxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/include/yazproxy/proxy.h b/include/yazproxy/proxy.h
index b44b42b..c5021f9 100644 (file)
--- a/include/yazproxy/proxy.h
+++ b/include/yazproxy/proxy.h
@@ -1,5 +1,5 @@
 /* This file is part of YAZ proxy
-   Copyright (C) 1998-2009 Index Data
+   Copyright (C) 1998-2011 Index Data
 
 YAZ proxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/cdetails.cpp b/src/cdetails.cpp
index 7a024a6..260676a 100644 (file)
--- a/src/cdetails.cpp
+++ b/src/cdetails.cpp
@@ -1,5 +1,5 @@
 /* This file is part of YAZ proxy
-   Copyright (C) 1998-2009 Index Data
+   Copyright (C) 1998-2011 Index Data
 
 YAZ proxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/charset-converter.cpp b/src/charset-converter.cpp
index 6eb31c9..9ca704f 100644 (file)
--- a/src/charset-converter.cpp
+++ b/src/charset-converter.cpp
@@ -1,5 +1,5 @@
 /* This file is part of YAZ proxy
-   Copyright (C) 1998-2009 Index Data
+   Copyright (C) 1998-2011 Index Data
 
 YAZ proxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/limit-connect.cpp b/src/limit-connect.cpp
index 2473c3d..7e5a1f5 100644 (file)
--- a/src/limit-connect.cpp
+++ b/src/limit-connect.cpp
@@ -1,5 +1,5 @@
 /* This file is part of YAZ proxy
-   Copyright (C) 1998-2009 Index Data
+   Copyright (C) 1998-2011 Index Data
 
 YAZ proxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/mod_helsinki.cpp b/src/mod_helsinki.cpp
index bf96b67..aa3a1cf 100644 (file)
--- a/src/mod_helsinki.cpp
+++ b/src/mod_helsinki.cpp
@@ -1,5 +1,5 @@
 /* This file is part of YAZ proxy
-   Copyright (C) 1998-2009 Index Data
+   Copyright (C) 1998-2011 Index Data
 
 YAZ proxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/mod_sample.cpp b/src/mod_sample.cpp
index eebdf32..e0ee158 100644 (file)
--- a/src/mod_sample.cpp
+++ b/src/mod_sample.cpp
@@ -1,5 +1,5 @@
 /* This file is part of YAZ proxy
-   Copyright (C) 1998-2009 Index Data
+   Copyright (C) 1998-2011 Index Data
 
 YAZ proxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/modules.cpp b/src/modules.cpp
index 689b40d..bd7452f 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -1,5 +1,5 @@
 /* This file is part of YAZ proxy
-   Copyright (C) 1998-2009 Index Data
+   Copyright (C) 1998-2011 Index Data
 
 YAZ proxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/msg-thread.cpp b/src/msg-thread.cpp
index 2dfd652..5497aff 100644 (file)
--- a/src/msg-thread.cpp
+++ b/src/msg-thread.cpp
@@ -1,5 +1,5 @@
 /* This file is part of YAZ proxy
-   Copyright (C) 1998-2009 Index Data
+   Copyright (C) 1998-2011 Index Data
 
 YAZ proxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/msg-thread.h b/src/msg-thread.h
index 4cca183..e17307a 100644 (file)
--- a/src/msg-thread.h
+++ b/src/msg-thread.h
@@ -1,5 +1,5 @@
 /* This file is part of YAZ proxy
-   Copyright (C) 1998-2009 Index Data
+   Copyright (C) 1998-2011 Index Data
 
 YAZ proxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/proxyp.h b/src/proxyp.h
index 96db01e..c4569c3 100644 (file)
--- a/src/proxyp.h
+++ b/src/proxyp.h
@@ -1,5 +1,5 @@
 /* This file is part of YAZ proxy
-   Copyright (C) 1998-2009 Index Data
+   Copyright (C) 1998-2011 Index Data
 
 YAZ proxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/t-server.cpp b/src/t-server.cpp
index df39889..d53cbe4 100644 (file)
--- a/src/t-server.cpp
+++ b/src/t-server.cpp
@@ -1,5 +1,5 @@
 /* This file is part of YAZ proxy
-   Copyright (C) 1998-2009 Index Data
+   Copyright (C) 1998-2011 Index Data
 
 YAZ proxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/tstthreads.cpp b/src/tstthreads.cpp
index 8ca9648..2946886 100644 (file)
--- a/src/tstthreads.cpp
+++ b/src/tstthreads.cpp
@@ -1,5 +1,5 @@
 /* This file is part of YAZ proxy
-   Copyright (C) 1998-2009 Index Data
+   Copyright (C) 1998-2011 Index Data
 
 YAZ proxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/yaz-bw.cpp b/src/yaz-bw.cpp
index 4c99d76..92d73f7 100644 (file)
--- a/src/yaz-bw.cpp
+++ b/src/yaz-bw.cpp
@@ -1,5 +1,5 @@
 /* This file is part of YAZ proxy
-   Copyright (C) 1998-2009 Index Data
+   Copyright (C) 1998-2011 Index Data
 
 YAZ proxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/yaz-proxy-config.cpp b/src/yaz-proxy-config.cpp
index 47b79b5..55e39ac 100644 (file)
--- a/src/yaz-proxy-config.cpp
+++ b/src/yaz-proxy-config.cpp
@@ -1,5 +1,5 @@
 /* This file is part of YAZ proxy
-   Copyright (C) 1998-2009 Index Data
+   Copyright (C) 1998-2011 Index Data
 
 YAZ proxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/yaz-proxy-main.cpp b/src/yaz-proxy-main.cpp
index 37441ad..bde5b70 100644 (file)
--- a/src/yaz-proxy-main.cpp
+++ b/src/yaz-proxy-main.cpp
@@ -1,5 +1,5 @@
 /* This file is part of YAZ proxy
-   Copyright (C) 1998-2009 Index Data
+   Copyright (C) 1998-2011 Index Data
 
 YAZ proxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp
index 930f7c2..bd50ebd 100644 (file)
--- a/src/yaz-proxy.cpp
+++ b/src/yaz-proxy.cpp
@@ -1,5 +1,5 @@
 /* This file is part of YAZ proxy
-   Copyright (C) 1998-2009 Index Data
+   Copyright (C) 1998-2011 Index Data
 
 YAZ proxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/src/yaz-usemarcon.cpp b/src/yaz-usemarcon.cpp
index 72dd3dc..8d8c715 100644 (file)
--- a/src/yaz-usemarcon.cpp
+++ b/src/yaz-usemarcon.cpp
@@ -1,5 +1,5 @@
 /* This file is part of YAZ proxy
-   Copyright (C) 1998-2009 Index Data
+   Copyright (C) 1998-2011 Index Data
 
 YAZ proxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

diff --git a/win/makefile b/win/makefile
index 0f2aea3..b094e4e 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2008 Index Data
+# Copyright (C) 1998-2011 Index Data
 # All rights reserved.
 
 ###########################################################

diff --git a/yazproxy.spec.in b/yazproxy.spec.in
deleted file mode 100644 (file)
index 034e8e3..0000000
--- a/yazproxy.spec.in
+++ /dev/null
@@ -1,70 +0,0 @@
-Summary: yazproxy
-Name: yazproxy
-Version: @VERSION@
-Release: 1
-License: GPL
-Group: Applications/Internet
-Vendor: Index Data ApS <info@indexdata.dk>
-Source: yazproxy-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: libyazpp4-devel
-Packager: Adam Dickmeiss <adam@indexdata.dk>
-URL: http://www.indexdata.dk/yazproxy/
-
-%description
-YAZ Proxy application
-
-%package -n libyazproxy2
-Summary: YAZ Proxy libraries
-Group: Libraries
-Requires: libyazpp4
-
-%description -n libyazproxy2
-YAZ Proxy libraries
-
-%package -n libyazproxy2-devel
-Summary: YAZ Proxy development libraries
-Group: Development/Libraries
-Requires: libyazproxy2 = %{version} libyazpp4-devel
-
-%description -n libyazproxy2-devel
-Development libraries and include files for the YAZ proxy.
-
-%prep
-%setup
-
-%build
-
-CFLAGS="$RPM_OPT_FLAGS" \
- ./configure --prefix=%{_prefix} --libdir=%{_libdir} --mandir=%{_mandir} \
-       --enable-shared --with-yazpp=/usr/bin
-make CFLAGS="$RPM_OPT_FLAGS"
-
-%install
-rm -fr ${RPM_BUILD_ROOT}
-make prefix=${RPM_BUILD_ROOT}/%{_prefix} mandir=${RPM_BUILD_ROOT}/%{_mandir} \
-       libdir=${RPM_BUILD_ROOT}/%{_libdir} install
-rm ${RPM_BUILD_ROOT}/%{_libdir}/*.la
-
-%clean
-rm -fr ${RPM_BUILD_ROOT}
-
-%files
-%defattr(-,root,root)
-%doc README LICENSE
-%{_bindir}/yazproxy
-%{_mandir}/man8/yazproxy.*
-%{_datadir}/yazproxy
-%{_datadir}/doc/yazproxy
-
-%files -n libyazproxy2
-%defattr(-,root,root)
-%{_libdir}/*.so.*
-%{_libdir}/yazproxy
-
-%files -n libyazproxy2-devel
-%defattr(-,root,root)
-%{_includedir}/yazproxy
-%{_libdir}/*.so
-%{_libdir}/*.a
-