rev 7619 - in kde-extras/filelight/trunk/debian: . patches

[Raúl Sánchez Siles]

Author: kebianizao-guest
Date: 2007-10-20 23:33:17 +0000 (Sat, 20 Oct 2007)
New Revision: 7619

Added:
   kde-extras/filelight/trunk/debian/patches/
   kde-extras/filelight/trunk/debian/patches/00list
   kde-extras/filelight/trunk/debian/patches/01_filelight_1.0-1.dpatch
Modified:
   kde-extras/filelight/trunk/debian/changelog
   kde-extras/filelight/trunk/debian/control
   kde-extras/filelight/trunk/debian/rules
Log:
Implement dpatch on rules.

Modified: kde-extras/filelight/trunk/debian/changelog
===================================================================
--- kde-extras/filelight/trunk/debian/changelog	2007-10-20 22:11:01 UTC (rev 7618)
+++ kde-extras/filelight/trunk/debian/changelog	2007-10-20 23:33:17 UTC (rev 7619)
@@ -26,8 +26,9 @@
   * Honour the nostrip in the DEB_BUILD_OPTIONS.
   * Changed menu section to Applications/File Management to comply with newer
     menu policy.
+  * Implemented dpatch, avoiding direct upstream patching(ugly).
 
- -- Raúl Sánchez Siles <rasasi78 at gmail.com>  Sun, 21 Oct 2007 00:01:37 +0200
+ -- Raúl Sánchez Siles <rasasi78 at gmail.com>  Sun, 21 Oct 2007 01:31:16 +0200
 
 filelight (0.99beta6-1) unstable; urgency=low
 

Modified: kde-extras/filelight/trunk/debian/control
===================================================================
--- kde-extras/filelight/trunk/debian/control	2007-10-20 22:11:01 UTC (rev 7618)
+++ kde-extras/filelight/trunk/debian/control	2007-10-20 23:33:17 UTC (rev 7619)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: James Troup <james at nocrew.org>
 Standards-Version: 3.6.2.1
-Build-Depends: kdelibs4-dev, xutils, chrpath, autoconf, gettext
+Build-Depends: kdelibs4-dev, xutils, chrpath, autoconf, gettext, dpatch
 
 Package: filelight
 Architecture: any

Added: kde-extras/filelight/trunk/debian/patches/00list
===================================================================
--- kde-extras/filelight/trunk/debian/patches/00list	                        (rev 0)
+++ kde-extras/filelight/trunk/debian/patches/00list	2007-10-20 23:33:17 UTC (rev 7619)
@@ -0,0 +1 @@
+01_filelight_1.0-1

Added: kde-extras/filelight/trunk/debian/patches/01_filelight_1.0-1.dpatch
===================================================================
--- kde-extras/filelight/trunk/debian/patches/01_filelight_1.0-1.dpatch	                        (rev 0)
+++ kde-extras/filelight/trunk/debian/patches/01_filelight_1.0-1.dpatch	2007-10-20 23:33:17 UTC (rev 7619)
@@ -0,0 +1,81 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## filelight_1.0-1.diff.gz_01.dpatch by Raúl Sánchez Siles <rasasi78 at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: New patch generated from filelight 1.0-1 diff.gz
+
+ at DPATCH@
+
+--- filelight-1.0.orig/src/part/radialMap/Makefile.am
++++ filelight-1.0/src/part/radialMap/Makefile.am
+@@ -1,4 +1,5 @@
+ INCLUDES = -I$(top_srcdir)/src/part $(all_includes)
+ METASOURCES = AUTO
+ noinst_LTLIBRARIES = libradialmap.la
++libradialmap_a_CFLAGS = -fPIC
+ libradialmap_la_SOURCES = widget.cpp builder.cpp map.cpp widgetEvents.cpp labels.cpp segmentTip.cpp
+--- filelight-1.0.orig/src/part/radialMap/Makefile.in
++++ filelight-1.0/src/part/radialMap/Makefile.in
+@@ -298,7 +298,7 @@
+ 
+ DEFS = @DEFS@
+ DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+-CPPFLAGS = @CPPFLAGS@
++CPPFLAGS = @CPPFLAGS@ -fPIC
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+@@ -561,6 +561,8 @@
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
++
++
+ #>+ 3
+ widget.moc: $(srcdir)/widget.h
+ 	$(MOC) $(srcdir)/widget.h -o widget.moc
+@@ -573,7 +575,7 @@
+ 	-rm -f  widget.moc
+ 
+ #>+ 2
+-KDE_DIST=widget.h radialMap.h segmentTip.h builder.h sincos.h 
++KDE_DIST=widget.h radialMap.h libradialmap.a segmentTip.h builder.h sincos.h 
+ 
+ #>+ 2
+ docs-am:
+--- filelight-1.0.orig/misc/filelight.desktop
++++ filelight-1.0/misc/filelight.desktop
+@@ -3,7 +3,7 @@
+ Encoding=UTF-8
+ Name=Filelight
+ Name[xx]=xxFilelightxx
+-Generic Name=Disk Usage Statistics
++GenericName=Disk Usage Statistics
+ Type=Application
+ Exec=filelight %f
+ Icon=filelight.png
+--- filelight-1.0.orig/configure
++++ filelight-1.0/configure
+@@ -37149,11 +37149,6 @@
+ 
+ { (exit 0); exit 0; }
+ _ACEOF
+-if test "x$with_fast_perl" = "xyes"; then    
+-  perl -i.bak $ac_aux_dir/conf.change.pl $CONFIG_STATUS    \
+-    || mv $CONFIG_STATUS.bak $CONFIG_STATUS    
+-  rm -f $CONFIG_STATUS.bak
+-fi    
+ chmod +x $CONFIG_STATUS
+ ac_clean_files=$ac_clean_files_save
+ 
+--- filelight-1.0.orig/Makefile.in
++++ filelight-1.0/Makefile.in
+@@ -656,7 +656,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=COPYING-DOCS subdirs configure.files Makefile.cvs filelight.lsm configure.in.in 
++KDE_DIST=COPYING-DOCS subdirs filelight.lsm configure.in.in 
+ 
+ #>+ 2
+ docs-am:


Property changes on: kde-extras/filelight/trunk/debian/patches/01_filelight_1.0-1.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: kde-extras/filelight/trunk/debian/rules
===================================================================
--- kde-extras/filelight/trunk/debian/rules	2007-10-20 22:11:01 UTC (rev 7618)
+++ kde-extras/filelight/trunk/debian/rules	2007-10-20 23:33:17 UTC (rev 7619)
@@ -15,13 +15,17 @@
 install_binary=install -m 755 -s
 STRIP=strip --remove-section=.comment --remove-section=.note
 
-build:
+include /usr/share/dpatch/dpatch.make
+
+build: build-stamp
+
+build-stamp: patch-stamp
 	$(checkdir)
 	./configure --prefix=/usr --disable-debug
 	$(MAKE)
 	touch build
 
-clean:
+clean: unpatch
 	$(checkdir)
 	-rm -f build
 	[ ! -f Makefile ] || $(MAKE) distclean