convert to quilt patches

9 files changed, 160 insertions, 173 deletions

diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index c0d0ecb..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-foreign_kernel
-package_version
-static_libbfd
-better_help_for_missing_module
diff --git a/debian/patches/better_help_for_missing_module.dpatch b/debian/patches/better_help_for_missing_module.patch
index ad027e7..3c28a88 100644
--- a/debian/patches/better_help_for_missing_module.dpatch
+++ b/debian/patches/better_help_for_missing_module.patch
@@ -1,13 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## better_help_for_missing_module.dpatch by Daniel Hahler <ubuntu@thequod.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Better help in case the sysprof-module is not loaded. (LP: #30160)
-
-@DPATCH@
-diff -urNad sysprof-1.0.9~/sysprof.c sysprof-1.0.9/sysprof.c
---- sysprof-1.0.9~/sysprof.c	2007-10-21 23:43:43.000000000 +0200
-+++ sysprof-1.0.9/sysprof.c	2008-01-23 23:21:09.027183686 +0100
+Author: Daniel Hahler <ubuntu@thequod.de>
+Description: Better help in case the sysprof-module is not loaded. (LP: #30160)
+--- a/sysprof.c
++++ b/sysprof.c
 @@ -560,7 +560,14 @@
  		       "\n"
  		       "       modprobe sysprof-module\n"
diff --git a/debian/patches/foreign_kernel.dpatch b/debian/patches/foreign_kernel.patch
index 51a5359..dfec4fe 100644
--- a/debian/patches/foreign_kernel.dpatch
+++ b/debian/patches/foreign_kernel.patch
@@ -1,14 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## foreign_kernel.dpatch by Samuel Mimram <smimram@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use provided kernel version.
-
-@DPATCH@
-diff -urNad sysprof-1.0.1~/module/Makefile sysprof-1.0.1/module/Makefile
---- sysprof-1.0.1~/module/Makefile	2005-12-19 21:49:27.000000000 +0100
-+++ sysprof-1.0.1/module/Makefile	2006-02-12 17:34:15.000000000 +0100
-@@ -10,7 +10,8 @@
+Author: Samuel Mimram <smimram@debian.org>
+Description: Use provided kernel version.
+--- a/module/Makefile
++++ b/module/Makefile
+@@ -9,7 +9,8 @@
  endif
  
  MODULE    := sysprof-module
@@ -18,7 +12,7 @@ diff -urNad sysprof-1.0.1~/module/Makefile sysprof-1.0.1/module/Makefile
  INCLUDE   := -isystem $(KDIR)/include
  MODCFLAGS := -DMODULE -D__KERNEL__ -Wall ${INCLUDE}
  
-@@ -22,7 +23,7 @@
+@@ -21,7 +22,7 @@
  	modprobe -r sysprof-module
  	modprobe sysprof-module
  
diff --git a/debian/patches/package_version.dpatch b/debian/patches/package_version.dpatch
deleted file mode 100644
index 7876b8d..0000000
--- a/debian/patches/package_version.dpatch
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## package_version.dpatch by Samuel Mimram <smimram@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Define the package_version to avoid necessity for configure.
-
-@DPATCH@
-diff -urNad sysprof-1.0.7~/module/sysprof-module.c sysprof-1.0.7/module/sysprof-module.c
---- sysprof-1.0.7~/module/sysprof-module.c	2006-11-20 10:12:04.000000000 +0000
-+++ sysprof-1.0.7/module/sysprof-module.c	2006-11-20 10:14:07.000000000 +0000
-@@ -19,6 +19,8 @@
-  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-  */
- 
-+#define PACKAGE_VERSION "1.0.7-debian"
-+
- #ifdef CONFIG_SMP
- # define __SMP__
- #endif
-@@ -36,8 +38,6 @@
- 
- #include "sysprof-module.h"
- 
--#include "../config.h"
--
- #include <linux/version.h>
- 
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
diff --git a/debian/patches/package_version.patch b/debian/patches/package_version.patch
new file mode 100644
index 0000000..b4f8daf
--- /dev/null
+++ b/debian/patches/package_version.patch
@@ -0,0 +1,22 @@
+Author: Samuel Mimram <smimram@debian.org>
+Description: Define the package_version to avoid necessity for configure.
+--- a/module/sysprof-module.c
++++ b/module/sysprof-module.c
+@@ -19,6 +19,8 @@
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  */
+ 
++#define PACKAGE_VERSION "1.0.7-debian"
++
+ #ifdef CONFIG_SMP
+ # define __SMP__
+ #endif
+@@ -36,8 +38,6 @@
+ 
+ #include "sysprof-module.h"
+ 
+-#include "../config.h"
+-
+ #include <linux/version.h>
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..6506bef
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+foreign_kernel.patch
+package_version.patch
+static_libbfd.patch
+better_help_for_missing_module.patch
diff --git a/debian/patches/static_libbfd.dpatch b/debian/patches/static_libbfd.patch
index 68de64c..f3290f9 100644
--- a/debian/patches/static_libbfd.dpatch
+++ b/debian/patches/static_libbfd.patch
@@ -1,14 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## static_libbfd.dpatch by Michel Dänzer <daenzer@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Link statically with libbfd.
-
-@DPATCH@
-diff -urNad sysprof-1.0.9~/configure sysprof-1.0.9/configure
---- sysprof-1.0.9~/configure	2007-10-21 23:42:22.000000000 +0200
-+++ sysprof-1.0.9/configure	2008-01-25 19:19:41.000000000 +0100
-@@ -3759,7 +3759,7 @@
+Author: Michel Dänzer <daenzer@debian.org>
+Description: Link statically with libbfd.
+--- a/configure
++++ b/configure
+@@ -3893,7 +3893,7 @@
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bfd_bfd_get_error" >&5
  $as_echo "$ac_cv_lib_bfd_bfd_get_error" >&6; }
  if test "x$ac_cv_lib_bfd_bfd_get_error" = x""yes; then
@@ -17,9 +11,8 @@ diff -urNad sysprof-1.0.9~/configure sysprof-1.0.9/configure
  else
    { { $as_echo "$as_me:$LINENO: error: libbfd is required to compile sysprof" >&5
  $as_echo "$as_me: error: libbfd is required to compile sysprof" >&2;}
-diff -urNad sysprof-1.0.9~/configure.ac sysprof-1.0.9/configure.ac
---- sysprof-1.0.9~/configure.ac	2007-10-21 23:42:16.000000000 +0200
-+++ sysprof-1.0.9/configure.ac	2008-01-25 19:19:41.000000000 +0100
+--- a/configure.ac
++++ b/configure.ac
 @@ -90,7 +90,7 @@
    AC_CHECK_LIB(iberty, cplus_demangle_opname, [],
      AC_MSG_ERROR([libiberty is required to compile sysprof]), -ldl))
diff --git a/debian/rules b/debian/rules
index f6ee89c..f42d12c 100755..100644
--- a/debian/rules
+++ b/debian/rules
@@ -1,109 +1,120 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-export KSRC
-export KVERS
-export KDREV
-
-# We want to use dpatch
-include /usr/share/dpatch/dpatch.make
-
-DESTDIR = $(CURDIR)/debian/tmp
-SYSPROFDIR = $(CURDIR)/debian/sysprof
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-  confflags += --build $(DEB_HOST_GNU_TYPE)
-else
-  confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-endif
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-config.status: configure
-	dh_testdir
-#	CFLAGS="$(CFLAGS) -Wl,-z,defs"
-	CFLAGS="$(CFLAGS)" ./configure $(confflags) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-kernel-module
-
-build: patch-stamp build-stamp
-build-stamp:  config.status
-	dh_testdir
-	$(MAKE) all
-	touch build-stamp
-
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	[ ! -f Makefile ] || $(MAKE) distclean
-	rm -f config.log
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	# Install sysprof.
-	make install DESTDIR=$(SYSPROFDIR)
-	cp debian/sysprof.xpm $(SYSPROFDIR)/usr/share/pixmaps
-	mkdir -p $(SYSPROFDIR)/usr/share/applications
-	cp debian/sysprof.desktop $(SYSPROFDIR)/usr/share/applications
-
-	# Install the sources of the kernel module.
-	install -D -m 0755 debian/rules.modules debian/tmp/modules/sysprof-module/debian/rules
-	for f in debian/*.modules.in debian/control debian/compat debian/copyright debian/changelog; do \
-		install -m 0644 $$f debian/tmp/modules/sysprof-module/debian/; \
-	done
-	cp module/* debian/tmp/modules/sysprof-module/
-	cd debian/tmp/; tar jcvf ../sysprof-module-source/usr/src/sysprof-module.tar.bz2 modules
-	rm -rf debian/tmp/modules
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installexamples
-	dh_install --sourcedir=debian/tmp --list-missing
-	dh_installmenu
-	dh_installman debian/sysprof.1
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+%:
+        dh  $@
+
+# Use override_dh_* targets to customize this.
+# ---------------------------------------------------
+# Followings are the old debian/rules
+#
+# #!/usr/bin/make -f
+# # -*- makefile -*-
+# # Sample debian/rules that uses debhelper.
+# # This file was originally written by Joey Hess and Craig Small.
+# # As a special exception, when this file is copied by dh-make into a
+# # dh-make output file, you may use that output file without restriction.
+# # This special exception was added by Craig Small in version 0.37 of dh-make.
+# 
+# # Uncomment this to turn on verbose mode.
+# #export DH_VERBOSE=1
+# 
+# # This has to be exported to make some magic below work.
+# export DH_OPTIONS
+# export KSRC
+# export KVERS
+# export KDREV
+# 
+# # We want to use dpatch
+# include /usr/share/dpatch/dpatch.make
+# 
+# DESTDIR = $(CURDIR)/debian/tmp
+# SYSPROFDIR = $(CURDIR)/debian/sysprof
+# 
+# # These are used for cross-compiling and for saving the configure script
+# # from having to guess our platform (since we know it already)
+# DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+# DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+# 
+# ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+#   confflags += --build $(DEB_HOST_GNU_TYPE)
+# else
+#   confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+# endif
+# 
+# CFLAGS = -Wall -g
+# 
+# ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+# 	CFLAGS += -O0
+# else
+# 	CFLAGS += -O2
+# endif
+# 
+# config.status: configure
+# 	dh_testdir
+# #	CFLAGS="$(CFLAGS) -Wl,-z,defs"
+# 	CFLAGS="$(CFLAGS)" ./configure $(confflags) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-kernel-module
+# 
+# build: patch-stamp build-stamp
+# build-stamp:  config.status
+# 	dh_testdir
+# 	$(MAKE) all
+# 	touch build-stamp
+# 
+# clean: unpatch
+# 	dh_testdir
+# 	dh_testroot
+# 	rm -f build-stamp
+# 	[ ! -f Makefile ] || $(MAKE) distclean
+# 	rm -f config.log
+# 	dh_clean
+# 
+# install: build
+# 	dh_testdir
+# 	dh_testroot
+# 	dh_clean -k
+# 	dh_installdirs
+# 
+# 	# Install sysprof.
+# 	make install DESTDIR=$(SYSPROFDIR)
+# 	cp debian/sysprof.xpm $(SYSPROFDIR)/usr/share/pixmaps
+# 	mkdir -p $(SYSPROFDIR)/usr/share/applications
+# 	cp debian/sysprof.desktop $(SYSPROFDIR)/usr/share/applications
+# 
+# 	# Install the sources of the kernel module.
+# 	install -D -m 0755 debian/rules.modules debian/tmp/modules/sysprof-module/debian/rules
+# 	for f in debian/*.modules.in debian/control debian/compat debian/copyright debian/changelog; do \
+# 		install -m 0644 $$f debian/tmp/modules/sysprof-module/debian/; \
+# 	done
+# 	cp module/* debian/tmp/modules/sysprof-module/
+# 	cd debian/tmp/; tar jcvf ../sysprof-module-source/usr/src/sysprof-module.tar.bz2 modules
+# 	rm -rf debian/tmp/modules
+# 
+# # Build architecture-independent files here.
+# binary-indep: build install
+# # We have nothing to do by default.
+# 
+# # Build architecture-dependent files here.
+# binary-arch: build install
+# 	dh_testdir
+# 	dh_testroot
+# 	dh_installchangelogs ChangeLog
+# 	dh_installdocs
+# 	dh_installexamples
+# 	dh_install --sourcedir=debian/tmp --list-missing
+# 	dh_installmenu
+# 	dh_installman debian/sysprof.1
+# 	dh_link
+# 	dh_strip
+# 	dh_compress
+# 	dh_fixperms
+# 	dh_makeshlibs
+# 	dh_installdeb
+# 	dh_shlibdeps
+# 	dh_gencontrol
+# 	dh_md5sums
+# 	dh_builddeb
+# 
+# binary: binary-indep binary-arch
+# .PHONY: build clean binary-indep binary-arch binary install
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)