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

[Raúl Sánchez Siles]

Author: kebianizao-guest
Date: 2008-04-24 07:06:06 +0000 (Thu, 24 Apr 2008)
New Revision: 10240

Added:
   kde-extras/filelight/trunk/debian/patches/01_am_maintainer_mode.diff
   kde-extras/filelight/trunk/debian/patches/98_buildprep.diff
Removed:
   kde-extras/filelight/trunk/debian/patches/01_configure-update.diff
   kde-extras/filelight/trunk/debian/patches/02_dist-files.diff
   kde-extras/filelight/trunk/debian/patches/07_install-radial-map.diff
Modified:
   kde-extras/filelight/trunk/debian/changelog
   kde-extras/filelight/trunk/debian/patches/05_fPIC_radialmap_part.diff
   kde-extras/filelight/trunk/debian/patches/10_fix-filelight.desktop-typo.diff
   kde-extras/filelight/trunk/debian/patches/series
Log:
* Removed dpatch comments from 10_fix-filelight.desktop
* Reworked buildsystem: added patches 98_buildprep; removed
  01_configure-update, 02_dist-files and 07_install-radial-map.diff; updated
  05_fPIX_radialmap_part


Modified: kde-extras/filelight/trunk/debian/changelog
===================================================================
--- kde-extras/filelight/trunk/debian/changelog	2008-04-23 11:10:24 UTC (rev 10239)
+++ kde-extras/filelight/trunk/debian/changelog	2008-04-24 07:06:06 UTC (rev 10240)
@@ -7,6 +7,10 @@
   * Reordered CDBS build rules and removing autotools.mk since it clashes with
     kde.mk.
   * Moving to quilt patch system.
+  * Removed dpatch comments from 10_fix-filelight.desktop
+  * Reworked buildsystem: added patches 98_buildprep; removed
+    01_configure-update, 02_dist-files and 07_install-radial-map.diff; updated
+    05_fPIX_radialmap_part
 
  -- Raúl Sánchez Siles <rasasi78 at gmail.com>  Sun, 25 Nov 2007 20:12:44 +0100
 

Added: kde-extras/filelight/trunk/debian/patches/01_am_maintainer_mode.diff
===================================================================
--- kde-extras/filelight/trunk/debian/patches/01_am_maintainer_mode.diff	                        (rev 0)
+++ kde-extras/filelight/trunk/debian/patches/01_am_maintainer_mode.diff	2008-04-24 07:06:06 UTC (rev 10240)
@@ -0,0 +1,11 @@
+--- a/admin/configure.in.min
++++ b/admin/configure.in.min
+@@ -38,6 +38,8 @@
+ dnl Automake doc recommends to do this only here. (Janos)
+ AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
+ 
++AM_MAINTAINER_MODE
++
+ KDE_SET_PREFIX
+ 
+ dnl generate the config header

Deleted: kde-extras/filelight/trunk/debian/patches/01_configure-update.diff

Deleted: kde-extras/filelight/trunk/debian/patches/02_dist-files.diff

Modified: kde-extras/filelight/trunk/debian/patches/05_fPIC_radialmap_part.diff
===================================================================
--- kde-extras/filelight/trunk/debian/patches/05_fPIC_radialmap_part.diff	2008-04-23 11:10:24 UTC (rev 10239)
+++ kde-extras/filelight/trunk/debian/patches/05_fPIC_radialmap_part.diff	2008-04-24 07:06:06 UTC (rev 10240)
@@ -1,11 +1,3 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_fPIC_radialmap_part.dpatch by Raúl Sánchez Siles <rasasi78 at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Build using fPIC flag
-
- at DPATCH@
-
 --- filelight-1.0.orig/src/part/radialMap/Makefile.am
 +++ filelight-1.0/src/part/radialMap/Makefile.am
 @@ -1,4 +1,5 @@
@@ -14,14 +6,3 @@
  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

Deleted: kde-extras/filelight/trunk/debian/patches/07_install-radial-map.diff

Modified: kde-extras/filelight/trunk/debian/patches/10_fix-filelight.desktop-typo.diff
===================================================================
--- kde-extras/filelight/trunk/debian/patches/10_fix-filelight.desktop-typo.diff	2008-04-23 11:10:24 UTC (rev 10239)
+++ kde-extras/filelight/trunk/debian/patches/10_fix-filelight.desktop-typo.diff	2008-04-24 07:06:06 UTC (rev 10240)
@@ -1,11 +1,3 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_fix-filelight.desktop-typo.dpatch by Raúl Sánchez Siles <rasasi78 at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct type in filelight.desktop
-
- at DPATCH@
-
 --- filelight-1.0.orig/misc/filelight.desktop
 +++ filelight-1.0/misc/filelight.desktop
 @@ -3,7 +3,7 @@

Added: kde-extras/filelight/trunk/debian/patches/98_buildprep.diff
===================================================================

Modified: kde-extras/filelight/trunk/debian/patches/series
===================================================================
--- kde-extras/filelight/trunk/debian/patches/series	2008-04-23 11:10:24 UTC (rev 10239)
+++ kde-extras/filelight/trunk/debian/patches/series	2008-04-24 07:06:06 UTC (rev 10240)
@@ -1,5 +1,4 @@
-01_configure-update.diff
-02_dist-files.diff
+01_am_maintainer_mode.diff
 05_fPIC_radialmap_part.diff
-07_install-radial-map.diff
 10_fix-filelight.desktop-typo.diff
+98_buildprep.diff -p1