dpkg-source: warning: extracting unsigned source package (/home/shadeslayer/packaging/merges/choqok/debian/choqok_1.1-1ubuntu1.dsc) diff -Nru choqok-1.1/debian/changelog choqok-1.1/debian/changelog --- choqok-1.1/debian/changelog 2011-05-26 20:39:58.000000000 +0200 +++ choqok-1.1/debian/changelog 2011-05-26 20:39:30.000000000 +0200 @@ -1,3 +1,15 @@ +choqok (1.1-1ubuntu1) oneiric; urgency=low + + * Merge from debian, remaining changes, (LP: #788772) + - Add kubuntu_02_fix_message_indicator.diff fixes message indicator + support + - debian/rules: + + Set export KUBUNTU_DESKTOP_POT=extragear-network_choqok. + - debian/patches/kubuntu_01_consumerkey.diff: + + Switch to custom Kubuntu OAuth id. + + -- Rohan Garg Thu, 26 May 2011 19:26:58 +0200 + choqok (1.1-1) unstable; urgency=low * New upstream version based on git commit 44c81b3e @@ -18,6 +30,45 @@ -- Noah Meyerhans Sun, 20 Feb 2011 16:12:29 -0800 +choqok (1.0-0ubuntu4) natty; urgency=low + + * Add kubuntu_02_fix_message_indicator.diff fixes message indicator + support + + -- Jonathan Riddell Thu, 17 Mar 2011 12:40:13 +0000 + +choqok (1.0-0ubuntu3) natty; urgency=low + + * Rebuild with libindicate-qt 0.2.5.91-0ubuntu2 to fix dependency + + -- Jonathan Riddell Wed, 09 Feb 2011 13:38:11 +0000 + +choqok (1.0-0ubuntu2) natty; urgency=low + + * Build against libindicate-qt 0.2.5.91 for soname transition + + -- Jonathan Riddell Mon, 07 Feb 2011 18:00:24 +0000 + +choqok (1.0-0ubuntu1) natty; urgency=low + + * New upstream release. (LP: #710981) + * Merge from debian unstable. Remaining changes: + - debian/control: + + Bump Build-Depends on kdelibs5-dev 4.5.2a-0ubuntu2 + for libkutils4 transition. + + Add libattica-dev as build-depend, an OCS plugin was added. + + Add libindicate-qt-dev as build-depend, choqok supports the + message indicator now. + - debian/patches/kubuntu_01_consumerkey.diff: + + Switch to custom Kubuntu OAuth id. + - debian/README.source: Make lintian happy. + - debian/rules: + + Set export KUBUNTU_DESKTOP_POT=extragear-network_choqok. + * Switch to dpkg-source 3.0 (quilt) format + * debian/{control, rules}: Drop support old quilt. + + -- Artur Rona Tue, 01 Feb 2011 00:11:03 +0100 + choqok (1.0~rc1-1) unstable; urgency=low * New upstream snapshot based on revision 5ef554f. @@ -31,6 +82,42 @@ -- Noah Meyerhans Fri, 29 Oct 2010 00:51:47 -0700 +choqok (0.9.98-0ubuntu1) natty; urgency=low + + * New upstream release candidate (LP: #701178) + - Refresh kubuntu_01_consumerkey.diff + - Add README.source to make lintian happy + * Add libattica-dev as build-depend, an OCS plugin was added + * Add libindicate-qt-dev as build-depend, choqok supports the + message indicator now + + -- Christian Mangold Mon, 10 Jan 2011 20:06:01 +0100 + +choqok (0.9.92-0ubuntu1) natty; urgency=low + + * New upstream release + + -- Alessandro Ghersi Thu, 28 Oct 2010 19:50:19 +0200 + +choqok (0.9.85-0ubuntu3) natty; urgency=low + + * Rebuild against kdelibs5-dev 4.5.2a-0ubuntu2 for libkutils4 transition + + -- Alessandro Ghersi Fri, 22 Oct 2010 07:14:10 +0200 + +choqok (0.9.85-0ubuntu2) maverick; urgency=low + + * Add kubuntu_01_consumerkey.diff to switch to custom Kubuntu OAuth id + - Add quilt as build-dep and modify rules file accordingly + + -- Rohan Garg Sun, 03 Oct 2010 17:34:18 +0530 + +choqok (0.9.85-0ubuntu1) maverick; urgency=low + + * New upstream release + + -- Rohan Garg Thu, 19 Aug 2010 23:11:24 +0530 + choqok (0.9.81-3) unstable; urgency=low * Include upstream change 22178386 to allow choqok to still work if @@ -45,6 +132,12 @@ -- Noah Meyerhans Sat, 21 Aug 2010 04:45:04 -0700 +choqok (0.9.81-1ubuntu1) maverick; urgency=low + + * Set export KUBUNTU_DESKTOP_POT=extragear-network_choqok + + -- Jonathan Riddell Mon, 26 Jul 2010 18:01:47 +0100 + choqok (0.9.81-1) unstable; urgency=low * New upstream snapshot fixes crash when expanding shortened URLs. diff -Nru choqok-1.1/debian/control choqok-1.1/debian/control --- choqok-1.1/debian/control 2011-05-26 20:39:58.000000000 +0200 +++ choqok-1.1/debian/control 2011-05-26 19:01:09.000000000 +0200 @@ -1,10 +1,11 @@ Source: choqok Section: kde Priority: optional -Maintainer: Noah Meyerhans -Build-Depends: debhelper (>= 7), cmake, kdelibs5-dev (>= 4:4.3.0), docbook2x, +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Noah Meyerhans +Build-Depends: debhelper (>= 7), cmake, kdelibs5-dev (>= 4:4.5.2a-0ubuntu2), docbook2x, cdbs, pkg-kde-tools, libqoauth-dev (>= 1.0-2), libqjson-dev, docbook-xml, - libattica-dev + libattica-dev, libindicate-qt-dev (>= 0.2.5.91) Standards-Version: 3.9.0 Homepage: http://choqok.gnufolks.org Vcs-Browser: http://git.debian.org/?p=collab-maint/choqok.git diff -Nru choqok-1.1/debian/patches/kubuntu_01_consumerkey.diff choqok-1.1/debian/patches/kubuntu_01_consumerkey.diff --- choqok-1.1/debian/patches/kubuntu_01_consumerkey.diff 1970-01-01 01:00:00.000000000 +0100 +++ choqok-1.1/debian/patches/kubuntu_01_consumerkey.diff 2011-01-31 21:37:19.000000000 +0100 @@ -0,0 +1,19 @@ +From: Rohan Garg +Description: Switch to custom Kubuntu OAuth id. +Forwarded: not-needed + +Index: choqok-0.9.98/microblogs/twitter/twittereditaccount.cpp +=================================================================== +--- choqok-0.9.98.orig/microblogs/twitter/twittereditaccount.cpp 2010-12-06 20:11:02.000000000 +0100 ++++ choqok-0.9.98/microblogs/twitter/twittereditaccount.cpp 2011-01-10 20:06:55.417792102 +0100 +@@ -40,8 +40,8 @@ + #include + #include + +-const char * twitterConsumerKey = "VyXMf0O7CvciiUQjliYtYg"; +-const char * twitterConsumerSecret = "uD2HvsOBjzt1Vs6SnouFtuxDeHmvOOVwmn3fBVyCw0"; ++const char * twitterConsumerKey = "5WLZ95BQ00OO0g5qD5xVg"; ++const char * twitterConsumerSecret = "Fj0zzvZn1qzJkbqOOApNxcST3aGAtvdjyhrMCVCHh8g"; + + TwitterEditAccountWidget::TwitterEditAccountWidget(TwitterMicroBlog *microblog, + TwitterAccount* account, QWidget* parent) diff -Nru choqok-1.1/debian/patches/kubuntu_02_fix_message_indicator.diff choqok-1.1/debian/patches/kubuntu_02_fix_message_indicator.diff --- choqok-1.1/debian/patches/kubuntu_02_fix_message_indicator.diff 1970-01-01 01:00:00.000000000 +0100 +++ choqok-1.1/debian/patches/kubuntu_02_fix_message_indicator.diff 2011-03-17 13:40:01.000000000 +0100 @@ -0,0 +1,11 @@ +--- choqok/choqok/config/behavior/behaviorconfig.cpp 2011-01-27 09:27:38.000000000 +0000 ++++ choqok/choqok/config/behavior/behaviorconfig.cpp 2011-03-17 12:02:34.043382771 +0000 +@@ -74,7 +74,7 @@ + d->mBehaviorTabCtl->addTab(mPrfsGeneralDlg, i18n("&General")); + d->mPrfsGeneral.kcfg_updateInterval->setSuffix(ki18np(" Minute", " Minutes")); + +-#ifdef INDICATEQT_BUILD ++#ifdef QTINDICATE_BUILD + // "Notifications" TAB ============================================================ + QWidget *mPrfsNotifyDlg = new QWidget(d->mBehaviorTabCtl); + d->mPrfsNotify.setupUi(mPrfsNotifyDlg); diff -Nru choqok-1.1/debian/patches/series choqok-1.1/debian/patches/series --- choqok-1.1/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ choqok-1.1/debian/patches/series 2011-03-17 13:40:36.000000000 +0100 @@ -0,0 +1,2 @@ +kubuntu_01_consumerkey.diff +kubuntu_02_fix_message_indicator.diff diff -Nru choqok-1.1/debian/rules choqok-1.1/debian/rules --- choqok-1.1/debian/rules 2011-05-26 20:39:58.000000000 +0200 +++ choqok-1.1/debian/rules 2011-05-26 19:03:01.000000000 +0200 @@ -1,7 +1,8 @@ #!/usr/bin/make -f # -*- makefile -*- -# include /usr/share/cdbs/1/rules/patchsys-quilt.mk +export KUBUNTU_DESKTOP_POT=extragear-network_choqok + include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk diff -Nru choqok-1.1/debian/source/format choqok-1.1/debian/source/format --- choqok-1.1/debian/source/format 1970-01-01 01:00:00.000000000 +0100 +++ choqok-1.1/debian/source/format 2011-02-01 00:11:02.000000000 +0100 @@ -0,0 +1 @@ +3.0 (quilt)