fixing djvulibre dependencies and upgrades
Hi Release-Team
here is the proposed upgrade.
I have tested it by installing (all binaries) djvulibre/etch and then
upgrading to lenny + binaries from this upload.
Note that all the package split stuff done in sid is completely bogus
relative to the bug the maintainer purports to solve with it. That is
done - both in the sid packages and the proposed testing upload - by
dropping the xdg-utils dependency.
Kind regards
T.
--
Thomas Viehmann, http://thomas.viehmann.net/
diff -u djvulibre-3.5.20/debian/rules djvulibre-3.5.20/debian/rules
--- djvulibre-3.5.20/debian/rules
+++ djvulibre-3.5.20/debian/rules
@@ -75,6 +75,8 @@
dh_testdir
rm -f build-stamp config.status
-$(MAKE) distclean
+ # remove upstream stuff from Debian dir
+ -rm -rf debian/djview.postrm debian/djview.postinst debian/djview.files debian/djview.mime debian/djview.menu
dh_clean
# work around libtool --mode=clean issue
-rm -f xmltools/.libs/{djvutoxml,djvuxmlparser} gui/djview/.libs/djview
@@ -139,6 +141,8 @@
binary-arch: build install
dh_testdir
dh_testroot
+ # remove upstream stuff from Debian dir
+ -rm -rf debian/djview.postrm debian/djview.postinst debian/djview.files debian/djview.mime debian/djview.menu
dh_movefiles
# dh_installdebconf
dh_installdocs --noscripts
diff -u djvulibre-3.5.20/debian/control djvulibre-3.5.20/debian/control
--- djvulibre-3.5.20/debian/control
+++ djvulibre-3.5.20/debian/control
@@ -30,18 +30,18 @@
Package: libdjvulibre21
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, libdjvulibre-text (>= ${binary:Version}) | djvulibre-desktop (= ${binary:Version})
+Depends: ${shlibs:Depends}, djvulibre-desktop (= ${binary:Version})
Conflicts: libdjvulibre1
-Replaces: libdjvulibre1
+Replaces: libdjvulibre1, libdjvulibre15
Description: Runtime support for the DjVu image format
DjVu runtime library.
Package: djvulibre-desktop
Section: libs
Architecture: any
-Depends: xdg-utils
-Suggests: djview4 | djview3 | djview | evince
-Conflicts: libdjvulibre1, libdjvulibre15, libdjvulibre21 (<= 3.5.20-5)
+Suggests: djview4 | djvu-viewer | evince
+Conflicts: libdjvulibre1, libdjvulibre21 (<= 3.5.20-5)
+Replaces: libdjvulibre15
Description: Desktop support for the DjVu image format
Miscellaneous files to support the DjVu image format on the desktop.
@@ -49,19 +49,22 @@
Section: graphics
Architecture: any
Conflicts: djview (<= 3.5.20-5)
-Provides: djview
+Provides: djvu-viewer
Depends: ${shlibs:Depends}
-Recommends: djvulibre-desktop, djvulibre-plugin
-Suggests: djvulibre-bin
+Recommends: djvulibre-desktop
+Suggests: djvulibre-bin, djvulibre-plugin
Description: Viewer for the DjVu image format
DjVu viewer djview3, formerly knows as just djview.
Package: djview
Section: graphics
+Priority: extra
Architecture: any
Depends: djview4 | djview3
Description: Transition package for djview to djview3
- Ease transition of package name from djview to djview3.
+ This package causes the replacement djview4 or djview3 package
+ to be installed on upgrades from older versions of djview.
+ It can be removed after upgrade.
Package: djvuserve
Section: web
@@ -77,9 +80,9 @@
Package: djvulibre-plugin
Section: web
Architecture: any
-Depends: ${shlibs:Depends}, djview4 | djview3 | djview
-Enhances: mozilla-browser, mozilla, mozilla-firefox, konqueror, galeon
-Recommends: mozilla-browser | mozilla | mozilla-firefox | iceweasel | iceape-browser | konqueror | galeon | netscape-base-4 | netscape, djvulibre-desktop
+Depends: ${shlibs:Depends}, djview4 | djview3
+Enhances: mozilla-browser, mozilla, mozilla-firefox, iceweasel, iceape-browser, konqueror, galeon
+Recommends: iceweasel | mozilla-browser | mozilla | mozilla-firefox | iceape-browser | konqueror | galeon
Suggests: mime-support
Conflicts: djvulibre-bin (<< 3.5.19)
Description: Browser plugin for the DjVu image format
@@ -89,8 +92,8 @@
Section: graphics
Architecture: any
Depends: curl, ${shlibs:Depends}
-Recommends: djvulibre-desktop, pdf2djvu
-Suggests: djview4 | djview3 | djview | evince
+Recommends: pdf2djvu
+Suggests: djvulibre-desktop, djview4 | djvu-viewer | evince
Description: Utilities for the DjVu image format
Executables including utilities for conversion between DjVu and other
formats.
diff -u djvulibre-3.5.20/debian/changelog djvulibre-3.5.20/debian/changelog
--- djvulibre-3.5.20/debian/changelog
+++ djvulibre-3.5.20/debian/changelog
@@ -1,3 +1,31 @@
+djvulibre (3.5.20-8+lenny0) testing; urgency=low
+
+ * Non-maintainer upload to testing.
+
+ When Debian said let us freeze,
+ because it is time for release.
+ This maintainer, "bright" wit,
+ did not seem to care that much.
+ The diff was terribly excessive
+ and even though he must know,
+ as the list archives well show,
+ he remained outrageously passive.
+ One thing is clear as glass:
+ Barak, you are an unhelpful maintainer.
+
+ * Fix the maintainer's worst packaging mistakes in a
+ freeze-compatible way:
+ - drop xdg-utils dependency. That is what the maintainer really does
+ between all the completely irrelevant package-split hokcs-pocus in order
+ to have Closes: #472347, #474702, #474993, #475630
+ - use virtual package djvu-viewer in Provides/Recommends.
+ Closes: #491012
+ - sprinkle and correct Replaces/Conflicts to allow for smooth
+ upgrades.
+ - drop broken maintainer scripts from transitional package djview
+
+ -- Thomas Viehmann <tv@beamnet.de> Mon, 13 Oct 2008 20:49:42 +0200
+
djvulibre (3.5.20-8) unstable; urgency=low
* Raise djvudigital default resolution from 300 to 600 (closes: #478607)
Reply to: