[pkg-kde-commits] rev 2721 - in
kde-extras/kipi-plugins/trunk/debian: . patches
Achim Bohnet
ach-guest at costa.debian.org
Fri Dec 30 21:52:38 UTC 2005
Author: ach-guest
Date: 2005-12-30 21:52:38 +0000 (Fri, 30 Dec 2005)
New Revision: 2721
Added:
kde-extras/kipi-plugins/trunk/debian/patches/11_Makefile.am_use_only_used_libs.diff
Modified:
kde-extras/kipi-plugins/trunk/debian/TODO
kde-extras/kipi-plugins/trunk/debian/changelog
kde-extras/kipi-plugins/trunk/debian/patches/10_kdesvn492067_fix_crash_for_canceling_dialog_imagesgallery.diff
kde-extras/kipi-plugins/trunk/debian/rules
Log:
kipi-plugins relibtoolization:
+ use tools and patches of Debian Qt/KDE Team packages
+ rules: add buildprep target for 98_buildprep.diff creation
+ patches/11_Makefile.am_use_only_used_libs.diff: list all libs
which contain used symbols. Replace LIB_QT, IMLIB2_LIBS with
-lqt-mt and -lImlib2, respectively, because the variables list
libraries only used indirectly by the kipi-plugins
Result: kipi-plugins now depends on 14 instead of 31 packages
Next commit will contains the usual usage *diffs
Modified: kde-extras/kipi-plugins/trunk/debian/TODO
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/TODO 2005-12-30 03:47:30 UTC (rev 2720)
+++ kde-extras/kipi-plugins/trunk/debian/TODO 2005-12-30 21:52:38 UTC (rev 2721)
@@ -1,4 +1,7 @@
-o DON'T FORGET: pbuilder test build
+o Implement a central way to set LIB_QT to -lqt-mt (i.e., without
+ the long list of only implicitly used libs). Ditto
+ for IMLIB2_LIB. This way there no need to patch the Makefile.am
+ of each plugin.
o Suggests to recommends for all external tools?
Modified: kde-extras/kipi-plugins/trunk/debian/changelog
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/changelog 2005-12-30 03:47:30 UTC (rev 2720)
+++ kde-extras/kipi-plugins/trunk/debian/changelog 2005-12-30 21:52:38 UTC (rev 2721)
@@ -1,5 +1,19 @@
kipi-plugins (0.1+rc1-2) UNRELEASED; urgency=low
+ [ Achim Bohnet ]
+ * relibtoolization:
+ + use tools and patches of Debian Qt/KDE Team packages:
+ patches/0*.diff
+ + patches/03_libtool_update.diff: update to libtool 1.5.20-2
+ + patches/06_aclocal_update.diff: this update gets trigger by the
+ create-buildprep run
+ + rules: add buildprep target for 98_buildprep.diff creation
+ + patches/11_Makefile.am_use_only_used_libs.diff: list all libs
+ which contain used symbols. Replace LIB_QT, IMLIB2_LIBS with
+ -lqt-mt and -lImlib2, respectively, because the variables list
+ libraries only used indirectly by the kipi-plugins
+ Result: kipi-plugins now depends on 14 instead of 31 packages
+
[ Tom Albers ]
* added patches/10_kdesvn492067_fix_crash_for_canceling_dialog_imagesgallery.diff
which prevents a crash when using the imagesgallery for a second time and
Modified: kde-extras/kipi-plugins/trunk/debian/patches/10_kdesvn492067_fix_crash_for_canceling_dialog_imagesgallery.diff
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/patches/10_kdesvn492067_fix_crash_for_canceling_dialog_imagesgallery.diff 2005-12-30 03:47:30 UTC (rev 2720)
+++ kde-extras/kipi-plugins/trunk/debian/patches/10_kdesvn492067_fix_crash_for_canceling_dialog_imagesgallery.diff 2005-12-30 21:52:38 UTC (rev 2721)
@@ -1,4 +1,4 @@
----kipi-plugins/imagesgallery/imagesgallery.cpp (revision 492066)
+--- kipi-plugins/imagesgallery/imagesgallery.cpp (revision 492066)
+++ kipi-plugins/imagesgallery/imagesgallery.cpp (revision 492067)
@@ -278,7 +278,9 @@
KMessageBox::error(kapp->activeWindow(), i18n("Cannot remove folder '%1'.").arg(MainTPath));
Added: kde-extras/kipi-plugins/trunk/debian/patches/11_Makefile.am_use_only_used_libs.diff
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/patches/11_Makefile.am_use_only_used_libs.diff 2005-12-30 03:47:30 UTC (rev 2720)
+++ kde-extras/kipi-plugins/trunk/debian/patches/11_Makefile.am_use_only_used_libs.diff 2005-12-30 21:52:38 UTC (rev 2721)
@@ -0,0 +1,206 @@
+--- kipi-plugins-0.1+rc1.old/kipi-plugins/acquireimages/Makefile.am 2005-09-14 20:38:09.000000000 +0200
++++ kipi-plugins-0.1+rc1/kipi-plugins/acquireimages/Makefile.am 2005-12-30 20:05:04.000000000 +0100
+@@ -8,7 +8,7 @@
+ kipiplugin_acquireimages_la_SOURCES = plugin_acquireimages.cpp acquireimagedialog.cpp screenshotdialog.cpp
+
+ # Libs needed by the plugin
+-kipiplugin_acquireimages_la_LIBADD = $(LIB_KPARTS) $(LIBKIPI_LIBS) $(LIB_TIFF)
++kipiplugin_acquireimages_la_LIBADD = $(LIB_TIFF) -lX11 $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt
+
+ # LD flags for the plugin
+ kipiplugin_acquireimages_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+--- kipi-plugins-0.1+rc1.old/kipi-plugins/batchprocessimages/Makefile.am 2005-09-14 20:38:09.000000000 +0200
++++ kipi-plugins-0.1+rc1/kipi-plugins/batchprocessimages/Makefile.am 2005-12-30 19:52:38.000000000 +0100
+@@ -20,7 +20,7 @@
+ renameimagesbase.ui renameimageswidget.cpp
+
+ # Libs needed by the plugin
+-kipiplugin_batchprocessimages_la_LIBADD = $(LIB_KPARTS) $(LIBKIPI_LIBS)
++kipiplugin_batchprocessimages_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt
+
+ # LD flags for the plugin
+ kipiplugin_batchprocessimages_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+--- kipi-plugins-0.1+rc1.old/kipi-plugins/calendar/Makefile.am 2005-09-14 20:38:09.000000000 +0200
++++ kipi-plugins-0.1+rc1/kipi-plugins/calendar/Makefile.am 2005-12-30 19:52:38.000000000 +0100
+@@ -9,8 +9,7 @@
+ calwidget.cpp calpainter.cpp calselect.cpp \
+ monthwidget.cpp
+
+-kipiplugin_calendar_la_LIBADD = $(LIB_KPARTS) \
+- -lkdeprint $(LIBKIPI_LIBS)
++kipiplugin_calendar_la_LIBADD = $(LIB_KDEPRINT) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt
+
+ kipiplugin_calendar_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+
+--- kipi-plugins-0.1+rc1.old/kipi-plugins/cdarchiving/Makefile.am 2005-09-14 20:38:09.000000000 +0200
++++ kipi-plugins-0.1+rc1/kipi-plugins/cdarchiving/Makefile.am 2005-12-30 19:52:38.000000000 +0100
+@@ -10,7 +10,7 @@
+ kipiplugin_cdarchiving_la_SOURCES = plugin_cdarchiving.cpp cdarchivingdialog.cpp cdarchiving.cpp
+
+ # Libs needed by the plugin
+-kipiplugin_cdarchiving_la_LIBADD = $(LIB_KPARTS) $(LIBKIPI_LIBS)
++kipiplugin_cdarchiving_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt
+
+ # LD flags for the plugin
+ kipiplugin_cdarchiving_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+--- kipi-plugins-0.1+rc1.old/kipi-plugins/findimages/Makefile.am 2005-09-14 20:38:09.000000000 +0200
++++ kipi-plugins-0.1+rc1/kipi-plugins/findimages/Makefile.am 2005-12-30 19:52:38.000000000 +0100
+@@ -11,7 +11,7 @@
+ finddupplicateimages.cpp finddupplicatedialog.cpp
+
+ # Libs needed by the plugin
+-kipiplugin_findimages_la_LIBADD = $(LIB_KPARTS) $(LIBKIPI_LIBS)
++kipiplugin_findimages_la_LIBADD = -lkdefx $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt
+
+ # LD flags for the plugin
+ kipiplugin_findimages_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+--- kipi-plugins-0.1+rc1.old/kipi-plugins/flickrexport/Makefile.am 2005-09-14 20:38:09.000000000 +0200
++++ kipi-plugins-0.1+rc1/kipi-plugins/flickrexport/Makefile.am 2005-12-30 21:58:54.000000000 +0100
+@@ -11,8 +11,7 @@
+ flickrwidget.cpp mpform.cpp flickralbumdialog.ui \
+ flickrviewitem.cpp
+
+-kipiplugin_flickrexport_la_LIBADD = $(LIB_KPARTS) $(LIBKIPI_LIBS) \
+- $(LIB_KHTML)
++kipiplugin_flickrexport_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt
+
+ kipiplugin_flickrexport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+
+--- kipi-plugins-0.1+rc1.old/kipi-plugins/galleryexport/Makefile.am 2005-09-14 20:38:09.000000000 +0200
++++ kipi-plugins-0.1+rc1/kipi-plugins/galleryexport/Makefile.am 2005-12-30 19:52:38.000000000 +0100
+@@ -11,8 +11,7 @@
+ gallerywidget.cpp gallerympform.cpp galleryalbumdialog.ui \
+ galleryviewitem.cpp
+
+-kipiplugin_galleryexport_la_LIBADD = $(LIB_KPARTS) $(LIBKIPI_LIBS) \
+- $(LIB_KHTML)
++kipiplugin_galleryexport_la_LIBADD = -lkwalletclient $(LIB_KHTML) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt
+
+ kipiplugin_galleryexport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+
+--- kipi-plugins-0.1+rc1.old/kipi-plugins/helloworld/Makefile.am 2005-09-14 20:38:09.000000000 +0200
++++ kipi-plugins-0.1+rc1/kipi-plugins/helloworld/Makefile.am 2005-12-30 22:04:23.000000000 +0100
+@@ -8,7 +8,7 @@
+ kipiplugin_helloworld_la_SOURCES = plugin_helloworld.cpp
+
+ # Libs needed by the plugin
+-kipiplugin_helloworld_la_LIBADD = $(LIB_KPARTS) $(LIBKIPI_LIBS)
++kipiplugin_helloworld_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt
+
+ # LD flags for the plugin
+ kipiplugin_helloworld_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+--- kipi-plugins-0.1+rc1.old/kipi-plugins/imagesgallery/Makefile.am 2005-09-14 20:38:09.000000000 +0200
++++ kipi-plugins-0.1+rc1/kipi-plugins/imagesgallery/Makefile.am 2005-12-30 19:52:38.000000000 +0100
+@@ -9,7 +9,7 @@
+ imagesgallery.cpp exifrestorer.cpp
+
+ # Libs needed by the plugin
+-kipiplugin_imagesgallery_la_LIBADD = $(LIB_KPARTS) $(LIBKIPI_LIBS)
++kipiplugin_imagesgallery_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt
+
+ # LD flags for the plugin
+ kipiplugin_imagesgallery_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+--- kipi-plugins-0.1+rc1.old/kipi-plugins/jpeglossless/Makefile.am 2005-09-14 20:38:09.000000000 +0200
++++ kipi-plugins-0.1+rc1/kipi-plugins/jpeglossless/Makefile.am 2005-12-30 22:02:24.000000000 +0100
+@@ -11,8 +11,7 @@
+ imagerotate.cpp convert2grayscale.cpp imageflip.cpp \
+ messagebox.cpp jpegtransform.cpp
+
+-kipiplugin_jpeglossless_la_LIBADD = $(LIB_KPARTS) \
+- -ljpeg $(LIBKIPI_LIBS) $(LIBKEXIF_LIBS) $(LIB_TIFF)
++kipiplugin_jpeglossless_la_LIBADD = -lkdefx -ljpeg $(LIBKEXIF_LIBS) $(LIB_TIFF) $(LIBKIPI_LIBS) $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt
+
+ kipiplugin_jpeglossless_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+
+--- kipi-plugins-0.1+rc1.old/kipi-plugins/kameraklient/Makefile.am 2005-09-14 20:38:09.000000000 +0200
++++ kipi-plugins-0.1+rc1/kipi-plugins/kameraklient/Makefile.am 2005-12-30 19:52:38.000000000 +0100
+@@ -7,7 +7,7 @@
+ kde_module_LTLIBRARIES = kipiplugin_kameraklient.la
+ kipiplugin_kameraklient_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP)
+
+-kipiplugin_kameraklient_la_LIBADD = $(LIB_KPARTS) $(LIB_KDEUI) $(LIBKIPI_LIBS) $(LIB_GPHOTO)
++kipiplugin_kameraklient_la_LIBADD = $(LIB_GPHOTO) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt
+
+ kipiplugin_kameraklient_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+
+--- kipi-plugins-0.1+rc1.old/kipi-plugins/mpegencoder/Makefile.am 2005-09-14 20:38:09.000000000 +0200
++++ kipi-plugins-0.1+rc1/kipi-plugins/mpegencoder/Makefile.am 2005-12-30 19:52:38.000000000 +0100
+@@ -10,7 +10,7 @@
+ optionsdialog.cpp checkbinprog.cpp
+
+ # Libs needed by the plugin
+-kipiplugin_mpegencoder_la_LIBADD = $(LIB_KPARTS) $(LIBKIPI_LIBS)
++kipiplugin_mpegencoder_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt
+
+ # LD flags for the plugin
+ kipiplugin_mpegencoder_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+--- kipi-plugins-0.1+rc1.old/kipi-plugins/printwizard/Makefile.am 2005-09-14 20:38:09.000000000 +0200
++++ kipi-plugins-0.1+rc1/kipi-plugins/printwizard/Makefile.am 2005-12-30 19:52:38.000000000 +0100
+@@ -6,8 +6,8 @@
+ kipiplugin_printwizard_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP)
+ kipiplugin_printwizard_la_SOURCES = frmprintwizardbase.ui plugin_printwizard.cpp frmprintwizard.cpp cropframe.cpp tphoto.cpp utils.cpp
+
+-#kipiplugin_printwizard_la_LIBADD = $(LIB_KPARTS) $(LIB_KDEPRINT) $(LIB_KDEUI) $(LIB_KDECORE) $(top_builddir)/libkipi/libkipi/libkipi.la
+-kipiplugin_printwizard_la_LIBADD = $(LIB_KPARTS) $(LIB_KDEPRINT) $(LIB_KDEUI) $(LIB_KDECORE) $(LIBKIPI_LIBS)
++#LIBKIPI_LIBS = $(top_builddir)/libkipi/libkipi/libkipi.la
++kipiplugin_printwizard_la_LIBADD = $(LIB_KDEPRINT) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt
+
+ kipiplugin_printwizard_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+
+--- kipi-plugins-0.1+rc1.old/kipi-plugins/rawconverter/Makefile.am 2005-09-14 20:38:09.000000000 +0200
++++ kipi-plugins-0.1+rc1/kipi-plugins/rawconverter/Makefile.am 2005-12-30 19:52:38.000000000 +0100
+@@ -10,7 +10,7 @@
+ processcontroller.cpp dmessagebox.cpp
+
+ # Libs needed by the plugin
+-kipiplugin_rawconverter_la_LIBADD = $(LIB_KPARTS) $(LIBKIPI_LIBS)
++kipiplugin_rawconverter_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt
+
+ # LD flags for the plugin
+ kipiplugin_rawconverter_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+--- kipi-plugins-0.1+rc1.old/kipi-plugins/sendimages/Makefile.am 2005-09-14 20:38:09.000000000 +0200
++++ kipi-plugins-0.1+rc1/kipi-plugins/sendimages/Makefile.am 2005-12-30 19:52:38.000000000 +0100
+@@ -10,7 +10,7 @@
+ exifrestorer.cpp
+
+ # Libs needed by the plugin
+-kipiplugin_sendimages_la_LIBADD = $(LIB_KPARTS) $(LIBKIPI_LIBS)
++kipiplugin_sendimages_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt
+
+ # LD flags for the plugin
+ kipiplugin_sendimages_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+--- kipi-plugins-0.1+rc1.old/kipi-plugins/slideshow/Makefile.am 2005-09-14 20:38:09.000000000 +0200
++++ kipi-plugins-0.1+rc1/kipi-plugins/slideshow/Makefile.am 2005-12-30 22:15:32.000000000 +0100
+@@ -10,8 +10,8 @@
+ slideshow.cpp slideshowconfig.cpp imlibiface.cpp \
+ slideshowgl.cpp toolbar.cpp
+
+-kipiplugin_slideshow_la_LIBADD = $(LIB_KPARTS) $(LIBKIPI_LIBS) \
+- $(LIB_IMLIB2) $(GL_LIBS)
++#kipiplugin_slideshow_la_LIBADD = -lkdefx $(LIB_IMLIB2) $(GL_LIBS) $(LIBKIPI_LIBS) $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt
++kipiplugin_slideshow_la_LIBADD = -lkdefx -lImlib2 $(GL_LIBS) $(LIBKIPI_LIBS) $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt
+
+ kipiplugin_slideshow_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+
+--- kipi-plugins-0.1+rc1.old/kipi-plugins/timeadjust/Makefile.am 2005-09-14 20:38:09.000000000 +0200
++++ kipi-plugins-0.1+rc1/kipi-plugins/timeadjust/Makefile.am 2005-12-30 22:03:28.000000000 +0100
+@@ -8,7 +8,7 @@
+ kipiplugin_timeadjust_la_SOURCES = plugin_timeadjust.cpp timeadjustdialog.cpp
+
+ # Libs needed by the plugin
+-kipiplugin_timeadjust_la_LIBADD = $(LIB_KPARTS) $(LIBKIPI_LIBS) $(LIBKEXIF_LIBS)
++kipiplugin_timeadjust_la_LIBADD = $(LIBKEXIF_LIBS) $(LIBKIPI_LIBS) $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt
+
+ # LD flags for the plugin
+ kipiplugin_timeadjust_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+--- kipi-plugins-0.1+rc1.old/kipi-plugins/wallpaper/Makefile.am 2005-09-14 20:38:09.000000000 +0200
++++ kipi-plugins-0.1+rc1/kipi-plugins/wallpaper/Makefile.am 2005-12-30 19:52:38.000000000 +0100
+@@ -5,7 +5,7 @@
+ kipiplugin_wallpaper_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP)
+ kipiplugin_wallpaper_la_SOURCES = plugin_wallpaper.cpp
+
+-kipiplugin_wallpaper_la_LIBADD = $(LIB_KPARTS) $(LIBKIPI_LIBS)
++kipiplugin_wallpaper_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt
+
+ kipiplugin_wallpaper_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+
Modified: kde-extras/kipi-plugins/trunk/debian/rules
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/rules 2005-12-30 03:47:30 UTC (rev 2720)
+++ kde-extras/kipi-plugins/trunk/debian/rules 2005-12-30 21:52:38 UTC (rev 2721)
@@ -1,11 +1,13 @@
#!/usr/bin/make -f
-DEB_CONFIGURE_USER_FLAGS = --disable-debug
-
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/kde.mk
-install/kipi-plugins::
- install -D -o root -g root -m 0644 debian/lintian $(CURDIR)/debian/kipi-plugins/usr/share/lintian/overrides/kipi-plugins
+clean ::
+ rm -f po/*/*.gmo
+buildprep: clean apply-patches
+ make -f admin/Makefile.common dist
+ debian/rules clean
+
More information about the pkg-kde-commits
mailing list