tags 645542 + patch pending thanks Hi Jonas,
I've prepared an NMU for pinot dropping the deskbar-plugins-pinot package. As we build a single package now, cdbs will install into debian/$(pkg) by default, so I dropped the usage of --destdir=debian/tmp and pinot.install and simply remove from pinot what's not needed. As this bug blocks the ongoing GNOME 3 transition, I've uploaded it to DELAYED/2. Please let me know if I should delay it further or if the patch is otherwise not acceptable and I should cancel the NMU. Cheers, Michael -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth?
diff -Nru pinot-0.96/debian/changelog pinot-0.96/debian/changelog
--- pinot-0.96/debian/changelog 2010-12-15 17:30:18.000000000 +0100
+++ pinot-0.96/debian/changelog 2011-10-18 02:41:18.000000000 +0200
@@ -1,3 +1,11 @@
+pinot (0.96-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Drop deskbar-plugins-pinot package as deskbar-applet has been removed.
+ Closes: #645542
+
+ -- Michael Biebl <bi...@debian.org> Tue, 18 Oct 2011 00:53:07 +0200
+
pinot (0.96-1) unstable; urgency=low
* New upstream release.
diff -Nru pinot-0.96/debian/control pinot-0.96/debian/control
--- pinot-0.96/debian/control 2010-12-15 17:30:26.000000000 +0100
+++ pinot-0.96/debian/control 2011-10-18 02:39:45.000000000 +0200
@@ -33,7 +33,7 @@
Package: pinot
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, dbus-x11
-Suggests: deskbar-plugins-pinot, antiword, catdoc, catdvi, djvulibre-bin,
+Suggests: antiword, catdoc, catdvi, djvulibre-bin,
poppler-utils | xpdf-utils, rpm, unrtf, unzip
Description: meta-search engine for local files and web queries
Pinot provides a D-Bus service that crawls, indexes your documents and
@@ -44,20 +44,3 @@
.
Pinot also provides a Xesam interface, which can be used through Xesam Query
Language and Xesam User Language.
-
-Package: deskbar-plugins-pinot
-Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, deskbar-applet (>= 2.20),
- pinot, python-gnome2, python-gobject, python-dbus
-Description: deskbar plugin to search files with pinot
- Pinot provides a D-Bus service that crawls, indexes your documents and
- monitors them for changes. This service can then be used via a command-line
- interface, or through a GTK-based GUI that enables to query the index built
- by the service and your favourite Web engines, and display and analyze the
- results.
- .
- Pinot also provides a Xesam interface, which can be used through Xesam Query
- Language and Xesam User Language.
- .
- This package provides a plugin for the GNOME Deskbar applet to search for
- files using Pinot.
diff -Nru pinot-0.96/debian/control.in pinot-0.96/debian/control.in
--- pinot-0.96/debian/control.in 2010-12-15 17:29:27.000000000 +0100
+++ pinot-0.96/debian/control.in 2011-10-18 02:39:45.000000000 +0200
@@ -11,7 +11,7 @@
Package: pinot
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, dbus-x11
-Suggests: deskbar-plugins-pinot, antiword, catdoc, catdvi, djvulibre-bin,
+Suggests: antiword, catdoc, catdvi, djvulibre-bin,
poppler-utils | xpdf-utils, rpm, unrtf, unzip
Description: meta-search engine for local files and web queries
Pinot provides a D-Bus service that crawls, indexes your documents and
@@ -22,20 +22,3 @@
.
Pinot also provides a Xesam interface, which can be used through Xesam Query
Language and Xesam User Language.
-
-Package: deskbar-plugins-pinot
-Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, deskbar-applet (>= 2.20),
- pinot, python-gnome2, python-gobject, python-dbus
-Description: deskbar plugin to search files with pinot
- Pinot provides a D-Bus service that crawls, indexes your documents and
- monitors them for changes. This service can then be used via a command-line
- interface, or through a GTK-based GUI that enables to query the index built
- by the service and your favourite Web engines, and display and analyze the
- results.
- .
- Pinot also provides a Xesam interface, which can be used through Xesam Query
- Language and Xesam User Language.
- .
- This package provides a plugin for the GNOME Deskbar applet to search for
- files using Pinot.
diff -Nru pinot-0.96/debian/deskbar-plugins-pinot.dirs pinot-0.96/debian/deskbar-plugins-pinot.dirs
--- pinot-0.96/debian/deskbar-plugins-pinot.dirs 2009-05-10 14:24:38.000000000 +0200
+++ pinot-0.96/debian/deskbar-plugins-pinot.dirs 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-/usr/lib/deskbar-applet/modules-2.20-compatible/
diff -Nru pinot-0.96/debian/deskbar-plugins-pinot.install pinot-0.96/debian/deskbar-plugins-pinot.install
--- pinot-0.96/debian/deskbar-plugins-pinot.install 2009-05-10 14:24:38.000000000 +0200
+++ pinot-0.96/debian/deskbar-plugins-pinot.install 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib/deskbar-applet/modules-2.20-compatible/pinot-module.py
diff -Nru pinot-0.96/debian/pinot.install pinot-0.96/debian/pinot.install
--- pinot-0.96/debian/pinot.install 2009-05-10 14:24:38.000000000 +0200
+++ pinot-0.96/debian/pinot.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-/etc/
-/usr/bin/
-/usr/lib/pinot/
-/usr/share/
diff -Nru pinot-0.96/debian/rules pinot-0.96/debian/rules
--- pinot-0.96/debian/rules 2010-12-15 17:06:47.000000000 +0100
+++ pinot-0.96/debian/rules 2011-10-18 02:39:45.000000000 +0200
@@ -36,19 +36,15 @@
# Limit linking to actually used libs
LDFLAGS += -Wl,--as-needed
-DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
-
DEB_DH_MAKESHLIBS_ARGS = -Xusr/lib/pinot
binary-fixup/pinot::
chmod a+x $(CURDIR)/debian/$(cdbs_curpkg)/usr/share/pinot/*.sh
binary-install/pinot::
+ rm -rf $(CURDIR)/debian/$(cdbs_curpkg)/usr/lib/deskbar-applet/
dh_icons
-binary-install/deskbar-plugins-pinot::
- dh_pysupport /usr/lib/deskbar-applet/modules-2.20-compatible/
-
# Needed by upstream build process
CDBS_BUILD_DEPENDS += , libcurl4-openssl-dev, libxapian-dev (>= 1.0.3), libboost-dev
CDBS_BUILD_DEPENDS += , libtextcat-dev, libtag1-dev (>= 1.4), libsqlite3-dev (>= 3.1)
signature.asc
Description: OpenPGP digital signature
