diff -u konversation-1.2~alpha4/debian/changelog konversation-1.2~alpha4/debian/changelog --- konversation-1.2~alpha4/debian/changelog +++ konversation-1.2~alpha4/debian/changelog @@ -1,3 +1,18 @@ +konversation (1.2~alpha4-2ubuntu1) karmic; urgency=low + + * Merge from Debian unstable, remaining changes (LP: #395450) + - Use include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk + - Use /usr/share/cdbs/1/rules/debhelper.mk + - Add include /usr/share/cdbs/1/rules/patchsys-quilt.mk + - Add kubuntu/default_channels.diff, disable debian/default_channel.diff + - Change xpm/README.scripts path slightly to accomidate our differing + Build systems + - Use the Kubuntu docpath (/usr/share/doc/kde) + - Build-depend on cdbs + - Do not call debhelper with --with quilt for backportability reasons + + -- Alessandro Ghersi Sat, 04 Jul 2009 19:55:41 +0200 + konversation (1.2~alpha4-2) unstable; urgency=low * Add patch from upstream svn repository (r991115) to fix building with @@ -16,6 +31,21 @@ -- Modestas Vainius Sat, 04 Jul 2009 10:19:45 +0300 +konversation (1.2~alpha3-1ubuntu1.1~ppa1) karmic; urgency=low + + * Merge from Debian Unstable, remaining changes: + - use include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk + - use /usr/share/cdbs/1/rules/debhelper.mk + - add include /usr/share/cdbs/1/rules/patchsys-quilt.mk + - add kubuntu/default_channels.diff, disable debian/default_channel.diff + - change xpm/README.scripts path slightly to accomidate our differing + build systems + - Use the Kubuntu docpath (/usr/share/doc/kde) + - build-depend on cdbs + - Do not call debhelper with --with quilt for backportability reasons + + -- Alessandro Ghersi Wed, 03 Jun 2009 19:41:13 +0200 + konversation (1.2~alpha3-1) unstable; urgency=low * New upstream development release (1.2 Alpha 3). @@ -29,6 +59,25 @@ -- Modestas Vainius Tue, 26 May 2009 19:52:45 +0300 +konversation (1.2~alpha2-0ubuntu1) karmic; urgency=low + + * New upstream alpha release + + -- Jonathan Thomas Tue, 26 May 2009 12:40:57 -0400 + +konversation (1.2~alpha1-1ubuntu1) karmic; urgency=low + + * Merge from Debian Experimental, remaining changes: + - Use include debian-qt-kde.mk rather than built-in cdbs + - Add kubuntu/default_channels.diff, disable debian/default_channel.diff + - Change xpm/README.scripts path slightly to accomidate our differing + build systems + - Use the Kubuntu docpath (/usr/share/doc/kde) + - Build-depend on cdbs + - Do not call debhelper with --with quilt for backportability reasons + + -- Jonathan Thomas Wed, 20 May 2009 14:56:13 -0400 + konversation (1.2~alpha1-1) unstable; urgency=low * New upstream development release (1.2 Alpha 1). @@ -66,6 +115,22 @@ -- Modestas Vainius Fri, 15 May 2009 11:24:24 +0300 +konversation (1.1.75+svn965785-0ubuntu1) karmic; urgency=low + + * Merge with Debian Experimental, remaining changes: + - Bump svn snapshot version + - Use include debian-qt-kde.mk rather than built-in debhelper + - Add kubuntu/default_channels.diff, disable debian/default_channel.diff + - Disable debian/dbug_autoreplace.diff, doesn't apply for now (plus it's + not that terribly useful for Kubuntu users) we can pick this up later + once Debian fixes it + - Change xpm/README.scripts path slightly to accomidate our differing + build systems + - Use the Kubuntu docpath (/usr/share/doc/kde) + - Build-depend on cdbs + + -- Jonathan Thomas Thu, 07 May 2009 17:17:14 -0400 + konversation (1.1.75+svn951877-1) experimental; urgency=low * New upstream development snapshot: diff -u konversation-1.2~alpha4/debian/control konversation-1.2~alpha4/debian/control --- konversation-1.2~alpha4/debian/control +++ konversation-1.2~alpha4/debian/control @@ -1,9 +1,10 @@ Source: konversation Section: net Priority: optional -Maintainer: Debian KDE Extras Team +Maintainer: Kubuntu Developers +XSBC-Original-Maintainer: Debian KDE Extras Team Uploaders: Modestas Vainius -Build-Depends: debhelper (>= 7.0.50), cmake (>= 2.6.2), pkg-kde-tools (>= 0.4), quilt (>= 0.46-7~), +Build-Depends: debhelper (>= 7.0.50), cmake (>= 2.6.2), pkg-kde-tools (>= 0.4), quilt (>= 0.46-7~), cdbs, libqt4-dev (>= 4.4.3), kdelibs5-dev (>= 4:4.2.0), kdepimlibs5-dev (>= 4:4.2.0), libx11-dev, x11proto-core-dev, libxss-dev, libqca2-dev Standards-Version: 3.8.2 diff -u konversation-1.2~alpha4/debian/konversation.install konversation-1.2~alpha4/debian/konversation.install --- konversation-1.2~alpha4/debian/konversation.install +++ konversation-1.2~alpha4/debian/konversation.install @@ -1,9 +1,9 @@ # Debian menu XPM icons -debian/*.xpm usr/share/pixmaps +../*.xpm usr/share/pixmaps usr/bin/konversation usr/share/applications/kde4/konversation.desktop -usr/share/doc/kde4/* +usr/share/doc/kde/* usr/share/icons/hicolor/* usr/share/kde4/apps/kconf_update/konversation* usr/share/kde4/apps/konversation/* diff -u konversation-1.2~alpha4/debian/rules konversation-1.2~alpha4/debian/rules --- konversation-1.2~alpha4/debian/rules +++ konversation-1.2~alpha4/debian/rules @@ -5,13 +5,13 @@ # See debian/patches/01_aboutdata_add_debian_version.diff DEBIAN_PACKAGE_VERSION := $(shell dpkg-parsechangelog | grep '^Version:' | sed 's/^Version:[[:space:]]*\([^[:space:]]\+\).*$$/\1/') DEB_CMAKE_CUSTOM_FLAGS += -DDEBIAN_PACKAGE_VERSION="$(DEBIAN_PACKAGE_VERSION)" -DH = dh --with quilt -include debian/debhelper/kde.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk ifneq (,$(shell which tg)) TG_BRANCHES := $(filter-out debian/aboutdata_add_debian_version,$(shell tg summary -t)) -include /usr/share/quilt/quilt.make -include /usr/share/topgit/tg2quilt.mk .PHONY: /usr/share/topgit/tg2quilt.mk endif diff -u konversation-1.2~alpha4/debian/patches/series konversation-1.2~alpha4/debian/patches/series --- konversation-1.2~alpha4/debian/patches/series +++ konversation-1.2~alpha4/debian/patches/series @@ -2,2 +2,3 @@ -debian/debian_channel.diff -p1 +#debian/debian_channel.diff -p1 general/qt4.4_build_fix.diff -p1 +kubuntu/default_channels.diff -p1 only in patch2: unchanged: --- konversation-1.2~alpha4.orig/debian/patches/kubuntu/default_channels.diff +++ konversation-1.2~alpha4/debian/patches/kubuntu/default_channels.diff @@ -0,0 +1,22 @@ +Index: konversation-1.1.75+svn965046/src/config/preferences.cpp +=================================================================== +--- konversation-1.1.75+svn965046.orig/src/config/preferences.cpp 2009-05-07 17:11:22.000000000 -0400 ++++ konversation-1.1.75+svn965046/src/config/preferences.cpp 2009-05-07 17:14:28.000000000 -0400 +@@ -69,14 +69,14 @@ + mIdentity->setNicknameList(nickList); + + Konversation::ServerGroupSettingsPtr serverGroup(new Konversation::ServerGroupSettings); +- serverGroup->setName("Freenode"); ++ serverGroup->setName("Ubuntu IRC"); + Konversation::ServerSettings server; +- server.setHost("chat.freenode.net"); ++ server.setHost("irc.ubuntu.com"); + server.setPort(8001); + serverGroup->addServer(server); + serverGroup->setIdentityId(mIdentity->id()); + Konversation::ChannelSettings channel; +- channel.setName("#konversation"); ++ channel.setName("#kubuntu"); + serverGroup->addChannel(channel); + serverGroup->setExpanded(false); + mServerGroupList.append(serverGroup);