--- Begin Message ---
Package: drgeo
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 or if it is ok
to upload this version in a NMU in case you are working on other
issues needing attention.
Thanks,
Jari
>From 2d0dd3320f82a79661a734a7c7f13f7cf8632656 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Sat, 28 Apr 2012 17:11:19 +0300
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <[email protected]>
---
debian/README.source | 31 ----------------
debian/changelog | 15 ++++++++
debian/compat | 2 +-
debian/control | 6 ++--
debian/patches/00list | 7 ----
...{01-html_viewer.dpatch => 01-html-viewer.patch} | 14 ++------
debian/patches/02-desktop-file-icon.dpatch | 26 --------------
debian/patches/02-desktop-file-icon.patch | 15 ++++++++
debian/patches/03-fix-segfault.patch | 15 ++++++++
debian/patches/03-fix_segfault.dpatch | 28 ---------------
...e_pristine.dpatch => 04-restore-pristine.patch} | 38 +++++++++-----------
debian/patches/05_config.dpatch | 19 ----------
..._viewer.dpatch => 06-default-html-viewer.patch} | 15 ++------
...s-gcc-4.5.dpatch => 07-fix-ftbfs-gcc-4.5.patch} | 10 ++----
debian/patches/series | 6 ++++
debian/rules | 17 ++++-----
debian/source/format | 2 +-
17 files changed, 88 insertions(+), 178 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{01-html_viewer.dpatch => 01-html-viewer.patch} (57%)
delete mode 100644 debian/patches/02-desktop-file-icon.dpatch
create mode 100644 debian/patches/02-desktop-file-icon.patch
create mode 100644 debian/patches/03-fix-segfault.patch
delete mode 100644 debian/patches/03-fix_segfault.dpatch
rename debian/patches/{04_restore_pristine.dpatch => 04-restore-pristine.patch} (98%)
delete mode 100644 debian/patches/05_config.dpatch
rename debian/patches/{06_default_html_viewer.dpatch => 06-default-html-viewer.patch} (53%)
rename debian/patches/{07-fix_ftbfs-gcc-4.5.dpatch => 07-fix-ftbfs-gcc-4.5.patch} (82%)
create mode 100644 debian/patches/series
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 2d5ba36..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,31 +0,0 @@
-This package uses dpatch to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To get the fully patched source after unpacking the source package, cd
-to the root level of the source package and run:
-
- debian/rules patch
-
-Removing a patch is as simple as removing its entry from the
-debian/patches/00list file, and please also remove the patch file
-itself.
-
-Creating a new patch is done with "dpatch-edit-patch patch XX_patchname"
-where you should replace XX with a new number and patchname with a
-descriptive shortname of the patch. You can then simply edit all the
-files your patch wants to edit, and then simply "exit 0" from the shell
-to actually create the patch file.
-
-To tweak an already existing patch, call "dpatch-edit-patch XX_patchname"
-and replace XX_patchname with the actual filename from debian/patches
-you want to use.
-
-To clean up afterwards again, "debian/rules unpatch" will do the
-work for you - or you can of course choose to call
-"fakeroot debian/rules clean" all together.
-
-
---
-original text by Gerfried Fuchs, edited by Junichi Uekawa <[email protected]>
-10 Aug 2008.
diff --git a/debian/changelog b/debian/changelog
index ba29d16..2a7c717 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+drgeo (1.1.0-9.1) 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 in rules file.
+ * Patch 05 rm; move updating config.* files to rules file.
+ * Fix binary-or-shlib-defines-rpath (Lintian); add depends chrpath.
+ * Fix copyright-refers-to-symlink-license (Lintian).
+ * Fix description-synopsis-starts-with-article (Lintian).
+ * Fix desktop-entry-contains-encoding-key (Lintian).
+ * Fix description-synopsis-starts-with-article (Lintian)
+
+ -- Jari Aalto <[email protected]> Sat, 28 Apr 2012 17:11:01 +0300
+
drgeo (1.1.0-9) unstable; urgency=low
* Fixed the ftbfs with gcc-4.5. Applied the Ubuntu patch (based on
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 01aeff1..a0d56e2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: drgeo
Section: math
Priority: extra
Maintainer: Francisco Manuel Garcia Claramonte <[email protected]>
-Build-Depends: debhelper (>> 7.0.0), libglib2.0-dev, libgtk2.0-dev, libglade2-dev, libxml2-dev, guile-1.6-dev, libguile-ltdl-1, intltool, libxml-parser-perl, dpatch, autotools-dev, libltdl-dev [kfreebsd-amd64 kfreebsd-i386 hurd-i386]
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 9), libglib2.0-dev, libgtk2.0-dev, libglade2-dev, libxml2-dev, guile-1.6-dev, libguile-ltdl-1, intltool, libxml-parser-perl, autotools-dev, libltdl-dev [kfreebsd-amd64 kfreebsd-i386 hurd-i386], chrpath
+Standards-Version: 3.9.3
Homepage: http://www.gnu.org/software/dr_geo/dr_geo.html
Package: drgeo
@@ -11,7 +11,7 @@ Architecture: any
Recommends: drgeo-doc
Depends: ${shlibs:Depends}, ${misc:Depends}, imagemagick
Replaces: drgenius
-Description: An interactive geometry software
+Description: interactive geometry software
This is the Gtk interactive geometry software. It allows one
to create geometric figure plus the interactive manipulation of such
figure in respect with their geometric constraints. It is usable in
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index ee8e858..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,7 +0,0 @@
-01-html_viewer.dpatch
-02-desktop-file-icon.dpatch
-03-fix_segfault.dpatch
-04_restore_pristine
-05_config.dpatch
-06_default_html_viewer.dpatch
-07-fix_ftbfs-gcc-4.5.dpatch
diff --git a/debian/patches/01-html_viewer.dpatch b/debian/patches/01-html-viewer.patch
similarity index 57%
rename from debian/patches/01-html_viewer.dpatch
rename to debian/patches/01-html-viewer.patch
index 1f2e4b0..131748c 100644
--- a/debian/patches/01-html_viewer.dpatch
+++ b/debian/patches/01-html-viewer.patch
@@ -1,16 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01-html_viewer.dpatch by Francisco Manuel Garcia Claramonte
-## <[email protected]>
-##
-## DP: This patch fix the problem with the www browser configuration,
-## Adding the default www browser option.
-##
-## This patch is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public Licences as by published
-## by the Free Software Foundation; either version 2; or (at your option)
-## any later version
+From: Francisco Manuel Garcia Claramonte
+Subject: This patch fix the problem with the www browser configuration,
-@DPATCH@
diff -urNad drgeo-1.1.0~/glade/drgenius2.glade drgeo-1.1.0/glade/drgenius2.glade
--- drgeo-1.1.0~/glade/drgenius2.glade 2003-11-24 22:24:11.000000000 +0100
+++ drgeo-1.1.0/glade/drgenius2.glade 2008-11-02 11:53:10.000000000 +0100
diff --git a/debian/patches/02-desktop-file-icon.dpatch b/debian/patches/02-desktop-file-icon.dpatch
deleted file mode 100644
index e708aac..0000000
--- a/debian/patches/02-desktop-file-icon.dpatch
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02-desktop-file-icon.dpatch by Francisco Manuel Garcia Claramonte
-## <[email protected]>
-##
-## DP: This patch fix the problem with the missing icon in desktop
-## file.
-##
-## This patch is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public Licences as by published
-## by the Free Software Foundation; either version 2; or (at your option)
-## any later version
-
-
-@DPATCH@
-diff -urNad drgeo-1.1.0~/drgeo.desktop.in drgeo-1.1.0/drgeo.desktop.in
---- drgeo-1.1.0~/drgeo.desktop.in 2003-08-16 20:47:15.000000000 +0200
-+++ drgeo-1.1.0/drgeo.desktop.in 2008-11-09 19:26:44.000000000 +0100
-@@ -3,7 +3,7 @@
- _Name=Dr.Geo
- _Comment=Dr.Geo Math Tool
- Exec=drgeo
--Icon=gnome-drgenius.png
-+Icon=drgeo_32x32.xpm
- Terminal=false
- StartupNotify=true
- Type=Application
diff --git a/debian/patches/02-desktop-file-icon.patch b/debian/patches/02-desktop-file-icon.patch
new file mode 100644
index 0000000..ab17014
--- /dev/null
+++ b/debian/patches/02-desktop-file-icon.patch
@@ -0,0 +1,15 @@
+From: Francisco Manuel Garcia Claramonte
+Subject: This patch fix the problem with the missing icon in desktop
+
+diff -urNad drgeo-1.1.0~/drgeo.desktop.in drgeo-1.1.0/drgeo.desktop.in
+--- drgeo-1.1.0~/drgeo.desktop.in 2003-08-16 20:47:15.000000000 +0200
++++ drgeo-1.1.0/drgeo.desktop.in 2008-11-09 19:26:44.000000000 +0100
+@@ -3,7 +3,7 @@
+ _Name=Dr.Geo
+ _Comment=Dr.Geo Math Tool
+ Exec=drgeo
+-Icon=gnome-drgenius.png
++Icon=drgeo_32x32.xpm
+ Terminal=false
+ StartupNotify=true
+ Type=Application
diff --git a/debian/patches/03-fix-segfault.patch b/debian/patches/03-fix-segfault.patch
new file mode 100644
index 0000000..a43093d
--- /dev/null
+++ b/debian/patches/03-fix-segfault.patch
@@ -0,0 +1,15 @@
+From: Francisco Manuel Garcia Claramonte
+Subject: This patch fix the problem with the segfault problem when doing
+
+diff -urNad drgeo-1.1.0~/geo/drgeo_figure.cc drgeo-1.1.0/geo/drgeo_figure.cc
+--- drgeo-1.1.0~/geo/drgeo_figure.cc 2005-07-14 09:30:01.000000000 +0200
++++ drgeo-1.1.0/geo/drgeo_figure.cc 2008-11-15 12:32:45.000000000 +0100
+@@ -1309,7 +1309,7 @@
+ gint
+ drgeoFigure::preferedUndoLevel ()
+ {
+- atoi (drgeoConfigGet (":undoLevel"));
++ return atoi (drgeoConfigGet (":undoLevel"));
+ }
+
+ void
diff --git a/debian/patches/03-fix_segfault.dpatch b/debian/patches/03-fix_segfault.dpatch
deleted file mode 100644
index 4011ddc..0000000
--- a/debian/patches/03-fix_segfault.dpatch
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04-fix_segfault.dpatch by Francisco Manuel Garcia Claramonte
-## <[email protected]>
-##
-## DP: This patch fix the problem with the segfault problem when doing
-## click in a new point in the screen.
-## Thanks to Ubuntu launchpad team for the patch.
-## https://bugs.launchpad.net/ubuntu/+source/drgeo/+bug/257797
-##
-## This patch is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public Licences as by published
-## by the Free Software Foundation; either version 2; or (at your option)
-## any later version
-
-
-@DPATCH@
-diff -urNad drgeo-1.1.0~/geo/drgeo_figure.cc drgeo-1.1.0/geo/drgeo_figure.cc
---- drgeo-1.1.0~/geo/drgeo_figure.cc 2005-07-14 09:30:01.000000000 +0200
-+++ drgeo-1.1.0/geo/drgeo_figure.cc 2008-11-15 12:32:45.000000000 +0100
-@@ -1309,7 +1309,7 @@
- gint
- drgeoFigure::preferedUndoLevel ()
- {
-- atoi (drgeoConfigGet (":undoLevel"));
-+ return atoi (drgeoConfigGet (":undoLevel"));
- }
-
- void
diff --git a/debian/patches/04_restore_pristine.dpatch b/debian/patches/04-restore-pristine.patch
similarity index 98%
rename from debian/patches/04_restore_pristine.dpatch
rename to debian/patches/04-restore-pristine.patch
index 17bf026..af37ba7 100644
--- a/debian/patches/04_restore_pristine.dpatch
+++ b/debian/patches/04-restore-pristine.patch
@@ -1,19 +1,16 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_restore_pristine.dpatch by Francisco Manuel Garcia Claramonte
-## <[email protected]>
-##
-## DP: This patch restores the pristine source code
-##
-## This patch is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public Licences as by published
-## by the Free Software Foundation; either version 2; or (at your option)
-## any later version
+From: Francisco Manuel Garcia Claramonte
+Subject: This patch restores the pristine source code
-@DPATCH@
+---
+ drgeo.desktop | 69 +++
+ intltool-extract | 473 ++++++++++++++++++++
+ intltool-merge | 1255 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ intltool-update | 1034 +++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 2831 insertions(+)
---- drgeo-1.1.0.orig/intltool-extract
-+++ drgeo-1.1.0/intltool-extract
+--- /dev/null
++++ b/intltool-extract
@@ -0,0 +1,473 @@
+#!/usr/bin/perl -w
+# -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*-
@@ -488,8 +485,8 @@
+ }
+}
+
---- drgeo-1.1.0.orig/intltool-merge
-+++ drgeo-1.1.0/intltool-merge
+--- /dev/null
++++ b/intltool-merge
@@ -0,0 +1,1255 @@
+#!/usr/bin/perl -w
+# -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*-
@@ -1746,8 +1743,8 @@
+ return @list;
+}
+
---- drgeo-1.1.0.orig/intltool-update
-+++ drgeo-1.1.0/intltool-update
+--- /dev/null
++++ b/intltool-update
@@ -0,0 +1,1034 @@
+#!/usr/bin/perl -w
+# -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*-
@@ -2783,11 +2780,10 @@
+
+ return $domain;
+}
---- drgeo-1.1.0.orig/drgeo.desktop
-+++ drgeo-1.1.0/drgeo.desktop
-@@ -0,0 +1,70 @@
+--- /dev/null
++++ b/drgeo.desktop
+@@ -0,0 +1,69 @@
+[Desktop Entry]
-+Encoding=UTF-8
+Name=Dr.Geo
+Name[ca]=Dr.Geo
+Name[cs]=Dr.Geo
diff --git a/debian/patches/05_config.dpatch b/debian/patches/05_config.dpatch
deleted file mode 100644
index 48d26b5..0000000
--- a/debian/patches/05_config.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh -e
-## 05-config.dpatch by Francisco Manuel Garcia Claramonte
-## <[email protected]>
-## <[email protected]>
-##
-## DP: This patch updates config.guess and config.sub files.
-## DP: These files are replaced with /usr/share/misc/config.{guess,sub}
-##
-## This patch is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public Licences as by published
-## by the Free Software Foundation; either version 2; or (at your option)
-## any later version
-
-test -r /usr/share/misc/config.guess &&
-cp -f /usr/share/misc/config.guess config.guess
-
-test -r /usr/share/misc/config.sub &&
-cp -f /usr/share/misc/config.sub config.sub
-
diff --git a/debian/patches/06_default_html_viewer.dpatch b/debian/patches/06-default-html-viewer.patch
similarity index 53%
rename from debian/patches/06_default_html_viewer.dpatch
rename to debian/patches/06-default-html-viewer.patch
index 1764bc0..f65a44b 100644
--- a/debian/patches/06_default_html_viewer.dpatch
+++ b/debian/patches/06-default-html-viewer.patch
@@ -1,17 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 06_default_html_viewer.dpatch by Francisco Manuel Garcia Claramonte
-## <[email protected]>
-##
-## DP: This patch change default html viewer from dillo to the
-## alternative x-www-browser
-##
-## This patch is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public Licences as by published
-## by the Free Software Foundation; either version 2; or (at your option)
-## any later version
+From: Francisco Manuel Garcia Claramonte
+Subject: This patch change default html viewer from dillo to the
-
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' drgeo-1.1.0~/scm/preferences.scm drgeo-1.1.0/scm/preferences.scm
--- drgeo-1.1.0~/scm/preferences.scm 2003-11-29 19:19:07.000000000 +0100
+++ drgeo-1.1.0/scm/preferences.scm 2010-07-03 17:59:34.000000000 +0200
diff --git a/debian/patches/07-fix_ftbfs-gcc-4.5.dpatch b/debian/patches/07-fix-ftbfs-gcc-4.5.patch
similarity index 82%
rename from debian/patches/07-fix_ftbfs-gcc-4.5.dpatch
rename to debian/patches/07-fix-ftbfs-gcc-4.5.patch
index 792b708..e32d0a1 100644
--- a/debian/patches/07-fix_ftbfs-gcc-4.5.dpatch
+++ b/debian/patches/07-fix-ftbfs-gcc-4.5.patch
@@ -1,12 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 07-fix_ftbfs-gcc-4.5.dpatch by Fabrice Coutadeur <[email protected]>
-##
-## DP: fix FTBFS with gcc 4.5 with undefined reference to
-## `drgeoDialogData'
-## Author: Petr Gajdos <[email protected]>
-## Origin: https://build.opensuse.org/package/files?package=drgeo&project=openSUSE%3A11.3%3AContrib
+From: Fabrice Coutadeur <[email protected]>
+Subject: fix FTBFS with gcc 4.5 with undefined reference to
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' drgeo-1.1.0~/geo/drgeo_dialog.cc drgeo-1.1.0/geo/drgeo_dialog.cc
--- drgeo-1.1.0~/geo/drgeo_dialog.cc 2003-10-27 10:17:25.000000000 +0000
+++ drgeo-1.1.0/geo/drgeo_dialog.cc 2010-11-13 07:26:03.258908003 +0000
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..139f554
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,6 @@
+01-html-viewer.patch
+02-desktop-file-icon.patch
+03-fix-segfault.patch
+04-restore-pristine.patch
+06-default-html-viewer.patch
+07-fix-ftbfs-gcc-4.5.patch
diff --git a/debian/rules b/debian/rules
index 0de72ad..c081fa9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,9 +9,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
-
-
# This has to be exported to make some magic below work.
export DH_OPTIONS
@@ -21,18 +18,22 @@ else
EXTRACFLAGS=
endif
+build-arch: build
+build-indep: build
+
build: build-stamp
-build-stamp: patch-stamp
+build-stamp:
dh_testdir
+ cp -vf /usr/share/misc/config.sub /usr/share/misc/config.guess .
CFLAGS="${EXTRACFLAGS}" ./configure --prefix=/usr
$(MAKE)
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
- rm -f build-stamp
- -test -f Makefile && $(MAKE) distclean
+ rm -f build-stamp config.guess config.sub
+ [ ! -f Makefile ] || $(MAKE) distclean
dh_clean
@@ -45,7 +46,7 @@ install: build
$(MAKE) install prefix=$(CURDIR)/debian/drgeo/usr
install -m 644 $(CURDIR)/debian/drgeo_32x32.xpm $(CURDIR)/debian/drgeo/usr/share/pixmaps
mkdir -p $(CURDIR)/debian/drgeo/usr/share/doc/drgeo/
- install -m 644 $(CURDIR)/debian/README.source $(CURDIR)/debian/drgeo/usr/share/doc/drgeo/
+ chrpath -d debian/drgeo/usr/bin/drgeo
# Build architecture-independent files here.
# Pass -i to all debhelper commands in this target to reduce clutter.
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)
--
1.7.10
--- End Message ---
