← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/konversation/gutsy

« back to all changes in this revision

Viewing changes to debian/patches/06_fix_relibtoolization.diff

  • Committer: Bazaar Package Importer
  • Author(s): Frode M. Døving, Jonathan Riddell, Frode M. Døving
  • Date: 2007-07-25 22:25:27 UTC
  • mfrom: (10.1.12 gutsy)
  • Revision ID: james.westby@ubuntu.com-20070725222527-jfhzav3ak5ln4u6v
Tags: 1.0.1-3ubuntu1
[ Jonathan Riddell ]
* Drop channel patch, default channel is changed in kubuntu-default-settings
  and it can fall back to freenode if that's not installed

[ Frode M. Døving ]
* Mergeing from Debian. See changelog entries below.
  A big thank you goes to the Debian KDE Extras Team, you rock!
* Remaining change: kubuntu_01_kdepot.diff
* Change maintainer address to ubuntu-core-dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/06_fix_relibtoolization.diff
 
1
diff -uNr -x debian -x .pc konversation-1.0.1/konversation/src/config/Makefile.am konversation-1.0.1.n/konversation/src/config/Makefile.am
 
2
--- konversation-1.0.1/konversation/src/config/Makefile.am      2006-10-06 19:43:29.000000000 +0300
 
3
+++ konversation-1.0.1.n/konversation/src/config/Makefile.am    2007-07-17 01:53:53.000000000 +0300
 
4
@@ -4,6 +4,5 @@
 
5
 noinst_LTLIBRARIES = libkonversationconfig.la
 
6
 libkonversationconfig_la_SOURCES = preferences_base.kcfgc preferences.cpp
 
7
 libkonversationconfig_la_LDFLAGS = $(all_libraries) -no-undefined
 
8
-libkonversationconfig_la_LIBADD = $(LIB_KDEUI)
 
9
 
 
10
 kde_kcfg_DATA = konversation.kcfg
 
11
diff -uNr -x debian -x .pc konversation-1.0.1/konversation/src/linkaddressbook/Makefile.am konversation-1.0.1.n/konversation/src/linkaddressbook/Makefile.am
 
12
--- konversation-1.0.1/konversation/src/linkaddressbook/Makefile.am     2006-10-06 19:43:29.000000000 +0300
 
13
+++ konversation-1.0.1.n/konversation/src/linkaddressbook/Makefile.am   2007-07-17 01:54:04.000000000 +0300
 
14
@@ -9,6 +9,5 @@
 
15
 liblinkaddressbookui_la_SOURCES = linkaddressbookui_base.ui linkaddressbookui.cpp addressbook_base.cpp addressbook.cpp nicklisttooltip.cpp nicksonlinetooltip.cpp kimiface.skel addresseeitem.cpp
 
16
 kimiface_DIR = $(kde_includes)
 
17
 liblinkaddressbookui_la_LDFLAGS = $(all_libraries) -no-undefined
 
18
-liblinkaddressbookui_la_LIBADD = $(COMPAT_LIBS) $(LIB_KDEUI) $(LIB_KABC)
 
19
 
 
20
 # vim: set noet: