[pkg-kde-commits] rev 2534 - in trunk/packages/kdebindings/debian:
. patches
Christopher Martin
chrsmrtn at costa.debian.org
Sun Dec 4 20:52:27 UTC 2005
Author: chrsmrtn
Date: 2005-12-04 20:52:25 +0000 (Sun, 04 Dec 2005)
New Revision: 2534
Modified:
trunk/packages/kdebindings/debian/changelog
trunk/packages/kdebindings/debian/compat
trunk/packages/kdebindings/debian/control
trunk/packages/kdebindings/debian/libqt3-java.install
trunk/packages/kdebindings/debian/patches/98_buildprep.diff
trunk/packages/kdebindings/debian/rules
Log:
Sync kdebindings branch with trunk.
Modified: trunk/packages/kdebindings/debian/changelog
===================================================================
--- trunk/packages/kdebindings/debian/changelog 2005-12-04 20:49:35 UTC (rev 2533)
+++ trunk/packages/kdebindings/debian/changelog 2005-12-04 20:52:25 UTC (rev 2534)
@@ -1,3 +1,14 @@
+kdebindings (4:3.4.3-2) unstable; urgency=low
+
+ +++ Changes by Christopher Martin:
+
+ * Fix a debian/rules bashism which resulted in some extra files being
+ installed, which led to conflicts. (Closes: #341789)
+
+ * Bump DH_COMPAT to 5. No changes required.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 4 Dec 2005 09:56:22 -0500
+
kdebindings (4:3.4.3-1) unstable; urgency=low
* New upstream release.
Modified: trunk/packages/kdebindings/debian/compat
===================================================================
--- trunk/packages/kdebindings/debian/compat 2005-12-04 20:49:35 UTC (rev 2533)
+++ trunk/packages/kdebindings/debian/compat 2005-12-04 20:52:25 UTC (rev 2534)
@@ -1 +1 @@
-4
+5
Modified: trunk/packages/kdebindings/debian/control
===================================================================
--- trunk/packages/kdebindings/debian/control 2005-12-04 20:49:35 UTC (rev 2533)
+++ trunk/packages/kdebindings/debian/control 2005-12-04 20:52:25 UTC (rev 2534)
@@ -1,9 +1,9 @@
Source: kdebindings
-Build-Depends: g++-3.4 [arm hppa m68k], cdbs (>= 0.4.27), debhelper (>> 4.0.0), gawk, gettext, java-gcj-compat-dev [alpha amd64 i386 ia64 powerpc s390 sparc], kdelibs4-dev (>= 4:3.4.3), libgtk1.2-dev, python-dev, libqt3-compat-headers (>= 3:3.3.3), ruby, ruby1.8-dev
+Build-Depends: g++-3.4 [arm hppa m68k], cdbs (>= 0.4.27), debhelper (>= 5.0), gawk, gettext, java-gcj-compat-dev [alpha amd64 i386 ia64 powerpc s390 sparc], kdelibs4-dev (>= 4:3.4.3), libgtk1.2-dev, python-dev, libqt3-compat-headers (>= 3:3.3.3), ruby, ruby1.8-dev
Section: devel
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Pierre Habouzit <madcoder at debian.org>, Adeodato Simó <dato at net.com.org.es>, Riku Voipio <riku.voipio at iki.fi>, Luk Claes <luk at debian.org>
+Uploaders: Isaac Clerencia <isaac at debian.org>, Pierre Habouzit <madcoder at debian.org>, Christopher Martin <chrsmrtn at debian.org>, Adeodato Simó <dato at net.com.org.es>, Riku Voipio <riku.voipio at iki.fi>, Luk Claes <luk at debian.org>
Standards-Version: 3.6.2
Package: kdebindings-java
Modified: trunk/packages/kdebindings/debian/libqt3-java.install
===================================================================
--- trunk/packages/kdebindings/debian/libqt3-java.install 2005-12-04 20:49:35 UTC (rev 2533)
+++ trunk/packages/kdebindings/debian/libqt3-java.install 2005-12-04 20:52:25 UTC (rev 2534)
@@ -1,2 +1,2 @@
debian/tmp/usr/share/java/qtjava*.jar
-debian/tmp/usr/doc/javalib/*.html /usr/share/doc/libqt3-java/html
+debian/tmp/usr/share/doc/kde/HTML/en/javalib/*.html /usr/share/doc/libqt3-java/html
Modified: trunk/packages/kdebindings/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/98_buildprep.diff 2005-12-04 20:49:35 UTC (rev 2533)
+++ trunk/packages/kdebindings/debian/patches/98_buildprep.diff 2005-12-04 20:52:25 UTC (rev 2534)
@@ -1517,6 +1517,53 @@
AC_MSG_RESULT([$SED])
])
+--- aclocal.m4
++++ aclocal.m4
+@@ -350,7 +350,7 @@
+ # with or without modifications, as long as this notice is preserved.
+
+ AC_DEFUN([AM_PROG_GCJ],[
+-AC_CHECK_PROGS(GCJ, gcj, gcj)
++AC_CHECK_PROGS(GCJ, [gcj gcj-3.2 gcj-3.1 gcj-3.0 gcj-2.95], gcj)
+ test -z "$GCJ" && AC_MSG_ERROR([no acceptable gcj found in \$PATH])
+ if test "x${GCJFLAGS-unset}" = xunset; then
+ GCJFLAGS="-g -O2"
+@@ -520,6 +520,35 @@
+ rmdir .tst 2>/dev/null
+ AC_SUBST([am__leading_dot])])
+
++# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
++# From Jim Meyering
++
++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 4
++
++AC_DEFUN([AM_MAINTAINER_MODE],
++[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
++ dnl maintainer-mode is disabled by default
++ AC_ARG_ENABLE(maintainer-mode,
++[ --enable-maintainer-mode enable make rules and dependencies not useful
++ (and sometimes confusing) to the casual installer],
++ USE_MAINTAINER_MODE=$enableval,
++ USE_MAINTAINER_MODE=no)
++ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
++ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
++ MAINT=$MAINTAINER_MODE_TRUE
++ AC_SUBST(MAINT)dnl
++]
++)
++
++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
++
+ # Check to see how 'make' treats includes. -*- Autoconf -*-
+
+ # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
--- configure
+++ configure
@@ -466,7 +466,7 @@
@@ -9792,6 +9839,33 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
+@@ -805,7 +809,7 @@
+ -rm -f kdedcoptest.moc
+
+ #>+ 2
+-KDE_DIST=Makefile.in kdedcoptest.desktop gen.py kdedcoptestui.rc mainclass.h hi32-app-kdedcoptest.png hi16-app-kdedcoptest.png Makefile.am
++KDE_DIST=Makefile.in kdedcoptest.desktop gen.py kdedcoptestui.rc mainclass.h hi16-app-kdedcoptest.png hi32-app-kdedcoptest.png Makefile.am
+
+ #>+ 4
+ clean-idl:
+@@ -817,14 +821,14 @@
+
+ #>+ 10
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-kdedcoptest.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdedcoptest.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-kdedcoptest.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdedcoptest.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-kdedcoptest.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdedcoptest.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdedcoptest.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdedcoptest.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdedcoptest.png
+
+ #>+ 15
+ force-reedit:
--- dcoppython/test/Makefile.in
+++ dcoppython/test/Makefile.in
@@ -184,6 +184,9 @@
@@ -9833,6 +9907,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -549,7 +553,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=test.py README-server Makefile.in test4.py automate_presentation.py signal.py Makefile.am server.py test3.py test2.py
++KDE_DIST=test.py README-server Makefile.in test4.py automate_presentation.py signal.py Makefile.am test3.py server.py test2.py
+
+ #>+ 2
+ docs-am:
--- kdejava/koala/kdejava/Makefile.in
+++ kdejava/koala/kdejava/Makefile.in
@@ -56,9 +56,9 @@
@@ -10466,6 +10549,45 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+@@ -750,22 +754,22 @@
+ mocs: kconfig_imp.moc
+
+ #>+ 3
+-netaccess_imp.moc: $(srcdir)/netaccess_imp.h
+- $(MOC) $(srcdir)/netaccess_imp.h -o netaccess_imp.moc
++dcop_imp.moc: $(srcdir)/dcop_imp.h
++ $(MOC) $(srcdir)/dcop_imp.h -o dcop_imp.moc
+
+ #>+ 2
+-mocs: netaccess_imp.moc
++mocs: dcop_imp.moc
+
+ #>+ 3
+-dcop_imp.moc: $(srcdir)/dcop_imp.h
+- $(MOC) $(srcdir)/dcop_imp.h -o dcop_imp.moc
++netaccess_imp.moc: $(srcdir)/netaccess_imp.h
++ $(MOC) $(srcdir)/netaccess_imp.h -o netaccess_imp.moc
+
+ #>+ 2
+-mocs: dcop_imp.moc
++mocs: netaccess_imp.moc
+
+ #>+ 3
+ clean-metasources:
+- -rm -f bindingobject.moc movie_imp.moc sql_imp.moc kconfig_imp.moc netaccess_imp.moc dcop_imp.moc
++ -rm -f bindingobject.moc movie_imp.moc sql_imp.moc kconfig_imp.moc dcop_imp.moc netaccess_imp.moc
+
+ #>+ 2
+ KDE_DIST=point_imp.h sql_imp.h kconfig_imp.h pen_imp.h size_imp.h movie_imp.h brush_imp.h iconset_imp.h netaccess_imp.h painter_imp.h bindingobject.h Makefile.am bindings.pro rect_imp.h Makefile.in image_imp.h pixmap_imp.h dcop_imp.h
+@@ -812,7 +816,7 @@
+
+
+ #>+ 11
+-libkjsembedbindings_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/image_imp.cpp $(srcdir)/dcop_imp.cpp $(srcdir)/painter_imp.cpp $(srcdir)/pixmap_imp.cpp $(srcdir)/netaccess_imp.cpp $(srcdir)/kconfig_imp.cpp $(srcdir)/bindingobject.cpp $(srcdir)/movie_imp.cpp $(srcdir)/sql_imp.cpp $(srcdir)/pen_imp.cpp $(srcdir)/brush_imp.cpp $(srcdir)/iconset_imp.cpp $(srcdir)/point_imp.cpp $(srcdir)/rect_imp.cpp $(srcdir)/size_imp.cpp bindingobject.moc movie_imp.moc sql_imp.moc kconfig_imp.moc dcop_imp.moc netaccess_imp.moc
++libkjsembedbindings_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/image_imp.cpp $(srcdir)/dcop_imp.cpp $(srcdir)/painter_imp.cpp $(srcdir)/pixmap_imp.cpp $(srcdir)/netaccess_imp.cpp $(srcdir)/kconfig_imp.cpp $(srcdir)/bindingobject.cpp $(srcdir)/movie_imp.cpp $(srcdir)/sql_imp.cpp $(srcdir)/pen_imp.cpp $(srcdir)/brush_imp.cpp $(srcdir)/iconset_imp.cpp $(srcdir)/point_imp.cpp $(srcdir)/rect_imp.cpp $(srcdir)/size_imp.cpp bindingobject.moc movie_imp.moc sql_imp.moc kconfig_imp.moc netaccess_imp.moc dcop_imp.moc
+ @echo 'creating libkjsembedbindings_la.all_cpp.cpp ...'; \
+ rm -f libkjsembedbindings_la.all_cpp.files libkjsembedbindings_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkjsembedbindings_la.all_cpp.final; \
--- kjsembed/builtins/Makefile.in
+++ kjsembed/builtins/Makefile.in
@@ -225,6 +225,9 @@
@@ -11689,7 +11811,7 @@
#>+ 2
-KDE_DIST=subdirs Makefile.in configure.in.bot configure.files config.h.in Makefile.am.in.wo kdebindings.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am acinclude.m4 Makefile.am.in
-+KDE_DIST=stamp-h.in subdirs Makefile.in configure.in.bot configure.files config.h.in Makefile.am.in.wo kdebindings.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in configure acinclude.m4 Makefile.am Makefile.am.in
++KDE_DIST=stamp-h.in subdirs Makefile.in configure.in.bot configure.files config.h.in Makefile.am.in.wo kdebindings.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in configure Makefile.am acinclude.m4 Makefile.am.in
#>+ 2
docs-am:
@@ -13540,3 +13662,37 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -800,18 +804,18 @@
+ .NOEXPORT:
+
+ #>+ 3
+-xp_notepad_factory.moc: $(srcdir)/xp_notepad_factory.h
+- $(MOC) $(srcdir)/xp_notepad_factory.h -o xp_notepad_factory.moc
++shell_xparthost.moc: $(srcdir)/shell_xparthost.h
++ $(MOC) $(srcdir)/shell_xparthost.h -o shell_xparthost.moc
+
+ #>+ 2
+-mocs: xp_notepad_factory.moc
++mocs: shell_xparthost.moc
+
+ #>+ 3
+-shell_xparthost.moc: $(srcdir)/shell_xparthost.h
+- $(MOC) $(srcdir)/shell_xparthost.h -o shell_xparthost.moc
++xp_notepad_factory.moc: $(srcdir)/xp_notepad_factory.h
++ $(MOC) $(srcdir)/xp_notepad_factory.h -o xp_notepad_factory.moc
+
+ #>+ 2
+-mocs: shell_xparthost.moc
++mocs: xp_notepad_factory.moc
+
+ #>+ 9
+ xpart.kidl: $(srcdir)/../src/interfaces/xpart.h $(DCOP_DEPENDENCIES)
+@@ -825,7 +829,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f xp_notepad_factory.moc shell_xparthost.moc
++ -rm -f shell_xparthost.moc xp_notepad_factory.moc
+
+ #>+ 2
+ KDE_DIST=xp_notepad_factory.h xp_notepad.rc shell_xparthost.h Makefile.am shell_xparthost.rc Makefile.in xp_notepad.desktop
Modified: trunk/packages/kdebindings/debian/rules
===================================================================
--- trunk/packages/kdebindings/debian/rules 2005-12-04 20:49:35 UTC (rev 2533)
+++ trunk/packages/kdebindings/debian/rules 2005-12-04 20:52:25 UTC (rev 2534)
@@ -93,12 +93,16 @@
common-binary-post-install-arch::
for p in $(PACKAGES_WITH_USD_SYMLINK); do \
- rm -f debian/$$p/usr/share/doc/$$p/{copyright,changelog.Debian,changelog}; \
+ rm -f debian/$$p/usr/share/doc/$$p/copyright; \
+ rm -f debian/$$p/usr/share/doc/$$p/changelog.Debian; \
+ rm -f debian/$$p/usr/share/doc/$$p/changelog; \
done
common-binary-post-install-indep::
for p in $(PACKAGES_WITH_USD_SYMLINK); do \
- rm -f debian/$$p/usr/share/doc/$$p/{copyright,changelog.Debian,changelog}; \
+ rm -f debian/$$p/usr/share/doc/$$p/copyright; \
+ rm -f debian/$$p/usr/share/doc/$$p/changelog.Debian; \
+ rm -f debian/$$p/usr/share/doc/$$p/changelog; \
done
PACKAGES_WITH_USD_SYMLINK = kdebindings-java libkde3-java libqt3-java \
More information about the pkg-kde-commits
mailing list