NMU of gnome-pim in DELAYED/7-day, removing gnome-pim-conduits

[Michael Banck <mbanck@debian.org>]

tags 201219 +pending
thanks

Hi,

I've uploaded new gnome-pim packages to DELAYED/7-day. This is the
changelog:

 gnome-pim (1.4.9-2.1) unstable; urgency=low
 .
   * Non-maintainer upload.
   * Dropped the gnome-pim-conduits package for now. The conduits are broken it
     seems (#160862 and #157030) and the current GNOME-1.x based source does
     not build with libgnome-pilot2-dev at all.
   * Removed libgnome-pilot1-dev from Build-Dependencies. (Closes: #201219)
   * Renamed gnome-pim.install, CBS installs into debian/gnome-pim now anyway.

To clarify, libgnome-pilot1-dev is no longer in the archive (hence, the
bug in the first place). Libgnome-pilot2-dev depends on GNOME-2.x and does
not ship support for GNOME-1.x anymore, which makes building gnome-pim
with it fail.

I've also tried the gnome-2-branch of gnome-pim, but that does not
compile. Thus I have decided (in agreement with a member of the QA team)
to remove gnome-pilot-conduits from the package (rather than have a
totally broken package without binaries around) for now in order to let
the main applications (namely, gnomecard and gnomecal) ship with sarge.

I did not remove the gnome-pim-conduits specific files from the
debian-directory to make a future readdition of gnome-pim-conduits as
easy as possible. However, I had to rename gnome-pim.install to
gnome-pim.install_ because CBS installs into debian/$(package) and not
debian/tmp if only one binary package is built.

If you, Sebastian, disagree with these decisions, please speak up in the
next days and propose an alternative solution.

I've attached the interdiff between 1.4.9-2 and 1.4.9-2.1.


cheers,

Michael

-- 
Michael Banck
Debian Developer
mbanck@debian.org
http://www.advogato.org/person/mbanck/diary.html

diff -u gnome-pim-1.4.9/debian/control gnome-pim-1.4.9/debian/control
--- gnome-pim-1.4.9/debian/control
+++ gnome-pim-1.4.9/debian/control
@@ -2,7 +2,7 @@
 Section: utils
 Maintainer: Sebastian Rittau <srittau@debian.org>
 Standards-Version: 3.5.8
-Build-Depends: libgnome-pilot1-dev, gdk-imlib1-dev, liborbit-dev, libart-dev, debhelper (>= 4.0.0), flex, libgnome-dev, gettext, libaudiofile-dev, libdb3-dev, libgnorba-dev, libpisock-dev (>= 0.9.5), libxml-dev, docbook-utils
+Build-Depends: gdk-imlib1-dev, liborbit-dev, libart-dev, debhelper (>= 4.0.0), flex, libgnome-dev, gettext, libaudiofile-dev, libdb3-dev, libgnorba-dev, libpisock-dev (>= 0.9.5), libxml-dev, docbook-utils
 
 Package: gnome-pim
 Priority: optional
@@ -15,8 +14,0 @@
-
-Package: gnome-pim-conduits
-Priority: extra
-Architecture: any
-Depends: gnome-pim, gnome-pilot, ${shlibs:Depends}, ${misc:Depends}
-Description: Palm synchronization for calendar and address book
- This package contains conduits to synchronize your address book and
- calendar between your GNOME 1 system and your Palm handheld.
diff -u gnome-pim-1.4.9/debian/changelog gnome-pim-1.4.9/debian/changelog
--- gnome-pim-1.4.9/debian/changelog
+++ gnome-pim-1.4.9/debian/changelog
@@ -1,3 +1,14 @@
+gnome-pim (1.4.9-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Dropped the gnome-pim-conduits package for now. The conduits are broken it
+    seems (#160862 and #157030) and the current GNOME-1.x based source does
+    not build with libgnome-pilot2-dev at all.
+  * Removed libgnome-pilot1-dev from Build-Dependencies. (Closes: #201219)
+  * Renamed gnome-pim.install, CBS installs into debian/gnome-pim now anyway. 
+
+ -- Michael Banck <mbanck@debian.org>  Fri, 23 Apr 2004 16:09:49 +0200
+
 gnome-pim (1.4.9-2) unstable; urgency=low
 
   * Use Colin's Build System.
reverted:
--- gnome-pim-1.4.9/debian/gnome-pim.install
+++ gnome-pim-1.4.9.orig/debian/gnome-pim.install
@@ -1,9 +0,0 @@
-debian/tmp/etc/CORBA/servers
-debian/tmp/usr/bin/gnomecal
-debian/tmp/usr/bin/gnomecard
-debian/tmp/usr/share/gnome/apps/Applications
-debian/tmp/usr/share/gnome/help
-debian/tmp/usr/share/idl
-debian/tmp/usr/share/locale
-debian/tmp/usr/share/mime-info
-debian/tmp/usr/share/pixmaps/gnome-gnomecard.png
only in patch2:
unchanged:
--- gnome-pim-1.4.9.orig/debian/gnome-pim.install_
+++ gnome-pim-1.4.9/debian/gnome-pim.install_
@@ -0,0 +1,9 @@
+debian/tmp/etc/CORBA/servers
+debian/tmp/usr/bin/gnomecal
+debian/tmp/usr/bin/gnomecard
+debian/tmp/usr/share/gnome/apps/Applications
+debian/tmp/usr/share/gnome/help
+debian/tmp/usr/share/idl
+debian/tmp/usr/share/locale
+debian/tmp/usr/share/mime-info
+debian/tmp/usr/share/pixmaps/gnome-gnomecard.png