rev 9076 - in kde-extras/konversation/trunk/debian: . patches
Modestas Vainius
modax-guest at alioth.debian.org
Mon Jan 21 10:20:33 UTC 2008
Author: modax-guest
Date: 2008-01-21 10:20:32 +0000 (Mon, 21 Jan 2008)
New Revision: 9076
Added:
kde-extras/konversation/trunk/debian/patches/17_serverlist_compiz_workaround.diff
kde-extras/konversation/trunk/debian/patches/kubuntu_01_kdepot.diff
Modified:
kde-extras/konversation/trunk/debian/changelog
kde-extras/konversation/trunk/debian/patches/series
kde-extras/konversation/trunk/debian/rules
Log:
1.0.1-5: mainly a dash-bugfix. In addition, add patches from ubuntu.
Modified: kde-extras/konversation/trunk/debian/changelog
===================================================================
--- kde-extras/konversation/trunk/debian/changelog 2008-01-21 00:50:16 UTC (rev 9075)
+++ kde-extras/konversation/trunk/debian/changelog 2008-01-21 10:20:32 UTC (rev 9076)
@@ -1,3 +1,20 @@
+konversation (1.0.1-5) unstable; urgency=low
+
+ [ Modestas Vainius ]
+ * Drop hackish docs removal stuff from debian/rules. There is a less
+ hackish way to achieve the same thing (i.e. not to installing upstrem
+ README) which should not cause problems with dash as /bin/sh
+ (Closes: #459159).
+ * New patches from 1.0.1-4ubuntu2:
+ * Add unfuzzed kubuntu_02_serverlist_compiz_workaround.patch as
+ 17_serverlist_compiz_workaround.diff. The patch comes from
+ upstream r604746 (KDE Bug #147557).
+ * I'm adding back kubuntu_01_kdepot.diff because it does not hurt and now
+ I understand how it helps for Ubuntu.
+ *
+
+ -- Modestas Vainius <modestas at vainius.eu> Mon, 21 Jan 2008 12:02:20 +0200
+
konversation (1.0.1-4) unstable; urgency=low
[ Modestas Vainius ]
Added: kde-extras/konversation/trunk/debian/patches/17_serverlist_compiz_workaround.diff
===================================================================
--- kde-extras/konversation/trunk/debian/patches/17_serverlist_compiz_workaround.diff (rev 0)
+++ kde-extras/konversation/trunk/debian/patches/17_serverlist_compiz_workaround.diff 2008-01-21 10:20:32 UTC (rev 9076)
@@ -0,0 +1,31 @@
+--- konversation-1.0.1/konversation/src/konversationapplication.cpp (revision 604745)
++++ konversation-1.0.1/konversation/src/konversationapplication.cpp (revision 604746)
+@@ -126,7 +126,7 @@
+ emit appearanceChanged();
+ mainWindow->show();
+
+- if (Preferences::showServerList()) mainWindow->openServerList();
++ bool openServerList = Preferences::showServerList();
+
+ // handle autoconnect on startup
+ Konversation::ServerGroupList serverGroups = Preferences::serverGroupList();
+@@ -135,12 +135,18 @@
+ {
+ for (Konversation::ServerGroupList::iterator it = serverGroups.begin(); it != serverGroups.end(); ++it)
+ {
+- if ((*it)->autoConnectEnabled()) connectToServer((*it)->id());
++ if ((*it)->autoConnectEnabled())
++ {
++ openServerList = false;
++ connectToServer((*it)->id());
++ }
+ }
+ }
+ else
+ quickConnectToServer(m_hostName, m_port, m_channel, m_nick, m_password, m_useSSL);
+
++ if (openServerList) mainWindow->openServerList();
++
+ // prepare dcop interface
+ dcopObject = new KonvDCOP;
+ kapp->dcopClient()->setDefaultObject(dcopObject->objId());
Added: kde-extras/konversation/trunk/debian/patches/kubuntu_01_kdepot.diff
===================================================================
--- kde-extras/konversation/trunk/debian/patches/kubuntu_01_kdepot.diff (rev 0)
+++ kde-extras/konversation/trunk/debian/patches/kubuntu_01_kdepot.diff 2008-01-21 10:20:32 UTC (rev 9076)
@@ -0,0 +1,26 @@
+--- kde/admin/cvs.sh 2005-11-26 02:42:02.000000000 +0000
++++ kde/admin/cvs.sh 2005-11-26 02:42:26.000000000 +0000
+@@ -537,6 +537,8 @@
+ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
+ export EXTRACTRC PREPARETIPS
+
++kdepotpath=/usr/include/kde/kde.pot
++
+ for subdir in $dirs; do
+ test -z "$VERBOSE" || echo "Making messages in $subdir"
+ (cd $subdir
+@@ -554,10 +556,10 @@
+ fi
+ perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
+
+- kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
+- if ! test -f $kdepotpath; then
+- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
+- fi
++# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
++# if ! test -f $kdepotpath; then
++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
++# fi
+
+ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
+ XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages
Modified: kde-extras/konversation/trunk/debian/patches/series
===================================================================
--- kde-extras/konversation/trunk/debian/patches/series 2008-01-21 00:50:16 UTC (rev 9075)
+++ kde-extras/konversation/trunk/debian/patches/series 2008-01-21 10:20:32 UTC (rev 9076)
@@ -3,6 +3,7 @@
03_pedantic-errors.diff
04_disable_no_undefined.diff
06_fix_relibtoolization.diff
+kubuntu_01_kdepot.diff
10_debian_channel.diff
11_dbug_autoreplace.diff
12_dbug405384_dccsendfile.diff
@@ -10,4 +11,5 @@
14_dbug412803_assert_crash.diff
15_CVE-2007-4400.diff
16_konversation_desktop.diff
+17_serverlist_compiz_workaround.diff
98_buildprep.diff
Modified: kde-extras/konversation/trunk/debian/rules
===================================================================
--- kde-extras/konversation/trunk/debian/rules 2008-01-21 00:50:16 UTC (rev 9075)
+++ kde-extras/konversation/trunk/debian/rules 2008-01-21 10:20:32 UTC (rev 9076)
@@ -5,6 +5,7 @@
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
DEB_DH_STRIP_ARGS := --dbg-package=konversation-dbg
+DEB_INSTALL_DOCS_ALL =
### Manpages
XP = xsltproc --nonet --output debian/man/
@@ -22,9 +23,3 @@
install/konversation::
install -D -m 644 konversation/scripts/README \
debian/konversation/usr/share/doc/konversation/README.scripts
-
-### Post-install hacking
-$(patsubst %,binary-post-install/%,$(DEB_PACKAGES))::
-
- # remove empty files
- rm -f debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/{README,NEWS}
More information about the pkg-kde-commits
mailing list