[Pkg-kde-talk] svn merging to trunk (initially: svn merging hell)
Adeodato Simó
asp16@alu.ua.es
Thu, 6 Jan 2005 15:20:52 +0100
--T4sUOijqQbZv57TR
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Hi all,
now that (it seems) all 3.3.1 uploads are done, it may be time to get
3.3.2 packaging back in /trunk (instead of /branches/kde-3.3.2).
I made the stupid mistake of reversing the branch point: the right
thing to do would have been creating /branches/kde-3.3.1, and make the
big changes in the trunk (so that one has only to merge back the small
updates in the 3.3.1 packages); instead, I branched backwards, and
merging back to trunk all the 3.3.2 packaging will be (I *believe*) a
pain.
* * *
heh, that was my initial mail. I actually sat down and try to
merge, and is quite straightforward (yet having branched properly
would have been better, of course).
so, I have done (but not commited yet):
$ cd pkg-kde/svn/trunk/packages
$ svn merge -r 302:HEAD ../../branches/kde-3.3.2/ .
Check that the output of:
`diff -r -x .svn ../../branches/kde-3.3.2/ .`
is roughly equivalent to that of:
`svn diff -r 302:HEAD svn+ssh://svn.debian.org/svn/pkg-kde/trunk`
Have a look at the output of `svn st | sort`. Do `svn st | grep ^C`
and manually edit the files:
C kdelibs/debian/changelog
C kdelibs/debian/control
C kdebase/debian/changelog
C kdegraphics/debian/control
C kdegraphics/debian/changelog
After editing and merging those, the result of
`diff -r branches/kde-3.3.2 trunk/packages`
is in the attached kde-3.3.2-merge.diff file.
So, I have all this uncommited, waiting from comments. I merged
changelog entries in version order; I would have liked to use
upload-order, but that would break dpkg-genchanges.
--
Adeodato Simó
EM: asp16 [ykwim] alu.ua.es | PK: DA6AE621
I don't want to achieve immortality through my work. I want to achieve
immortality throguh not dying.
-- Woody Allen
--T4sUOijqQbZv57TR
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: attachment; filename="kde-3.3.2-merge.diff"
Content-Transfer-Encoding: 8bit
diff -u -r -x .svn branches/kde-3.3.2/kdebase/debian/changelog trunk/packages/kdebase/debian/changelog
--- branches/kde-3.3.2/kdebase/debian/changelog 2004-12-22 01:33:29.000000000 +0100
+++ trunk/packages/kdebase/debian/changelog 2005-01-06 15:01:56.000000000 +0100
@@ -1,8 +1,10 @@
kdebase (next upload) experimental; urgency=low
+ +++ Changes by Christopher Martin:
+
* Fixed typo in kdebase-bin description. (Closes: #286587)
- -- Christopher Martin <chrsmrtn@freeshell.org> Date
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Date
kdebase (4:3.3.2-0pre1) experimental; urgency=low
@@ -39,6 +41,22 @@
-- Christopher Martin <chrsmrtn@freeshell.org> Sat, 18 Dec 2004 14:54:58 -0500
+kdebase (4:3.3.1-4) unstable; urgency=high
+
+ +++ Changes by Adeodato Simó:
+
+ * High urgency upload to fix security vulnerability in sarge.
+
+ * Include patch to fix CAN-2004-1158, "Konqueror Window Injection
+ Vulnerability". (Closes: #286516)
+
+ * Include small patch from Christoffer Sawicki to ignore /sys and /.dev and
+ not report them as hard disks in Konqueror. (Closes: #287424)
+
+ * Included Dutch po-debconf translation by Luk Claes. (Closes: #283971)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 5 Jan 2005 17:11:03 +0100
+
kdebase (4:3.3.1-3) unstable; urgency=medium
* Include patch to fix CAN-2004-1171 ("plain text password exposure").
Only in trunk/packages/kdebase/debian/patches: 11_CAN-2004-1158.diff
Only in trunk/packages/kdebase/debian/patches: 12_ignore-sys-and-.dev.diff
Only in trunk/packages/kdebase/debian/po: nl.po
diff -u -r -x .svn branches/kde-3.3.2/kdegraphics/debian/changelog trunk/packages/kdegraphics/debian/changelog
--- branches/kde-3.3.2/kdegraphics/debian/changelog 2004-12-30 16:08:03.000000000 +0100
+++ trunk/packages/kdegraphics/debian/changelog 2005-01-06 15:07:06.000000000 +0100
@@ -1,15 +1,12 @@
-kdegraphics (4:3.3.2-0pre2) experimental; urgency=high
+kdegraphics (next upload) experimental; urgency=low
- * Upload to fix security vulnerability "kpdf Buffer Overflow Vulnerability".
- As per CAN-2004-1125, the xpdf codebase contains a buffer overflow that
- can be triggered by a specially crafted PDF file, and remotely supplied
- pdf files could be used to execute arbitrary code on the client machine.
+ +++ Changes by Adeodato Simó:
* Update package description for several packages, provided by Jesús
Roncero, thanks! These are: kolourpaint, kgamma, kooka, kpovmodeler,
kuickshow. (Closes: #286891, #286892, #286893, #286894, #286895, #286881)
- -- Adeodato Simó <asp16@alu.ua.es> Thu, 23 Dec 2004 08:17:32 +0100
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Date
kdegraphics (4:3.3.2-0pre1) experimental; urgency=low
@@ -39,6 +36,15 @@
-- Christopher Martin <chrsmrtn@freeshell.org> Sun, 19 Dec 2004 20:14:10 -0500
+kdegraphics (4:3.3.1-2) unstable; urgency=high
+
+ * Upload to fix security vulnerability "kpdf Buffer Overflow Vulnerability".
+ As per CAN-2004-1125, the xpdf codebase contains a buffer overflow that
+ can be triggered by a specially crafted PDF file, and remotely supplied
+ pdf files could be used to execute arbitrary code on the client machine.
+
+ -- Adeodato Simó <asp16@alu.ua.es> Thu, 23 Dec 2004 08:35:23 +0100
+
kdegraphics (4:3.3.1-1) unstable; urgency=low
* New upstream release.
diff -u -r -x .svn branches/kde-3.3.2/kdelibs/debian/changelog trunk/packages/kdelibs/debian/changelog
--- branches/kde-3.3.2/kdelibs/debian/changelog 2004-12-18 19:28:13.000000000 +0100
+++ trunk/packages/kdelibs/debian/changelog 2005-01-06 15:03:20.000000000 +0100
@@ -38,6 +38,15 @@
-- Adeodato Simó <asp16@alu.ua.es> Fri, 17 Dec 2004 01:30:13 +0100
+kdelibs (4:3.3.1-4) unstable; urgency=high
+
+ * The "from kde maintainers to m68k porters with love" release.
+ * Move the Conflicts with (<< 3.3.0) packages from kdelibs (dummy package)
+ to kdelibs4 (real package). They were put in the wrong package due to a
+ wrong assumption on how the testing scripts work.
+
+ -- Riku Voipio <riku.voipio@iki.fi> Sun, 19 Dec 2004 16:45:39 +0000
+
kdelibs (4:3.3.1-3) unstable; urgency=high
* Fix kdeaccessability Conflict. Closes: #285391
diff -u -r -x .svn branches/kde-3.3.2/kdelibs/debian/control trunk/packages/kdelibs/debian/control
--- branches/kde-3.3.2/kdelibs/debian/control 2004-12-18 04:53:36.000000000 +0100
+++ trunk/packages/kdelibs/debian/control 2005-01-06 14:56:32.000000000 +0100
@@ -2,7 +2,7 @@
Section: libs
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-Uploaders: Christopher L Cheney <ccheney@debian.org>, Adeodato Simó <asp16@alu.ua.es>, Christopher Martin <chrsmrtn@freeshell.org>
+Uploaders: Christopher L Cheney <ccheney@debian.org>, Adeodato Simó <asp16@alu.ua.es>, Christopher Martin <chrsmrtn@freeshell.org>, Riku Voipio <riku.voipio@iki.fi>
Build-Depends: debhelper (>> 4.2.0), docbook-to-man, gawk, gettext, libart-2.0-dev, libarts1-dev (>> 1.3.0), libaspell-dev, libbz2-dev, libcupsys2-dev, libdb4.2-dev, libfam-dev, libidn11-dev, libjasper-1.701-dev, libldap2-dev, libopenexr-dev (>= 1.2.1), libpam0g-dev, libpcre3-dev, libsasl2-dev, libssl-dev, libtiff4-dev, libxml2-dev, libxml2-utils, libxrender-dev, libxslt1-dev, qt3-doc, sharutils, texinfo, xlibmesa-glu-dev
Build-Depends-Indep: doxygen, qt3-doc
Standards-Version: 3.6.1
@@ -11,7 +11,6 @@
Section: kde
Architecture: all
Depends: kdelibs4 (>= ${Source-Version}), kdelibs-bin (>= ${Source-Version}), kdelibs-data (>= ${Source-Version})
-Conflicts: kdeaccessibility (<< 3.3.0), kdeaddons (<< 4:3.3.0), kdeadmin (<< 4:3.3.0), kdeartwork (<< 4:3.3.0), kdebase (<< 4:3.3.0), kdebindings (<< 4:3.3.0), kdeedu (<< 4:3.3.0), kdegames (<< 4:3.3.0), kdegraphics (<< 4:3.3.0), kde-i18n (<< 4:3.3.0), kdemultimedia (<< 4:3.3.0), kdenetwork (<< 4:3.3.0), kdepim (<< 4:3.3.0), kdesdk (<< 4:3.3.0), kdetoys (<< 4:3.3.0), kdeutils (<< 4:3.3.0), kdewebdev (<< 1:3.3.0)
Description: KDE core libraries metapackage
KDE is a powerful Open Source graphical desktop environment
for Unix workstations. It combines ease of use, contemporary
@@ -58,7 +57,7 @@
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, kdelibs-bin (= ${Source-Version}), kdelibs-data (>= 4:3.3.0), xbase-clients
-Conflicts: kdelibs3 (<< 4:3.0.0), kdepim-libs (<< 4:3.0.0), kdetrayproxy (>= 0.2-1), libkmid (<< 4:3.0.0), libkmid-alsa (<< 4:3.0.0)
+Conflicts: kdelibs3 (<< 4:3.0.0), kdepim-libs (<< 4:3.0.0), kdetrayproxy (>= 0.2-1), libkmid (<< 4:3.0.0), libkmid-alsa (<< 4:3.0.0), kdeaccessibility (<< 3.3.0), kdeaddons (<< 4:3.3.0), kdeadmin (<< 4:3.3.0), kdeartwork (<< 4:3.3.0), kdebase (<< 4:3.3.0), kdebindings (<< 4:3.3.0), kdeedu (<< 4:3.3.0), kdegames (<< 4:3.3.0), kdegraphics (<< 4:3.3.0), kde-i18n (<< 4:3.3.0), kdemultimedia (<< 4:3.3.0), kdenetwork (<< 4:3.3.0), kdepim (<< 4:3.3.0), kdesdk (<< 4:3.3.0), kdetoys (<< 4:3.3.0), kdeutils (<< 4:3.3.0), kdewebdev (<< 1:3.3.0)
Replaces: kdelibs3 (<< 4:3.0.0), kdepim-libs (<< 4:3.0.0), kdetrayproxy (>= 0.2-1), korganizer (<< 4:3.3.0), libkmid (<< 4:3.0.0), libkmid-alsa (<< 4:3.0.0)
Description: KDE core libraries
KDE is a powerful Open Source graphical desktop environment
--T4sUOijqQbZv57TR--