update to latest upstream

And recompile for Debian Jessie

diff --git a/Makefile b/Makefile
index 6b57b00e9b615a667afdbdd45729644e2fe6881c..16caea89c24b2cd5ccc33cd75c8858ce17931e2d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,14 @@
-RELEASE=2.0
+RELEASE=4.0
 
-QBVERSION=0.10.1
-QBRELEASE=2
+QBVERSION=0.17.1
+QBRELEASE=1
 QBDIR=libqb-${QBVERSION}
 QBSRC=libqb-${QBVERSION}.orig.tar.gz
 
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
 DEBS=                                                                  \
-       libqb_${QBVERSION}-${QBRELEASE}_${ARCH}.deb                     \
+       libqb0_${QBVERSION}-${QBRELEASE}_${ARCH}.deb                    \
        libqb-dev_${QBVERSION}-${QBRELEASE}_${ARCH}.deb
 
 all: ${DEBS}

diff --git a/debian/changelog b/debian/changelog
index 36cf7d0c17d369b1696cc24cf77d77a94b3cfa39..720b758e66c978c7ce5aa6a620af8719fb40364a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libqb (0.17.1-1) unstable; urgency=medium
+
+  * update to latest upstream
+
+  * recompile for Debian Jessie
+  
+ -- root <root@elsa.maurer-it.com>  Mon, 23 Feb 2015 07:08:25 +0100
+
 libqb (0.10.1-2) unstable; urgency=low
 
   * update to latest upstream which includes the qb_log_filter_fn_set patch

diff --git a/debian/control b/debian/control
index e55057dd293d2e0d522b18c99f66a209e6b76010..19c5da11445e32bca5e667f5637f21045b13c315 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -9,13 +9,13 @@ Homepage: http://www.libqb.org
 Package: libqb-dev
 Section: libdevel
 Architecture: any
-Depends: pkg-config, libqb (= ${binary:Version})
+Depends: pkg-config, libqb0 (= ${binary:Version})
 Description: The Quarterback Client Server Developer Library
  This package contains include files and man pages used to develop using
  The Quarterback APIs.
  .
 
-Package: libqb
+Package: libqb0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}

diff --git a/debian/docs b/debian/docs
deleted file mode 100644 (file)
index c680186..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-coding_style.txt

diff --git a/debian/libqb-dev.install b/debian/libqb-dev.install
index f2ca463303d10a2b036f51c8565ce3f4bf51b804..94db8a516fb6786e9451f9ee1b5ee1ff44a9664e 100644 (file)
--- a/debian/libqb-dev.install
+++ b/debian/libqb-dev.install
@@ -1,5 +1,5 @@
 usr/include/*
 usr/lib/lib*.a
+usr/lib/lib*.so
 usr/lib/pkgconfig/*
-usr/lib/*.la
-usr/share/man/man3/*
+usr/share/man/*

diff --git a/debian/libqb.dirs b/debian/libqb.dirs
deleted file mode 100644 (file)
index 6845771..0000000
--- a/debian/libqb.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib

diff --git a/debian/libqb.install b/debian/libqb.install
deleted file mode 100644 (file)
index dc21b89..0000000
--- a/debian/libqb.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/lib*.so

diff --git a/debian/libqb.postinst b/debian/libqb.postinst
deleted file mode 100644 (file)
index 5e60dfb..0000000
--- a/debian/libqb.postinst
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-# postinst script for libqb
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <postinst> `abort-remove'
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    configure)
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0

diff --git a/debian/libqb.postrm b/debian/libqb.postrm
deleted file mode 100644 (file)
index a41080d..0000000
--- a/debian/libqb.postrm
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-# postrm script for libqb
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <overwriter>
-#          <overwriter-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-    ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0

diff --git a/debian/libqb0.dirs b/debian/libqb0.dirs
new file mode 100644 (file)
index 0000000..6845771
--- /dev/null
+++ b/debian/libqb0.dirs
@@ -0,0 +1 @@
+usr/lib

diff --git a/debian/libqb0.install b/debian/libqb0.install
new file mode 100644 (file)
index 0000000..d0dbfd1
--- /dev/null
+++ b/debian/libqb0.install
@@ -0,0 +1 @@
+usr/lib/lib*.so.*

diff --git a/debian/libqb0.postinst b/debian/libqb0.postinst
new file mode 100644 (file)
index 0000000..5e60dfb
--- /dev/null
+++ b/debian/libqb0.postinst
@@ -0,0 +1,39 @@
+#!/bin/sh
+# postinst script for libqb
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    configure)
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

diff --git a/debian/libqb0.postrm b/debian/libqb0.postrm
new file mode 100644 (file)
index 0000000..a41080d
--- /dev/null
+++ b/debian/libqb0.postrm
@@ -0,0 +1,37 @@
+#!/bin/sh
+# postrm script for libqb
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

diff --git a/debian/rules b/debian/rules
index 1937f015f21092b45d23e46930850e37400f5863..4d2f1f5bcb1884b349f0a7bbbff874713d21822a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+# enable hardening
+export DEB_BUILD_HARDENING=1
+
 # we want to load libqb with dynamic loader with perl
 export CFLAGS=-fPIC
 

diff --git a/debian/shlibs.local b/debian/shlibs.local
deleted file mode 100644 (file)
index 57ff721..0000000
--- a/debian/shlibs.local
+++ /dev/null
@@ -1 +0,0 @@
-liblibqb 0.3.0 libqb (>> 0.3.0-0), libqb (<< 0.3.0-99)

diff --git a/libqb-0.10.1.orig.tar.gz b/libqb-0.10.1.orig.tar.gz
deleted file mode 100644 (file)
index 69e3ce1..0000000
Binary files a/libqb-0.10.1.orig.tar.gz and /dev/null differ

diff --git a/libqb-0.17.1.orig.tar.gz b/libqb-0.17.1.orig.tar.gz
new file mode 100644 (file)
index 0000000..b532ab6
Binary files /dev/null and b/libqb-0.17.1.orig.tar.gz differ