[Pkg-kde-commits] rev 2453 - in branches/kde-3.4.0/packages/kdeadmin/debian: . patches

[Luk Claes]

Author: luk
Date: 2005-11-30 17:05:10 +0000 (Wed, 30 Nov 2005)
New Revision: 2453

Added:
   branches/kde-3.4.0/packages/kdeadmin/debian/patches/01_kdeadmin_branch_r484392.diff
Modified:
   branches/kde-3.4.0/packages/kdeadmin/debian/changelog
Log:
bran update, upload 3.4.3-2 to unstable


Modified: branches/kde-3.4.0/packages/kdeadmin/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdeadmin/debian/changelog	2005-11-30 17:02:23 UTC (rev 2452)
+++ branches/kde-3.4.0/packages/kdeadmin/debian/changelog	2005-11-30 17:05:10 UTC (rev 2453)
@@ -1,9 +1,11 @@
-kdeadmin (4:3.4.3-2) UNRELEASED; urgency=low
+kdeadmin (4:3.4.3-2) unstable; urgency=low
 
   * Upload to unstable, rebuilding against kdelibs4c2a.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Date
+  * KDE_3_4_BRANCH update (up to r484392).
 
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 30 Nov 2005 18:01:38 +0100
+
 kdeadmin (4:3.4.3-1) experimental; urgency=low
 
   * New upstream release.

Added: branches/kde-3.4.0/packages/kdeadmin/debian/patches/01_kdeadmin_branch_r484392.diff
===================================================================
--- branches/kde-3.4.0/packages/kdeadmin/debian/patches/01_kdeadmin_branch_r484392.diff	2005-11-30 17:02:23 UTC (rev 2452)
+++ branches/kde-3.4.0/packages/kdeadmin/debian/patches/01_kdeadmin_branch_r484392.diff	2005-11-30 17:05:10 UTC (rev 2453)
@@ -0,0 +1,50 @@
+#DPATCHLEVEL=0
+--- kpackage/fbsdInterface.cpp	(.../tags/KDE/3.4.3/kdeadmin)	(revision 484392)
++++ kpackage/fbsdInterface.cpp	(.../branches/KDE/3.4/kdeadmin)	(revision 484392)
+@@ -60,15 +60,15 @@
+   updated_pict = UserIcon("bupdated");
+   new_pict = UserIcon("bnew");
+ 
+-  packagePattern = "*.tgz";
+-  typeID = "/tgz";
++  packagePattern = "*.tgz *.tbz";
++  typeID = "/tbz";
+ 
+   queryMsg = i18n("Querying package list: ");
+ 
+   locatedialog = new Locations(i18n("Location of BSD Packages and Ports"));
+-  locatedialog->dLocations(1, 1, this, i18n("Ports"), "Pkg", "*.tgz",
++  locatedialog->dLocations(1, 1, this, i18n("Ports"), "Pkg", "*.tbz",
+                            i18n("Location of Ports Tree (e.g. /usr/ports or /usr/opt)"),FALSE);
+-  locatedialog->dLocations(1, 6, this, i18n("Packages"), "Pkg", "*.tgz",
++  locatedialog->dLocations(1, 6, this, i18n("Packages"), "Pkg", "*.tbz",
+                            i18n("Location of Folders Containing BSD Packages or Package Trees"));
+   connect(locatedialog, SIGNAL(returnVal(LcacheObj *)), this, SLOT(setAvail(LcacheObj *)));
+   locatedialog->apply_slot();
+@@ -89,7 +89,7 @@
+ }
+ 
+ bool fbsdInterface::isType(char *, const QString &fname) {
+-  // These files are .tgz files. Pass it to pkg_info and see whether it
++  // These files are .tgz and .tbz files. Pass it to pkg_info and see whether it
+   // succeeds.
+   reader.setup(PKG_INFO_BIN);
+   *reader.proc << fname;
+@@ -685,7 +685,7 @@
+       (*scan)->bin = (*scan)->bin || bin;
+       (*scan)->port = (*scan)->port || port;
+       if (binaries) {
+-	(*scan)->bin_filename = QString(name) + ".tgz";
++	(*scan)->bin_filename = QString(name) + ".tbz";
+ 	(*scan)->bin_filename_base = dname + "/";
+        }
+       name = 0; // Acts as a 'not used' tag.
+@@ -693,7 +693,7 @@
+     }
+ 
+     if (binaries) {
+-      bin_filename = QString(name) + ".tgz";
++      bin_filename = QString(name) + ".tbz";
+       bin_filename_base = dname + "/";
+      }
+