[Pkg-kde-commits] rev 2264 - trunk/packages/kdegraphics/debian/patches

Christopher Martin chrsmrtn at costa.debian.org
Mon Nov 14 02:03:11 UTC 2005 

Author: chrsmrtn
Date: 2005-11-14 02:03:08 +0000 (Mon, 14 Nov 2005)
New Revision: 2264

Modified:
   trunk/packages/kdegraphics/debian/patches/98_buildprep.diff
Log:
New buildprep. Again, if someone could help test kviewshell, djvu support, etc.
then that would be great.


Modified: trunk/packages/kdegraphics/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdegraphics/debian/patches/98_buildprep.diff	2005-11-14 02:02:07 UTC (rev 2263)
+++ trunk/packages/kdegraphics/debian/patches/98_buildprep.diff	2005-11-14 02:03:08 UTC (rev 2264)
@@ -2992,6 +2992,44 @@
    cat /dev/null > conftest.in
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+--- aclocal.m4
++++ aclocal.m4
+@@ -501,6 +501,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
 @@ -278,15 +278,15 @@
@@ -17266,7 +17304,6 @@
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-pmlistpattern.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlistpattern.png
 +	$(INSTALL_DATA) $(srcdir)/cr16-action-pmaddpointabove.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddpointabove.png
 +	$(INSTALL_DATA) $(srcdir)/cr16-action-pmskysphere.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmskysphere.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-pmdrag.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdrag.png
  	$(INSTALL_DATA) $(srcdir)/cr22-action-pmprojectedthrough.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmprojectedthrough.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-pmtexturedeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturedeclare.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-pmtexturemapdeclare.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturemapdeclare.png
@@ -17295,6 +17332,7 @@
 +	$(INSTALL_DATA) $(srcdir)/cr22-action-pmnormallist.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormallist.png
 +	$(INSTALL_DATA) $(srcdir)/cr16-action-pmspheresweep.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmspheresweep.png
 +	$(INSTALL_DATA) $(srcdir)/cr16-action-pmdifference.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdifference.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-pmdrag.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdrag.png
 +	$(INSTALL_DATA) $(srcdir)/cr16-action-pmcolormap.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolormap.png
 +	$(INSTALL_DATA) $(srcdir)/cr22-action-pmintersection.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmintersection.png
 +	$(INSTALL_DATA) $(srcdir)/cr16-action-pmaddpoint.png $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddpoint.png
@@ -17695,7 +17733,6 @@
 -	-rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmlistpattern.png
 +	-rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddpointabove.png
 +	-rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmskysphere.png
-+	-rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdrag.png
  	-rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmprojectedthrough.png
 -	-rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmtexturedeclare.png
 -	-rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmtexturemapdeclare.png
@@ -17724,6 +17761,7 @@
 +	-rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmnormallist.png
 +	-rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmspheresweep.png
 +	-rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmdifference.png
++	-rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmdrag.png
 +	-rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmcolormap.png
 +	-rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/22x22/actions/pmintersection.png
 +	-rm -f $(DESTDIR)$(pmtoolbardir)/crystalsvg/16x16/actions/pmaddpoint.png
@@ -19931,6 +19969,19 @@
  #>+ 15
 --- kviewshell/plugins/djvu/libdjvu/Makefile.in
 +++ kviewshell/plugins/djvu/libdjvu/Makefile.in
+@@ -54,9 +54,9 @@
+     *) f=$$p;; \
+   esac;
+ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)"
+-kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(kde_module_LTLIBRARIES)
++am__installdirs = "$(DESTDIR)$(libdir)"
++libLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ libdjvu_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ am_libdjvu_la_OBJECTS = Arrays.lo DjVuDocEditor.lo DjVuMessageLite.lo \
 @@ -273,6 +273,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -19941,6 +19992,15 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
+@@ -468,7 +471,7 @@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+ INCLUDES = -I$(top_srcdir) $(all_includes)
+-kde_module_LTLIBRARIES = libdjvu.la
++lib_LTLIBRARIES = libdjvu.la
+ libdjvu_la_LDFLAGS = -avoid-version $(all_libraries)
+ libdjvu_la_LIBADD = $(LIBJPEG)
+ libdjvu_la_SOURCES = Arrays.cpp DjVuDocEditor.cpp DjVuMessageLite.cpp GOS.cpp IW44Image.cpp \
 @@ -490,7 +493,7 @@
  
  .SUFFIXES:
@@ -19950,7 +20010,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -528,9 +531,9 @@
+@@ -528,39 +531,39 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19960,9 +20020,115 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+-install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
++install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -838,7 +841,7 @@
+-	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+-	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+-	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+-	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
++	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
++	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ 	  else :; fi; \
+ 	done
+ 
+-uninstall-kde_moduleLTLIBRARIES:
++uninstall-libLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
++	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ 	done
+ 
+-clean-kde_moduleLTLIBRARIES:
+-	-test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
+-	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++clean-libLTLIBRARIES:
++	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+ 	  test "$$dir" != "$$p" || dir=.; \
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libdjvu.la: $(libdjvu_la_OBJECTS) $(libdjvu_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(kde_moduledir) $(libdjvu_la_LDFLAGS) $(libdjvu_la_OBJECTS) $(libdjvu_la_LIBADD) $(LIBS)
++	$(CXXLINK) -rpath $(libdir) $(libdjvu_la_LDFLAGS) $(libdjvu_la_OBJECTS) $(libdjvu_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -733,7 +736,7 @@
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES)
+ installdirs:
+-	for dir in "$(DESTDIR)$(kde_moduledir)"; do \
++	for dir in "$(DESTDIR)$(libdir)"; do \
+ 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ 	done
+ install: install-am
+@@ -764,10 +767,10 @@
+ #>+ 1
+ clean: kde-rpo-clean  clean-am
+ 
+-#>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
++#>- clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ #>- 	mostlyclean-am
+ #>+ 2
+-clean-am: clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
++clean-am: clean-bcheck  clean-generic clean-libLTLIBRARIES clean-libtool \
+ 	mostlyclean-am
+ 
+ distclean: distclean-am
+@@ -786,13 +789,9 @@
+ 
+ info-am:
+ 
+-#>- install-data-am: install-kde_moduleLTLIBRARIES
+-#>+ 1
+-install-data-am:   
++install-data-am:
+ 
+-#>- install-exec-am:
+-#>+ 1
+-install-exec-am:  install-kde_moduleLTLIBRARIES
++install-exec-am: install-libLTLIBRARIES
+ 
+ install-info: install-info-am
+ 
+@@ -818,27 +817,27 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES
++uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+-	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
++	clean-libLTLIBRARIES clean-libtool ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+ 	install install-am install-data install-data-am install-exec \
+ 	install-exec-am install-info install-info-am \
+-	install-kde_moduleLTLIBRARIES install-man install-strip \
+-	installcheck installcheck-am installdirs maintainer-clean \
++	install-libLTLIBRARIES install-man install-strip installcheck \
++	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ 	tags uninstall uninstall-am uninstall-info-am \
+-	uninstall-kde_moduleLTLIBRARIES
++	uninstall-libLTLIBRARIES
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
  
  #>+ 2

More information about the pkg-kde-commits mailing list