[pkg-kde-commits] rev 2657 - trunk/packages/kdeartwork/debian/patches

Christopher Martin chrsmrtn at costa.debian.org
Sat Dec 17 19:52:16 UTC 2005 

Author: chrsmrtn
Date: 2005-12-17 19:52:10 +0000 (Sat, 17 Dec 2005)
New Revision: 2657

Modified:
   trunk/packages/kdeartwork/debian/patches/98_buildprep.diff
Log:
Update the kdeartwork buildprep for the new patches.


Modified: trunk/packages/kdeartwork/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdeartwork/debian/patches/98_buildprep.diff	2005-12-17 19:50:34 UTC (rev 2656)
+++ trunk/packages/kdeartwork/debian/patches/98_buildprep.diff	2005-12-17 19:52:10 UTC (rev 2657)
@@ -2957,6 +2957,15 @@
    done
  fi
  
+@@ -1957,7 +1959,7 @@
+ 
+ 
+ # Define the identity of the package.
+- PACKAGE=kdeartwork
++ PACKAGE=kdeartwork.dfsg.1
+  VERSION="3.5.0"
+ 
+ 
 @@ -2088,6 +2090,31 @@
  
  
@@ -8532,9 +8541,10 @@
        else
 -	ld_shlibs=no
 +	ld_shlibs_GCJ=no
-+      fi
-+      ;;
-+
+       fi
+       ;;
+ 
+-    netbsd*)
 +    linux*)
 +      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 +	tmp_addflag=
@@ -8564,10 +8574,9 @@
 +	link_all_deplibs_GCJ=no
 +      else
 +	ld_shlibs_GCJ=no
-       fi
-       ;;
- 
--    netbsd*)
++      fi
++      ;;
++
 +    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -10683,7 +10692,18 @@
      if test -r "$i/$j"; then
        echo "taking that" >&5
        XSCREENSAVER_CONFIG=$i
-@@ -33739,6 +34428,13 @@
+@@ -33542,10 +34231,6 @@
+ 
+           ac_config_files="$ac_config_files emoticons/KMess-Violet/Makefile"
+ 
+-          ac_config_files="$ac_config_files emoticons/YazooSmileys16/Makefile"
+-
+-          ac_config_files="$ac_config_files emoticons/YazooSmileys22/Makefile"
+-
+           ac_config_files="$ac_config_files emoticons/ccmathteam.com/Makefile"
+ 
+           ac_config_files="$ac_config_files emoticons/greggman.com/Makefile"
+@@ -33739,6 +34424,13 @@
  LTLIBOBJS=$ac_ltlibobjs
  
  
@@ -10697,7 +10717,16 @@
  if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
    { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
-@@ -34520,6 +35216,9 @@
+@@ -34346,8 +35038,6 @@
+   "emoticons/KMess-Blue/Makefile" ) CONFIG_FILES="$CONFIG_FILES emoticons/KMess-Blue/Makefile" ;;
+   "emoticons/KMess-Cartoon/Makefile" ) CONFIG_FILES="$CONFIG_FILES emoticons/KMess-Cartoon/Makefile" ;;
+   "emoticons/KMess-Violet/Makefile" ) CONFIG_FILES="$CONFIG_FILES emoticons/KMess-Violet/Makefile" ;;
+-  "emoticons/YazooSmileys16/Makefile" ) CONFIG_FILES="$CONFIG_FILES emoticons/YazooSmileys16/Makefile" ;;
+-  "emoticons/YazooSmileys22/Makefile" ) CONFIG_FILES="$CONFIG_FILES emoticons/YazooSmileys22/Makefile" ;;
+   "emoticons/ccmathteam.com/Makefile" ) CONFIG_FILES="$CONFIG_FILES emoticons/ccmathteam.com/Makefile" ;;
+   "emoticons/greggman.com/Makefile" ) CONFIG_FILES="$CONFIG_FILES emoticons/greggman.com/Makefile" ;;
+   "emoticons/phpBB/Makefile" ) CONFIG_FILES="$CONFIG_FILES emoticons/phpBB/Makefile" ;;
+@@ -34520,6 +35210,9 @@
  s, at AMTAR@,$AMTAR,;t t
  s, at am__tar@,$am__tar,;t t
  s, at am__untar@,$am__untar,;t t
@@ -10707,7 +10736,7 @@
  s, at KDECONFIG@,$KDECONFIG,;t t
  s, at kde_libs_prefix@,$kde_libs_prefix,;t t
  s, at kde_libs_htmldir@,$kde_libs_htmldir,;t t
