KDE_3_2_BRANCH: kdeaddons/debian
CVS commit by benb:
Merge renamedlgplugins into kdeaddons-kfile-plugins since both packages
are small and similar. Also further updates to documentation and
debian/rules.
A kate-plugins.override 1.2.2.1
A ksig.README.Debian 1.1.2.1
A vimpart.README.Debian 1.1.2.1
M +4 -2 changelog 1.26.2.3
M +9 -14 control 1.31.2.5
M +3 -0 kdeaddons-kfile-plugins.install 1.3.4.1
M +18 -2 rules 1.19.2.2
R renamedlg-plugins.docs 1.1.2.1
R renamedlg-plugins.install 1.3
--- kdeaddons/debian/kdeaddons-kfile-plugins.install #1.3:1.3.4.1
@@ -1,2 +1,5 @@
usr/lib/kde3/kfile_*
+usr/lib/kde3/libren*
usr/share/services/kfile_*
+usr/share/services/ren*
+usr/share/doc/kdeaddons-kfile-plugins
--- kdeaddons/debian/rules #1.19.2.1:1.19.2.2
@@ -135,4 +135,9 @@
done
+ # Install miscellaneous docs.
+ $(INSTALL_DIR) debian/tmp/usr/share/doc/kdeaddons-kfile-plugins
+ $(INSTALL_FILE) renamedlgplugins/README \
+ debian/tmp/usr/share/doc/kdeaddons-kfile-plugins/README.renamedlgplugins
+
# Split into separate binary packages.
dh_install --sourcedir=debian/tmp --list-missing
@@ -180,6 +185,17 @@
dh_installdeb
dh_perl
- # TODO: Split this into a for loop.
- dh_shlibdeps -ldebian/vimpart/usr/lib:debian/vimpart/usr/lib/kde3
+
+ # Run dh_shlibdeps with package-specific library search paths.
+ for pkg in `dh_listpackages`; do \
+ echo "Checking dependencies for $$pkg..."; \
+ case "$$pkg" in \
+ vimpart ) \
+ DH_OPTIONS='' dh_shlibdeps -p$$pkg \
+ -ldebian/$$pkg/usr/lib:debian/$$pkg/usr/lib/kde3 ;; \
+ * ) \
+ DH_OPTIONS='' dh_shlibdeps -p$$pkg ;; \
+ esac; \
+ done
+
dh_gencontrol
dh_md5sums
--- kdeaddons/debian/changelog #1.26.2.2:1.26.2.3
@@ -4,6 +4,8 @@
* Many thanks to Ralf Nolden for all his help with packaging KDE 3.2.
* Thanks to Mickael Marchand for previous packaging work on vimpart.
- * New binary packages kaddressbook-plugins, kontact-plugins, ksig,
- renamedlg-plugins and vimpart.
+ * New binary packages kaddressbook-plugins, kontact-plugins, ksig and
+ vimpart.
+ * Note that the rename dialog plugins have been merged into the
+ kdeaddons-kfile-plugins package.
-- Ben Burton <bab@debian.org> Sat, 31 Jan 2004 12:08:48 +1100
--- kdeaddons/debian/control #1.31.2.4:1.31.2.5
@@ -9,5 +9,5 @@
Architecture: all
Section: kde
-Depends: atlantikdesigner, kaddressbook-plugins, kate-plugins, kdeaddons-kfile-plugins, kicker-applets, knewsticker-scripts, konq-plugins, kontact-plugins, ksig, noatun-plugins, renamedlg-plugins, vimpart
+Depends: atlantikdesigner, kaddressbook-plugins, kate-plugins, kdeaddons-kfile-plugins, kicker-applets, knewsticker-scripts, konq-plugins, kontact-plugins, ksig, noatun-plugins, vimpart
Suggests: kdeaddons-doc-html
Description: add-on plugins and applets provided with KDE
@@ -85,4 +85,7 @@
Section: kde
Depends: ${shlibs:Depends}
+Conflicts: renamedlg-plugins (<= 4:3.2.0-1)
+Replaces: renamedlg-plugins (<= 4:3.2.0-1)
+Provides: renamedlg-plugins
Description: KDE file dialog plugins for text files and folders
This is a collection of plugins for the KDE file dialog. These plugins
@@ -90,4 +93,9 @@
HTML and desktop files, as well as for folders.
.
+ This package also includes plugins for the KDE file rename dialog,
+ allowing a user to more easily decide what to do when faced with a
+ decision regarding conflicting filenames. Rename dialog plugins are
+ provided for audio and image files.
+ .
This package is part of the KDE add-ons module.
@@ -198,17 +206,4 @@
This package is part of the KDE add-ons module.
-Package: renamedlg-plugins
-Architecture: any
-Section: kde
-Depends: ${shlibs:Depends}
-Description: plugins for the KDE file rename dialog
- This package contains a variety of plugins for the KDE file rename
- dialog. These plugins allow a user to more easily decide what to do
- when faced with a decision regarding conflicting filenames.
- .
- Plugins are provided for audio and image files.
- .
- This package is part of the KDE add-ons module.
-
Package: vimpart
Architecture: any
Reply to: