[Pkg-kde-extras] Re: rev 3698 - in kde-extras/libkipi/trunk/debian: . patches

[Achim Bohnet]

On Wednesday 10 May 2006 01:19, Achim Bohnet wrote:
> On Tuesday 09 May 2006 23:38, Mark Purcell wrote:
> > Author: msp
> > Date: 2006-05-09 21:38:33 +0000 (Tue, 09 May 2006)
> > New Revision: 3698
> > 
> > Removed:
> >    kde-extras/libkipi/trunk/debian/patches/02_autotools_update.diff
> >    kde-extras/libkipi/trunk/debian/patches/03_libtool_update.diff
> >    kde-extras/libkipi/trunk/debian/patches/04_am_maintainer_mode.diff
> >    kde-extras/libkipi/trunk/debian/patches/05_pedantic-errors.diff
> >    kde-extras/libkipi/trunk/debian/patches/06_aclocal_update.diff
>                                              ^^^^^^^^^^^^^^^^^^^^^^
> 
> Ah, another little detail:  After running buildprep aclocal is rebuild
> nevertheless :(  Run: debuild; debuild -S -sa
> and you will find it in the libkipi diff.gz.   I simply/lazily extracted
> this aclocal change from the diff and copied it into patches/
> 
> After this, builds are idempotent, aka one can run debuild several
> times and the diff.gz will not change.
> 
> I've never had the energy to find out why aclocal is rebuild.  Too much
> black auto* magic scared me ;)
> 
> Achim

Hi,

I was curious what else I missed and tried myself. Looks like I remembered
everything (tm).  In case you don't follow pkg-kde-commits commit logs
appened.

Mark: I hope I did not step on stuff you were already
working on *duck*.  With libkexif and kipi-plugins there's
still lot's of relibtoolization-update work pending ;)


About digikam and digikamimageplugins relibtoolization:
0.8.2 is planed to be the last in the 0.8 series (I'm
preparing/testing rc1 tarball right now.)
First 0.9 releases will follow end May or start of June.
Lot's of stuff has changed in 0.9.  So IMHO better wait
with relibtoolization for 0.9.  I'm sure we can fix the
list of libs used in Makefile.am before 0.9 final so
only the 0N_* patches from common-patches will be necessary.

Achim
-------------------------------------------------------------------------------

Author: ach-guest
Date: 2006-05-10 01:28:07 +0000 (Wed, 10 May 2006)
New Revision: 3702

Added:
   kde-extras/libkipi/trunk/debian/patches/04_am_maintainer_mode.diff
   kde-extras/libkipi/trunk/debian/patches/10_aclocal.m4_update.diff
   kde-extras/libkipi/trunk/debian/patches/98_buildprep.diff
Log:
libkexif:
   o add updated 98_buildprep.diff

   o add 10_aclocal.m4_update.diff extracted from *.diff.gz

   o add 04_am_maintainer_mode.diff: is necessary, otherwise Makefile*
     will be rebuild during pkg build.

[... huge diff ignored ...]

-------------------------------------------------------------------------------


Author: ach-guest
Date: 2006-05-10 01:26:06 +0000 (Wed, 10 May 2006)
New Revision: 3701

Added:
   kde-extras/libkipi/trunk/debian/patches/99_only_-lqt-mt.diff
Modified:
   kde-extras/libkipi/trunk/debian/changelog
Log:
libkipi:

   o update changelog:
    list 08_disable-visibility.diff as a droped patch.  This makes
    Kubuntu MOTUs happy. They recommend to list every added or droped
    patch in changelog
    
   o Replace 10_link_to_right_libs.diff with 99_only_-lqt-mt.diff
     Relibtoolization patch was accepted upstream, except for LIB_QT hack.
     Now patch configure to hardcode LIB_QT to -lqt-mt instead of
     patching every Makefile.am/.in.

   o 10_aclocal.m4_update.diff is extracted from .diff.gz.  Still not
     sure why this file is rebuild when buildprep is used


Modified: kde-extras/libkipi/trunk/debian/changelog
===================================================================
--- kde-extras/libkipi/trunk/debian/changelog   2006-05-09 23:47:50 UTC (rev 3700)
+++ kde-extras/libkipi/trunk/debian/changelog   2006-05-10 01:26:06 UTC (rev 3701)
@@ -3,8 +3,16 @@
   [ Mark Purcell ]
   * New upstream release
   * Relibtoolize from /pkg-kde/trunk/common-patches/ for 3.5.2
-  * Dropped others from debian/patches (seems OK)
+  * Dropped from debian/patches (seems OK)
+      + 08_disable-visibility.diff
 
+   [ Achim Bohnet ]
+   o Update 98_buildprep.diff
+   o Replace 10_link_to_right_libs.diff with 99_only_-lqt-mt.diff
+     Relibtoolization patch was accepted upstream, except for LIB_QT hack.
+     Now patch configure to hardcode LIB_QT to -lqt-mt instead of
+     patching every Makefile.am/.in.
+
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Tue,  9 May 2006 22:45:55 +0100
 
 libkipi (0.1.2-4) unstable; urgency=low

Added: kde-extras/libkipi/trunk/debian/patches/99_only_-lqt-mt.diff
===================================================================
--- kde-extras/libkipi/trunk/debian/patches/99_only_-lqt-mt.diff        2006-05-09 23:47:50 UTC (rev 3700)
+++ kde-extras/libkipi/trunk/debian/patches/99_only_-lqt-mt.diff        2006-05-10 01:26:06 UTC (rev 3701)
@@ -0,0 +1,20 @@
+--- configure.orig     2006-05-10 02:13:58.000000000 +0200
++++ configure  2006-05-10 02:14:58.000000000 +0200
+@@ -33431,7 +33431,7 @@
+ s, at MOC@,$MOC,;t t
+ s, at UIC@,$UIC,;t t
+ s, at UIC_TR@,$UIC_TR,;t t
+-s, at LIB_QT@,$LIB_QT,;t t
++s, at LIB_QT@,-lqt-mt,;t t
+ s, at LIB_QPE@,$LIB_QPE,;t t
+ s, at kde_qtver@,$kde_qtver,;t t
+ s, at KDE_EXTRA_RPATH@,$KDE_EXTRA_RPATH,;t t
+@@ -35686,7 +35686,7 @@
+ s, at MOC@,$MOC,;t t
+ s, at UIC@,$UIC,;t t
+ s, at UIC_TR@,$UIC_TR,;t t
+-s, at LIB_QT@,$LIB_QT,;t t
++s, at LIB_QT@,-lqt-mt,;t t
+ s, at LIB_QPE@,$LIB_QPE,;t t
+ s, at kde_qtver@,$kde_qtver,;t t
+ s, at KDE_EXTRA_RPATH@,$KDE_EXTRA_RPATH,;t t

-------------------------------------------------------------------------------

-- 
  To me vi is Zen.  To use vi is to practice zen. Every command is
  a koan. Profound to the user, unintelligible to the uninitiated.
  You discover truth everytime you use it.
                                      -- reddy at lion.austin.ibm.com