Hi,
I just sponsored gnome-pilot 2.0.15-2 which should propagate to testing.
It includes a fix for a fixed pointer-size bug (#411957) on amd64 and an
updated location of the upstream sources (#410262).
The interdiff between the version in testing and the version just
uploaded to unstable is rather big because some files which were wrongly
included in the previous source package were removed again. The source
package in testing contains some files which are generated during the
build and should not be in the source package.
I have included the interdiff with the changes due to removed files
filtered out.
Please unblock this upload.
Greetings Arjan
arjan@nebula:~/debian/results$ debdiff gnome-pilot_2.0.15-0.1/gnome-pilot_2.0.15-0.1.dsc gnome-pilot_2.0.15-2/gnome-pilot_2.0.15-2.dsc | filterdiff -x "*/intltool-*"
reverted:
diff -u gnome-pilot-2.0.15/debian/copyright gnome-pilot-2.0.15/debian/copyright
--- gnome-pilot-2.0.15/debian/copyright
+++ gnome-pilot-2.0.15/debian/copyright
@@ -1,7 +1,7 @@
-This package was debianized by Mike Markley <mike@markley.org> on
+This package was first debianized by Mike Markley <mike@markley.org> on
Thu, 13 Apr 2000 17:16:18 -0700.
-It was downloaded from http://www.eskil.org/gnome-pilot/download/tarballs/
+Upstream release can be found in http://live.gnome.org/GnomePilot
Upstream Authors: Eskil Heyn Olsen <eskil@eazel.com> (lead developer)
Manish Vachharajani <mvachhar@vger.rutgers.edu>
diff -u gnome-pilot-2.0.15/debian/changelog gnome-pilot-2.0.15/debian/changelog
--- gnome-pilot-2.0.15/debian/changelog
+++ gnome-pilot-2.0.15/debian/changelog
@@ -1,3 +1,32 @@
+gnome-pilot (2.0.15-2) unstable; urgency=high
+
+ * Added dpatch to debian/rules file and respectively in the
+ Build-Depends.
+ * Added commentary in devices.xml to list more supported devices.
+ * Removed libbluetooth2-dev on Build-Depend. The libpisock.la in
+ Etch does not reference libbluetooth.la, the libpisock-dev
+ package in Sid does depend on libbluetooth2-dev.
+ * intltool-{extract,merge,update}: Removed build generated files from
+ source package. These files are generated during build and were
+ wrongly included in the 2.0.15-0.1 source package.
+
+ -- Felipe Alvarenga Roquette <roquette.felipe@gmail.com> Sun, 11 Mar 2007 14:19:55 -0300
+
+gnome-pilot (2.0.15-1) unstable; urgency=high
+
+ * New maintainer, fix ITP bug. (Closes: #396312)
+ * Package uploaded by Arjan Oosting <arjan@debian.org>
+ * Acknowledge Arjan Oosting's NMU. (Closes: #402367)
+ * Fixed upstream URL in copyright file. (Closes: #410262)
+ * German PO file corrections fixed in earlier upstream release.
+ (Closes: #313743)
+ * Fixed pointer-size bug on amd64. (Closes: #411957)
+ * Added libbluetooth2-dev on Build-Depend because libpisock.la
+ declares a dependency on libbluetooth.la but libpisock-dev does
+ not depend libbluetooth2-dev (bug #413051).
+
+ -- Felipe Alvarenga Roquette <roquette.felipe@gmail.com> Tue, 20 Feb 2007 12:23:26 -0200
+
gnome-pilot (2.0.15-0.1) unstable; urgency=medium
* Non-maintainer upload with permission of the upcoming maintainer
diff -u gnome-pilot-2.0.15/debian/rules gnome-pilot-2.0.15/debian/rules
--- gnome-pilot-2.0.15/debian/rules
+++ gnome-pilot-2.0.15/debian/rules
@@ -2,7 +2,7 @@
#export DH_VERBOSE=1
-build: build-stamp
+build: patch build-stamp
build-stamp:
dh_testdir
@@ -18,7 +18,21 @@
touch build-stamp
-clean:
+patch: patch-stamp
+
+patch-stamp:
+ dh_testdir
+ dpatch apply-all
+ touch patch-stamp
+
+unpatch:
+ dh_testdir
+ dpatch deapply-all
+ rm -rf patch-stamp debian/patched
+
+clean: clean-patched unpatch
+
+clean-patched:
dh_testdir
dh_testroot
rm -f build-stamp
diff -u gnome-pilot-2.0.15/debian/control gnome-pilot-2.0.15/debian/control
--- gnome-pilot-2.0.15/debian/control
+++ gnome-pilot-2.0.15/debian/control
@@ -1,8 +1,8 @@
Source: gnome-pilot
Section: gnome
Priority: extra
-Maintainer: Mike Markley <mike@markley.org>
-Build-Depends: debhelper (>= 4.0.0), gob2, libpisock-dev (>= 0.12.0), libglade2-dev, libglade-gnome0-dev, libgnorba-dev, libgnome2-dev, libgnomevfs2-dev, gdk-imlib1-dev, libpanel-applet2-dev (>= 2.0.6), libbonobo2-dev, liborbit2-dev, libgnomeui-dev (>= 2.6.1.1-4), gettext, libncurses-dev | libncurses5-dev, libreadline5-dev | libreadline-dev, scrollkeeper, intltool, libdbus-glib-1-dev, libhal-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libusb-dev
+Maintainer: Felipe Alvarenga Roquette <roquette.felipe@gmail.com>
+Build-Depends: dpatch (>=2.0.21), debhelper (>= 4.0.0), gob2, libpisock-dev (>= 0.12.0), libglade2-dev, libglade-gnome0-dev, libgnorba-dev, libgnome2-dev, libgnomevfs2-dev, gdk-imlib1-dev, libpanel-applet2-dev (>= 2.0.6), libbonobo2-dev, liborbit2-dev, libgnomeui-dev (>= 2.6.1.1-4), gettext, libncurses-dev | libncurses5-dev, libreadline5-dev | libreadline-dev, scrollkeeper, intltool, libdbus-glib-1-dev, libhal-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libusb-dev
Standards-Version: 3.7.2
Package: gnome-pilot
reverted:
reverted:
only in patch2:
unchanged:
--- gnome-pilot-2.0.15.orig/gpilotd/devices.xml
+++ gnome-pilot-2.0.15/gpilotd/devices.xml
@@ -59,7 +59,7 @@
<device vendor_id="0830" product_id="0050" />
<!-- Palm Tungsten T -->
<device vendor_id="0830" product_id="0060" />
- <!-- Palm Zire 31 -->
+ <!-- Palm Zire 31, Palm Tungsten E2 and Palm Treo 650 -->
<device vendor_id="0830" product_id="0061" />
<!-- Palm Zire -->
<device vendor_id="0830" product_id="0070" />
only in patch2:
unchanged:
--- gnome-pilot-2.0.15.orig/debian/patches/00list
+++ gnome-pilot-2.0.15/debian/patches/00list
@@ -0,0 +1 @@
+pointer-size_on_amd64.dpatch
only in patch2:
unchanged:
--- gnome-pilot-2.0.15.orig/debian/patches/pointer-size_on_amd64.dpatch
+++ gnome-pilot-2.0.15/debian/patches/pointer-size_on_amd64.dpatch
@@ -0,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## pointer-size_on_amd64.dpatch by Devin Carraway <devin@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: The gnome-pilot file conduit cannot be safely used on amd64
+## DP: due to an upstream pointer-size bug (GNOME Bugzilla#410666).
+## DP: This path fixes this problem.
+
+@DPATCH@
+
+--- /conduits/file/file_conduit.c.orig 2006-04-20 14:12:25.000000000 -0700
++++ /conduits/file/file_conduit.c 2007-02-21 20:25:02.000000000 -0800
+@@ -101,21 +101,21 @@
+ gnome_real_pilot_conduit_file_install_db (GnomePilotConduitFile *conduit,
+ int psock,
+ gchar *src_file,
+ gboolean rm,
+ gpointer unused)
+ {
+ int index = 0;
+ int keep_reading = 1;
+ int wrote;
+ void *buffer;
+- int buffer_len;
++ size_t buffer_len;
+ int err;
+ int handle;
+ PilotRecord remote;
+ int entries;
+ struct DBInfo dbi;
+ struct pi_file *file;
+ int result = 0;
+ int reset = 0;
+ int version;
+ gboolean free_appblock = FALSE;
Attachment:
signature.asc
Description: Dit berichtdeel is digitaal ondertekend