KDE/kdeaddons/debian
SVN commit 414020 by benb:
Sync trunk with 3.4 branch.
M +34 -0 trunk/KDE/kdeaddons/debian/changelog
M +5 -5 trunk/KDE/kdeaddons/debian/control
M +3 -3 trunk/KDE/kdeaddons/debian/rules
M +7 -3 trunk/KDE/kdeaddons/debian/vimpart.README.Debian
--- trunk/KDE/kdeaddons/debian/changelog #414019:414020
@@ -1,3 +1,11 @@
+kdeaddons (4:3.4.0-0pre2) unstable; urgency=low
+
+ * Merge in recent packaging changes from the 3.3 branch.
+ * Now that KDE has moved to subversion, disable cvs-clean in debian/rules
+ for the time being.
+
+ -- Ben Burton <bab@debian.org> Sat, 14 May 2005 19:20:58 +1000
+
kdeaddons (4:3.4.0-0pre1) unstable; urgency=low
* New major upstream release.
@@ -7,6 +15,32 @@
-- Ben Burton <bab@debian.org> Tue, 8 Mar 2005 07:43:35 +1100
+kdeaddons (4:3.3.2-4) unstable; urgency=low
+
+ * Replaced vimpart's long list of GUI vim dependencies with the single
+ (vim-gtk | gvim). This removes an indirect (and unnecessary) conflict
+ between vimpart and the new vim-full package, and should avoid similar
+ such problems in the future (closes: #306538).
+
+ -- Ben Burton <bab@debian.org> Sun, 1 May 2005 13:41:04 +1000
+
+kdeaddons (4:3.3.2-3) unstable; urgency=low
+
+ * Made the default vimpart dependency vim-gtk (closes: #304189).
+ Previously it was kvim, but kvim has since been removed from debian.
+ * Added a note in vimpart.README.Debian that the above change may require
+ you to reconfigure your vimpart in the control centre.
+ * Don't use 'libsuff=64' on amd64 or ppc64 (closes: #301794).
+
+ -- Ben Burton <bab@debian.org> Mon, 25 Apr 2005 23:08:18 +1000
+
+kdeaddons (4:3.3.2-2) unstable; urgency=low
+
+ * Include the full text of the GFDL in debian/copyright, since all of the
+ docbook documentation is under this license.
+
+ -- Ben Burton <bab@debian.org> Sat, 26 Mar 2005 09:55:33 +1100
+
kdeaddons (4:3.3.2-1) unstable; urgency=low
* New upstream bugfix release.
--- trunk/KDE/kdeaddons/debian/control #414019:414020
@@ -201,7 +201,7 @@
Package: vimpart
Architecture: any
Section: kde
-Depends: ${shlibs:Depends}, ${misc:Depends}, kcontrol (>= 4:3.2.0), kvim | kvim-perl | kvim-python | kvim-ruby | kvim-tcl | vim-gnome | vim-gtk | vim-lesstif | vim-perl | vim-python | vim-ruby | vim-tcl
+Depends: ${shlibs:Depends}, ${misc:Depends}, kcontrol (>= 4:3.2.0), vim-gtk | gvim
Replaces: libvimpart0, libvimpart-dev
Conflicts: libvimpart0, libvimpart-dev
Provides: libvimpart0, libvimpart-dev
@@ -213,9 +213,9 @@
Applications that can make use of the Vim part include KDevelop,
Konqueror and KWrite.
.
- Note that this component requires a graphical version of Vim (such as KVim
- or GVim) to be installed separately. The Vim component may also need
- to be configured before use - this can be done in the KDE Components
- section of the KDE Control Centre.
+ Note that this component requires a graphical version of Vim (such as
+ GVim) to be installed separately. The Vim component may also need to be
+ configured before use - this can be done in the KDE Components section of
+ the KDE Control Centre.
.
This package is part of the KDE add-ons module.
--- trunk/KDE/kdeaddons/debian/rules #414019:414020
@@ -119,9 +119,9 @@
$(MAKE) distclean; \
fi
- if test -d CVS; then \
- $(MAKE) -f admin/Makefile.common cvs-clean ;\
- fi
+ # if test -d CVS; then \
+ # $(MAKE) -f admin/Makefile.common cvs-clean ;\
+ # fi
dh_clean
--- trunk/KDE/kdeaddons/debian/vimpart.README.Debian #414019:414020
@@ -10,7 +10,11 @@
Note that the vimpart package does not provide Vim itself - you will
need a separate graphical Vim installation for the component to hook into
(this is the /usr/bin/vim that you provide during the configuration
-described above). For example, any of the kvim, vim-gtk or vim-gnome
-packages will be suitable.
+described above). For example, either of the vim-gtk or vim-gnome
+packages would be suitable.
- -- Ben Burton <bab@debian.org>, Sat, 13 Mar 2004 09:58:54 +1100
+If you change your graphical Vim installation (such as from kvim to
+vim-gtk), you may need to reconfigure the Vim component in the KDE
+Control Centre.
+
+ -- Ben Burton <bab@debian.org>, Mon, 25 Apr 2005 23:08:18 +1000
Reply to: