Package: lprof
Severity: wishlist
Tags: patch
Hi,
The dpatch patch management system has been deprecated for some time. The
Lintian currently flags use of dpatch packages as an error. The new 3.0
packaging format is an improved version which, among other things, contains
patch management built-in. For more information, see:
http://wiki.debian.org/Projects/DebSrc3.0
I had some free time; see attached patch to migrate to new package
format. Note that all files in debian/patches/* are canocalized to
*.patch.
Let me know if there is anything that needs adjusting.
Thanks,
Jari
>From 2397868e9d66a7237f804428a4dd4c5485b88a9e Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sat, 21 Apr 2012 16:43:43 +0300
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <jari.aa...@cante.net>
---
debian/changelog | 19 +++++++++
debian/compat | 2 +-
debian/control | 7 ++--
debian/copyright | 20 ++++++----
debian/lprof.dirs | 2 -
debian/lprof.menu | 2 +-
debian/patches/00list | 4 --
...{01_qt3_headers.dpatch => 01-qt3-headers.patch} | 8 +---
.../{02_SConstruct.dpatch => 02-SConstruct.patch} | 8 +---
.../{03_lcmsprf.h.dpatch => 03-lcmsprf.h.patch} | 8 +---
debian/patches/{04_HOME.dpatch => 04-HOME.patch} | 8 +---
debian/patches/series | 4 ++
debian/rules | 42 ++++++++++++--------
debian/source/format | 1 +
14 files changed, 75 insertions(+), 60 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01_qt3_headers.dpatch => 01-qt3-headers.patch} (68%)
rename debian/patches/{02_SConstruct.dpatch => 02-SConstruct.patch} (86%)
rename debian/patches/{03_lcmsprf.h.dpatch => 03-lcmsprf.h.patch} (65%)
rename debian/patches/{04_HOME.dpatch => 04-HOME.patch} (72%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 68f0dd9..36a8a2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+lprof (1.11.4.dfsg+1.11.4.1-5.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+ * Add build-arch and build-indep targets; use dh_prep and correct
+ clean target in rules file.
+ * Fix copyright-refers-to-symlink-license (Lintian).
+ * Fix copyright-without-copyright-notice (Lintian). Correct also
+ Sourceforge.net developer list where only Hal Engel is listed in
+ project members.
+ * Fix extended-description-contains-empty-paragraph (Lintian).
+ * Fix package-contains-empty-directory (Lintian).
+ * Fix desktop-entry-contains-encoding-key (Lintian).
+ * Fix menu-item-uses-apps-section (Lintian).
+ * Fix desktop-entry-contains-deprecated-key TerminalOptions (Lintian).
+
+ -- Jari Aalto <jari.aa...@cante.net> Sat, 21 Apr 2012 16:43:37 +0300
+
lprof (1.11.4.dfsg+1.11.4.1-5.1) unstable; urgency=low
* Non-maintainer upload.
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 8fd4aab..fb16d6e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,18 +2,17 @@ Source: lprof
Section: graphics
Priority: optional
Maintainer: Oleksandr Moskalenko <ma...@debian.org>
-Build-Depends: debhelper (>= 5), gcc (>=3.3), libqt3-mt-dev, libqt3-headers, qt3-apps-dev, liblcms1-dev (>=1.13), libtiff4-dev, dpatch, scons (>= 0.96.93-2), libvigraimpex-dev, x11proto-xf86vidmode-dev, libxxf86vm-dev, libusb-dev
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 9), gcc (>=3.3), libqt3-mt-dev, libqt3-headers, qt3-apps-dev, liblcms1-dev (>=1.13), libtiff4-dev, scons (>= 0.96.93-2), libvigraimpex-dev, x11proto-xf86vidmode-dev, libxxf86vm-dev, libusb-dev
+Standards-Version: 3.9.3
Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/lprof/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/deb-maint/lprof/trunk/?op=log
Homepage: http://sourceforge.net/projects/lprof
Package: lprof
Architecture: any
-Depends: ${shlibs:Depends}, qt3-assistant
+Depends: ${misc:Depends}, ${shlibs:Depends}, qt3-assistant
Suggests: icc-profiles
Description: Hardware Color Profiler
- .
LPROF is a color profiler that creates ICC compliant profiles for devices
such as cameras, scanners, and monitors. These profiles provide color
consistency across devices. They can be used in color profile-aware software
diff --git a/debian/copyright b/debian/copyright
index 2ece369..db448e7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,11 +3,13 @@ Mon, 29 Aug 2005 13:22:05 -0600.
It was downloaded from http://sourceforge.net/projects/lprof.
-Copyright Holders: Original author - Marti Maria <email address not
-available>. Lprof is currently developed as a Sourceforge.net project by
-Gerard Klaver <ger1...@users.sourceforge.net>, Hal Engel
-<hven...@users.sourceforge.net>, and Craig Ringer
-<ring...@users.sourceforge.net>.
+Copyright Holders:
+
+ Copyright (C) 1998-2001 Marti Maria (email unknown)
+
+Lprof is currently developed as a Sourceforge.net project by
+
+ Copyright (C) 2005-2006 Hal Engel <hven...@users.sourceforge.net>
License:
@@ -22,7 +24,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
On Debian GNU/Linux systems, the full text of the GNU General Public
-License can be found in the file /usr/share/common-licenses/GPL.
+License can be found in the file /usr/share/common-licenses/GPL-2.
--------------------------------------------------------------------------
@@ -31,7 +33,9 @@ them to Qt.
It was downloaded from http://www.noga.de/markus/qtiffio/.
-Copyright holder: Markus L. Noga <mar...@noga.de>.
+Copyright holder:
+
+Copyright (C) Markus L. Noga <mar...@noga.de>
This library is free software; you can redistribute it and/or modify it under
the terms of the GNU Lesser General Public License as published by the Free
@@ -44,7 +48,7 @@ FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
details.
On Debian GNU/LInux systems, the full text of the GNU Lesser General Public
-License can be found in the file /usr/share/common-licenses/LGPL.
+License can be found in the file /usr/share/common-licenses/LGPL-2.
--------------------------------------------------------------------------
diff --git a/debian/lprof.dirs b/debian/lprof.dirs
index 8eb7f28..d038e42 100644
--- a/debian/lprof.dirs
+++ b/debian/lprof.dirs
@@ -1,6 +1,4 @@
usr/bin
-usr/lib
-usr/include
usr/share/doc/lprof
usr/share/lprof/data/pics
usr/share/lprof/data/template
diff --git a/debian/lprof.menu b/debian/lprof.menu
index e1aeb5f..5955b74 100644
--- a/debian/lprof.menu
+++ b/debian/lprof.menu
@@ -1,5 +1,5 @@
?package(lprof):needs="X11" \
- section="Apps/Graphics" \
+ section="Applications/Graphics" \
icon="/usr/share/pixmaps/lprof.xpm" \
title="Lprof" \
longtitle="Lprof Little CMS Hardware Profiler" \
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index b75c6cd..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-01_qt3_headers.dpatch
-02_SConstruct.dpatch
-03_lcmsprf.h.dpatch
-04_HOME.dpatch
diff --git a/debian/patches/01_qt3_headers.dpatch b/debian/patches/01-qt3-headers.patch
similarity index 68%
rename from debian/patches/01_qt3_headers.dpatch
rename to debian/patches/01-qt3-headers.patch
index 370a291..dba1318 100644
--- a/debian/patches/01_qt3_headers.dpatch
+++ b/debian/patches/01-qt3-headers.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_qt3_headers.dpatch by <bdefre...@debian2.bddebian.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Build without old qt3-compat-headers.
+From: <bdefre...@debian2.bddebian.com>
+Subject: Build without old qt3-compat-headers.
-@DPATCH@
diff -urNad lprof-1.11.4.dfsg+1.11.4.1~/src/lprofqt/lprofmain.cpp lprof-1.11.4.dfsg+1.11.4.1/src/lprofqt/lprofmain.cpp
--- lprof-1.11.4.dfsg+1.11.4.1~/src/lprofqt/lprofmain.cpp 2006-06-10 14:43:34.000000000 -0400
+++ lprof-1.11.4.dfsg+1.11.4.1/src/lprofqt/lprofmain.cpp 2008-02-08 13:04:48.000000000 -0500
diff --git a/debian/patches/02_SConstruct.dpatch b/debian/patches/02-SConstruct.patch
similarity index 86%
rename from debian/patches/02_SConstruct.dpatch
rename to debian/patches/02-SConstruct.patch
index 788f1a0..c6f7020 100644
--- a/debian/patches/02_SConstruct.dpatch
+++ b/debian/patches/02-SConstruct.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_SConstruct.dpatch by Oleksandr Moskalenko <ma...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: make translation upadte optional
+From: Oleksandr Moskalenko <ma...@debian.org>
+Subject: make translation upadte optional
-@DPATCH@
--- lprof-1.11.4.dfsg+1.11.4.1~/SConstruct 2006-06-05 19:11:32.000000000 -0600
+++ lprof-1.11.4.dfsg+1.11.4.1~/SConstruct.new 2008-02-11 13:48:11.000000000 -0700
diff --git a/debian/patches/03_lcmsprf.h.dpatch b/debian/patches/03-lcmsprf.h.patch
similarity index 65%
rename from debian/patches/03_lcmsprf.h.dpatch
rename to debian/patches/03-lcmsprf.h.patch
index f91f84d..5557ce4 100644
--- a/debian/patches/03_lcmsprf.h.dpatch
+++ b/debian/patches/03-lcmsprf.h.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_lcmsprf.h.dpatch by Oleksandr Moskalenko <ma...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Update for liblcms 1.17
+From: Oleksandr Moskalenko <ma...@debian.org>
+Subject: Update for liblcms 1.17
-@DPATCH@
--- lprof-1.11.4.dfsg+1.11.4.1~/src/liblprof/lcmsprf.h.bak 2007-08-31 15:36:20.000000000 -0700
+++ lprof-1.11.4.dfsg+1.11.4.1~/src/liblprof/lcmsprf.h 2007-08-31 15:37:39.000000000 -0700
diff --git a/debian/patches/04_HOME.dpatch b/debian/patches/04-HOME.patch
similarity index 72%
rename from debian/patches/04_HOME.dpatch
rename to debian/patches/04-HOME.patch
index 4ce5e64..0340b90 100644
--- a/debian/patches/04_HOME.dpatch
+++ b/debian/patches/04-HOME.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_HOME.dpatch by Jakub Wilk <jw...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Don't require HOME to be set.
+From: Jakub Wilk <jw...@debian.org>
+Subject: Don't require HOME to be set.
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lprof-1.11.4.dfsg+1.11.4.1~/SConstruct lprof-1.11.4.dfsg+1.11.4.1/SConstruct
--- lprof-1.11.4.dfsg+1.11.4.1~/SConstruct 2006-06-06 03:11:32.000000000 +0200
+++ lprof-1.11.4.dfsg+1.11.4.1/SConstruct 2011-03-30 23:44:51.598463862 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..acd9a0e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+01-qt3-headers.patch
+02-SConstruct.patch
+03-lcmsprf.h.patch
+04-HOME.patch
diff --git a/debian/rules b/debian/rules
index f40d2c6..08c90e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,24 +13,33 @@ else
CFLAGS += -O2
endif
-
-build: patch-stamp build-stamp
-
-patch-stamp:
- dpatch apply-all
- touch patch-stamp
+KEEP_FILES = \
+ build/freebsd/SConscript \
+ build/linux/SConscript \
+ build/darwin/SConscript \
+ build/darwin/lprof.app/Contents/Resources/lprof.icns \
+ build/darwin/lprof.app/Contents/MacOS/dummy.txt \
+ build/darwin/lprof.app/Info.plist \
+ build/default/SConscript \
+ build/netbsd2/SConscript \
+ build/win32/SConscript \
+
+build-arch: build
+build-indep: build
+
+build: build-stamp
build-stamp:
dh_testdir
dh_clean
scons noupdatetrans="1" -c .
- -rm -f `find . -name .sconsign`
- -install -d $(destdir)
+ rm -f $$(find . -name .sconsign)
+ install -d $(destdir)
scons PREFIX=$(destdir) ccflags="$(CFLAGS)" notiffio=1 noupdatetrans="1"
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
-rm -f build-stamp install-stamp
@@ -42,23 +51,24 @@ clean: unpatch
-rm -rf .sconf_temp
-rm -f .sconsign.dblite
-rm -f .linux2.dblite
-
+ # Clean everything under build/ directory
+ tar -cf save.tar $(KEEP_FILES)
+ rm -rf build
+ tar -xf save.tar ; rm save.tar
dh_clean
-unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
-
install: install-stamp
install-stamp: build-stamp
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
scons install
-rm -f `find $(destdir) -name ".sconsign"`
-chmod 644 $(destdir)/share/lprof/data/help/about.txt $(destdir)/share/lprof/data/help/handbook.png
-
+ # Remove non-needed or obsolete keys
+ sed -i '/Encoding\|TerminalOptions/d' \
+ $(CURDIR)/debian/lprof/usr/share/applications/lprof.desktop
touch install-stamp
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)
--
1.7.9.5
