diff -Nru qoauth-1.0.1/debian/changelog qoauth-1.0.1/debian/changelog --- qoauth-1.0.1/debian/changelog 2010-11-08 13:25:11.000000000 +0000 +++ qoauth-1.0.1/debian/changelog 2013-12-03 12:07:54.000000000 +0000 @@ -1,3 +1,18 @@ +qoauth (1.0.1-2ubuntu1) trusty; urgency=low + + * Merge from Debian unstable (LP: #1255971). Remaining changes: + - Add kubuntu_02_fix_digets_encoding.diff to prevent twice encoding values + when using no encryption + + -- Roy Jamison Tue, 03 Dec 2013 12:07:54 +0000 + +qoauth (1.0.1-2) unstable; urgency=low + + * Switch to debhelp 9 for builds + * Bump to standards compliance to 3.9.4 (no changes) + + -- Noah Meyerhans Thu, 26 Sep 2013 18:27:59 -0700 + qoauth (1.0.1-1ubuntu1) natty; urgency=low * Merge with Debian, remaining changes: diff -Nru qoauth-1.0.1/debian/compat qoauth-1.0.1/debian/compat --- qoauth-1.0.1/debian/compat 2010-08-01 18:50:59.000000000 +0000 +++ qoauth-1.0.1/debian/compat 2013-09-27 01:28:20.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru qoauth-1.0.1/debian/control qoauth-1.0.1/debian/control --- qoauth-1.0.1/debian/control 2010-11-08 13:23:12.000000000 +0000 +++ qoauth-1.0.1/debian/control 2013-12-03 12:05:16.000000000 +0000 @@ -2,12 +2,12 @@ Priority: extra Maintainer: Kubuntu Developers XSBC-Original-Maintainer: Noah Meyerhans -Build-Depends: debhelper (>= 7.0.50~), libqca2-dev, qt4-qmake, libqca2-plugin-ossl -Standards-Version: 3.9.1 +Build-Depends: debhelper (>= 9.20120909), libqca2-dev, qt4-qmake, libqca2-plugin-ossl +Standards-Version: 3.9.4 Section: libs Homepage: http://wiki.github.com/ayoy/qoauth/ -#Vcs-Git: git://git.debian.org/collab-maint/qoauth.git -#Vcs-Browser: http://git.debian.org/?p=collab-maint/qoauth.git;a=summary +Vcs-Git: git://git.debian.org/collab-maint/qoauth.git +Vcs-Browser: http://git.debian.org/?p=collab-maint/qoauth.git;a=summary Package: libqoauth-dev Section: libdevel diff -Nru qoauth-1.0.1/debian/copyright qoauth-1.0.1/debian/copyright --- qoauth-1.0.1/debian/copyright 2010-08-01 19:53:19.000000000 +0000 +++ qoauth-1.0.1/debian/copyright 2013-09-27 01:28:20.000000000 +0000 @@ -6,7 +6,7 @@ http://github.com/ayoy/qoauth -Upstream Author(s): +Upstream Author: Dominik Kapusta