rev 8261 - in kde-extras/filelight/trunk/debian: . patches
Raúl Sánchez Siles
kebianizao-guest at alioth.debian.org
Sun Dec 16 16:44:34 UTC 2007
Author: kebianizao-guest
Date: 2007-12-16 16:44:34 +0000 (Sun, 16 Dec 2007)
New Revision: 8261
Added:
kde-extras/filelight/trunk/debian/compat
kde-extras/filelight/trunk/debian/patches/01_configure-update.dpatch
kde-extras/filelight/trunk/debian/patches/02_dist-files.dpatch
kde-extras/filelight/trunk/debian/patches/05_fPIC_radialmap_part.dpatch
kde-extras/filelight/trunk/debian/patches/07_install-radial-map.dpatch
kde-extras/filelight/trunk/debian/patches/10_fix-filelight.desktop-typo.dpatch
Removed:
kde-extras/filelight/trunk/debian/conffiles
kde-extras/filelight/trunk/debian/patches/01_filelight_1.0-1.dpatch
kde-extras/filelight/trunk/debian/postinst
kde-extras/filelight/trunk/debian/postrm
Modified:
kde-extras/filelight/trunk/debian/changelog
kde-extras/filelight/trunk/debian/control
kde-extras/filelight/trunk/debian/copyright
kde-extras/filelight/trunk/debian/patches/00list
kde-extras/filelight/trunk/debian/rules
Log:
Merged newpackaging(CDBS) branch into trunk.
Modified: kde-extras/filelight/trunk/debian/changelog
===================================================================
--- kde-extras/filelight/trunk/debian/changelog 2007-12-15 23:12:13 UTC (rev 8260)
+++ kde-extras/filelight/trunk/debian/changelog 2007-12-16 16:44:34 UTC (rev 8261)
@@ -1,7 +1,7 @@
filelight (1.0-1) unstable; urgency=low
* New upstream release: Crashes fix, displaying non-latin1 correctly and
- several new features. Closes: #445935 and #424741.
+ several new features. (Closes: #445935, #424741)
* Splitted l10n to a new package.
* Bugs closed:
+ filelight always places hover information on first monitor (Closes:
@@ -26,6 +26,7 @@
(Closes: #304605)
+ lots of noise on stderr from RadialMap methods (Closes: #343905)
* Packaging issues:
+ + Changed packaging to CDBS.
+ Provide upstream AUTHORS file.
+ Honour the nostrip in the DEB_BUILD_OPTIONS. (Closes: #436852)
+ Changed menu section to Applications/File Management to comply with newer
@@ -35,7 +36,7 @@
+ Update package policy to latest 3.7.2.
+ Change Uploader(me) and Maintainers(Debian KDE Extras Team).
- -- Raúl Sánchez Siles <rasasi78 at gmail.com> Mon, 22 Oct 2007 00:29:34 +0200
+ -- Raúl Sánchez Siles <rasasi78 at gmail.com> Fri, 16 Nov 2007 19:20:42 +0100
filelight (0.99beta6-1) unstable; urgency=low
Copied: kde-extras/filelight/trunk/debian/compat (from rev 8077, kde-extras/filelight/branches/newpackaging/debian/compat)
===================================================================
--- kde-extras/filelight/trunk/debian/compat (rev 0)
+++ kde-extras/filelight/trunk/debian/compat 2007-12-16 16:44:34 UTC (rev 8261)
@@ -0,0 +1 @@
+5
Deleted: kde-extras/filelight/trunk/debian/conffiles
Modified: kde-extras/filelight/trunk/debian/control
===================================================================
--- kde-extras/filelight/trunk/debian/control 2007-12-15 23:12:13 UTC (rev 8260)
+++ kde-extras/filelight/trunk/debian/control 2007-12-16 16:44:34 UTC (rev 8261)
@@ -4,9 +4,10 @@
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
Uploaders: Raúl Sánchez Siles <rasasi78 at gmail.com>
Standards-Version: 3.7.2
-Build-Depends: kdelibs4-dev, xutils, chrpath, autoconf, gettext, dpatch
-XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-kde/kde-extra/filelight/trunk
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extra/filelight/trunk
+Build-Depends: debhelper (>= 5.0), cdbs, kdelibs4-dev, xutils, chrpath, autoconf, gettext, dpatch
+Vcs-Svn: svn://svn.debian.org/svn/pkg-kde/kde-extra/filelight/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extra/filelight/trunk
+Homepage: http://www.methylblue.com/filelight/
Package: filelight
Architecture: any
@@ -18,5 +19,3 @@
It is like a pie-chart, but the segments nest, allowing you to see both
which directories take up all your space, and which directories
and files inside those directories are the real culprits.
- .
- Homepage: http://www.methylblue.com/filelight/
Modified: kde-extras/filelight/trunk/debian/copyright
===================================================================
--- kde-extras/filelight/trunk/debian/copyright 2007-12-15 23:12:13 UTC (rev 8260)
+++ kde-extras/filelight/trunk/debian/copyright 2007-12-16 16:44:34 UTC (rev 8261)
@@ -1,8 +1,12 @@
This is Debian GNU's prepackaged version of filelight, a program to
show you where your diskspace is being used. Debianized by James
Troup <james at nocrew.org> on Wed, 21 Jan 2004 and reworked by Raúl
-Sánchez Siles <rasasi78 at gmail.com>
+Sánchez Siles <rasasi78 at gmail.com> on Fri, 16 Nov 2007 13:03:04 +0100
+The Debian packaging is (C) 2007, Raul Sánchez Siles <rasasi78 at gmail.com>
+and is licensed under the GPLv2, which can be found at
+'/usr/share/common-licenses/GPL-2'.
+
It was downloaded from:
http://www.methylblue.com/filelight/#packages
@@ -25,7 +29,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License version 2 can be found at `/usr/share/common-licenses/GPL-2'.
Copyright
@@ -35,4 +39,4 @@
debian/filelight.1:
- Copyright (C) 2006 by J. R. Van Zandt <jrvz at comcast.net>
\ No newline at end of file
+ Copyright (C) 2006 by J. R. Van Zandt <jrvz at comcast.net>
Modified: kde-extras/filelight/trunk/debian/patches/00list
===================================================================
--- kde-extras/filelight/trunk/debian/patches/00list 2007-12-15 23:12:13 UTC (rev 8260)
+++ kde-extras/filelight/trunk/debian/patches/00list 2007-12-16 16:44:34 UTC (rev 8261)
@@ -1 +1,5 @@
-01_filelight_1.0-1
+01_configure-update
+02_dist-files
+05_fPIC_radialmap_part
+07_install-radial-map
+10_fix-filelight.desktop-typo
Copied: kde-extras/filelight/trunk/debian/patches/01_configure-update.dpatch (from rev 8077, kde-extras/filelight/branches/newpackaging/debian/patches/01_configure-update.dpatch)
===================================================================
--- kde-extras/filelight/trunk/debian/patches/01_configure-update.dpatch (rev 0)
+++ kde-extras/filelight/trunk/debian/patches/01_configure-update.dpatch 2007-12-16 16:44:34 UTC (rev 8261)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_configure-update.dpatch by Raúl Sánchez Siles <rasasi78 at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Update configure
+
+ at DPATCH@
+
+--- 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
+
Deleted: kde-extras/filelight/trunk/debian/patches/01_filelight_1.0-1.dpatch
Copied: kde-extras/filelight/trunk/debian/patches/02_dist-files.dpatch (from rev 8077, kde-extras/filelight/branches/newpackaging/debian/patches/02_dist-files.dpatch)
===================================================================
--- kde-extras/filelight/trunk/debian/patches/02_dist-files.dpatch (rev 0)
+++ kde-extras/filelight/trunk/debian/patches/02_dist-files.dpatch 2007-12-16 16:44:34 UTC (rev 8261)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_dist-files.dpatch by Raúl Sánchez Siles <rasasi78 at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Do not install unnecessary files
+
+ at DPATCH@
+
+--- 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:
Copied: kde-extras/filelight/trunk/debian/patches/05_fPIC_radialmap_part.dpatch (from rev 8077, kde-extras/filelight/branches/newpackaging/debian/patches/05_fPIC_radialmap_part.dpatch)
===================================================================
--- kde-extras/filelight/trunk/debian/patches/05_fPIC_radialmap_part.dpatch (rev 0)
+++ kde-extras/filelight/trunk/debian/patches/05_fPIC_radialmap_part.dpatch 2007-12-16 16:44:34 UTC (rev 8261)
@@ -0,0 +1,27 @@
+#! /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 @@
+ 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
Copied: kde-extras/filelight/trunk/debian/patches/07_install-radial-map.dpatch (from rev 8077, kde-extras/filelight/branches/newpackaging/debian/patches/07_install-radial-map.dpatch)
===================================================================
--- kde-extras/filelight/trunk/debian/patches/07_install-radial-map.dpatch (rev 0)
+++ kde-extras/filelight/trunk/debian/patches/07_install-radial-map.dpatch 2007-12-16 16:44:34 UTC (rev 8261)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07_install-radial-map.dpatch by Raúl Sánchez Siles <rasasi78 at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Install libradial.a
+
+ at DPATCH@
+
+--- filelight-1.0.orig/src/part/radialMap/Makefile.in
++++ filelight-1.0/src/part/radialMap/Makefile.in
+@@ -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:
Copied: kde-extras/filelight/trunk/debian/patches/10_fix-filelight.desktop-typo.dpatch (from rev 8077, kde-extras/filelight/branches/newpackaging/debian/patches/10_fix-filelight.desktop-typo.dpatch)
===================================================================
--- kde-extras/filelight/trunk/debian/patches/10_fix-filelight.desktop-typo.dpatch (rev 0)
+++ kde-extras/filelight/trunk/debian/patches/10_fix-filelight.desktop-typo.dpatch 2007-12-16 16:44:34 UTC (rev 8261)
@@ -0,0 +1,19 @@
+#! /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 @@
+ 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
Deleted: kde-extras/filelight/trunk/debian/postinst
Deleted: kde-extras/filelight/trunk/debian/postrm
Modified: kde-extras/filelight/trunk/debian/rules
===================================================================
--- kde-extras/filelight/trunk/debian/rules 2007-12-15 23:12:13 UTC (rev 8260)
+++ kde-extras/filelight/trunk/debian/rules 2007-12-16 16:44:34 UTC (rev 8261)
@@ -1,90 +1,19 @@
#!/usr/bin/make -f
-# debian/rules file - for filelight (1.0-beta6)
-# Based on sample debian/rules file - for GNU Hello (1.3).
-# Copyright 1994,1995 by Ian Jackson.
-# Copyright 2004 James Troup
-# I hereby give you perpetual unlimited permission to copy,
-# modify and relicense this file, provided that you do not remove
-# my name from the file itself. (I assert my moral right of
-# paternity under the Copyright, Designs and Patents Act 1988.)
-# This file may have to be extensively modified
+# debian/rules file - for filelight (1.0)
+# Copyright 2007 Raúl Sánchez Siles
+# This packaging is licensed under GPLv2
+# see /usr/share/common-licenses/GPL-2 for details.
-install_dir=install -d -m 755
-install_file=install -m 644
-install_script=install -m 755
-install_binary=install -m 755 -s
-STRIP=strip --remove-section=.comment --remove-section=.note
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/class/kde.mk
-include /usr/share/dpatch/dpatch.make
+DEB_INSTALL_MANPAGES_filelight := debian/filelight.1
-build: patch-stamp
- $(checkdir)
- ./configure --prefix=/usr --disable-debug
- $(MAKE)
- touch build
+DEB_CONFIGURE_EXTRA_FLAGS := --disable-debug
-clean: clean-stamp unpatch
-
-clean-stamp:
- $(checkdir)
- -rm -f build
- [ ! -f Makefile ] || $(MAKE) distclean
- -rm -rf debian/tmp debian/*~ debian/files* debian/substvars
- -rm -fr autom4te.cache config.log po/*.gmo
-
-binary-indep:
-
-binary-arch: checkroot build
- $(checkdir)
- -rm -rf debian/tmp
- $(install_dir) debian/tmp/DEBIAN/
- $(install_file) debian/conffiles debian/tmp/DEBIAN/
- $(install_script) debian/postinst debian/postrm debian/tmp/DEBIAN/
-
- make prefix=`pwd`/debian/tmp/usr configdir=`pwd`/debian/tmp/etc/kde3 kde_htmldir=`pwd`/debian/tmp/usr/share/doc/kde/HTML install
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- $(STRIP) debian/tmp/usr/bin/filelight
-endif
- chrpath -d debian/tmp/usr/bin/filelight
-
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- $(STRIP) --strip-unneeded debian/tmp/usr/lib/kde3/libfilelight.so
-endif
- chmod -x debian/tmp/usr/lib/kde3/libfilelight.so debian/tmp/usr/lib/kde3/libfilelight.la
- chrpath -d debian/tmp/usr/lib/kde3/libfilelight.so
-
-# rm debian/tmp/usr/share/doc/kde/HTML/en/filelight/common
-# ln -s ../common debian/tmp/usr/share/doc/kde/HTML/en/filelight/common
-
- $(install_dir) debian/tmp/usr/share/menu/
- $(install_file) debian/menu debian/tmp/usr/share/menu/filelight
- $(install_dir) debian/tmp/usr/share/man/man1/
- $(install_file) debian/filelight.1 debian/tmp/usr/share/man/man1/filelight.1
- gzip -9v debian/tmp/usr/share/man/man1/*
-
- $(install_dir) debian/tmp/usr/share/doc/filelight/
- $(install_file) debian/changelog debian/tmp/usr/share/doc/filelight/changelog.Debian
- $(install_file) AUTHORS README TODO debian/tmp/usr/share/doc/filelight/
- install -m 644 ChangeLog debian/tmp/usr/share/doc/filelight/changelog
- gzip -9v debian/tmp/usr/share/doc/filelight/*
- install -m 644 debian/copyright debian/tmp/usr/share/doc/filelight/
-
- dpkg-shlibdeps debian/tmp/usr/bin/filelight
- dpkg-gencontrol -isp
- chown -R root.root debian/tmp
- chmod -R go=rX debian/tmp
- dpkg --build debian/tmp ..
-
-define checkdir
- test -f src/app/mainWindow.cpp -a -f debian/rules
-endef
-
-# Below here is fairly generic really
-
-binary: binary-indep binary-arch
-
-checkroot:
- $(checkdir)
- test root = "`whoami`"
-
-.PHONY: binary binary-arch binary-indep clean checkroot
+#get-orig-source-dpatch:
+# @@dh_testdir
+# @@[ -d ../tarballs/. ]
+# @@dpatch-get-origtargz ../tarballs
More information about the pkg-kde-commits
mailing list