-@@ -34901,11 +35600,6 @@
+@@ -34901,11 +35594,6 @@
    *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
    esac
  
@@ -10719,7 +10748,7 @@
    # Let's still pretend it is `configure' which instantiates (i.e., don't
    # use $as_me), people would be surprised to read:
    #    /* config.h.  Generated by config.status.  */
-@@ -34944,6 +35638,12 @@
+@@ -34944,6 +35632,12 @@
  	 fi;;
        esac
      done` || { (exit 1); exit 1; }
@@ -10734,15 +10763,26 @@
    sed "$ac_vpsub
 --- configure.in
 +++ configure.in
-@@ -42,6 +42,8 @@
- dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdeartwork, "3.5.0") dnl searches for some needed programs
+@@ -40,7 +40,9 @@
+ AC_ARG_PROGRAM
  
-+AM_MAINTAINER_MODE
+ dnl Automake doc recommends to do this only here. (Janos)
+-AM_INIT_AUTOMAKE(kdeartwork, "3.5.0") dnl searches for some needed programs
++AM_INIT_AUTOMAKE(kdeartwork.dfsg.1, "3.5.0") dnl searches for some needed programs
 +
++AM_MAINTAINER_MODE
+ 
  KDE_SET_PREFIX
  
- dnl generate the config header
+@@ -257,8 +259,6 @@
+ AC_CONFIG_FILES([ emoticons/KMess-Blue/Makefile ])
+ AC_CONFIG_FILES([ emoticons/KMess-Cartoon/Makefile ])
+ AC_CONFIG_FILES([ emoticons/KMess-Violet/Makefile ])
+-AC_CONFIG_FILES([ emoticons/YazooSmileys16/Makefile ])
+-AC_CONFIG_FILES([ emoticons/YazooSmileys22/Makefile ])
+ AC_CONFIG_FILES([ emoticons/ccmathteam.com/Makefile ])
+ AC_CONFIG_FILES([ emoticons/greggman.com/Makefile ])
+ AC_CONFIG_FILES([ emoticons/phpBB/Makefile ])
 --- emoticons/BoxedEmoticonSet/Makefile.in
 +++ emoticons/BoxedEmoticonSet/Makefile.in
 @@ -195,6 +195,9 @@
@@ -11091,7 +11131,17 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -355,7 +358,7 @@
+@@ -347,15 +350,15 @@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+ SUBDIRS = ccmathteam.com greggman.com phpBB 	plain redones set1 \
+-	BoxedEmoticonSet 	KMess KMess-Blue KMess-Violet KMess-Cartoon 	YazooSmileys16 \
+-	YazooSmileys22 GroupWise
++	BoxedEmoticonSet 	KMess KMess-Blue KMess-Violet KMess-Cartoon \
++	GroupWise
+ 
+ #>- all: all-recursive
+ #>+ 1
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -11280,90 +11330,6 @@
  
  #>+ 2
  docs-am:
---- emoticons/YazooSmileys16/Makefile.in
-+++ emoticons/YazooSmileys16/Makefile.in
-@@ -195,6 +195,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -349,7 +352,7 @@
- all: docs-am  all-am
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -387,9 +390,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
-@@ -548,7 +551,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=ooooh.png readme.txt cool.png tongue_out.png lol.png confused.png Makefile.in big_smile.png angry.png smile.png Makefile.am emoticons.xml wink.png sad.png 
-+KDE_DIST=ooooh.png readme.txt cool.png tongue_out.png lol.png confused.png Makefile.in big_smile.png angry.png smile.png emoticons.xml Makefile.am wink.png sad.png 
- 
- #>+ 2
- docs-am:
---- emoticons/YazooSmileys22/Makefile.in
-+++ emoticons/YazooSmileys22/Makefile.in
-@@ -195,6 +195,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -349,7 +352,7 @@
- all: docs-am  all-am
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -387,9 +390,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
-@@ -548,7 +551,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=ooooh.png readme.txt cool.png tongue_out.png lol.png confused.png Makefile.in big_smile.png angry.png smile.png Makefile.am emoticons.xml wink.png sad.png 
-+KDE_DIST=ooooh.png readme.txt cool.png tongue_out.png lol.png confused.png Makefile.in big_smile.png angry.png smile.png emoticons.xml Makefile.am wink.png sad.png 
- 
- #>+ 2
- docs-am:
 --- icewm-themes/Makefile.in
 +++ icewm-themes/Makefile.in
 @@ -201,6 +201,9 @@

More information about the pkg-kde-commits mailing list