[Debtags-commits] [svn] r2033 - in debtags-edit/1.2: . debian src

[Enrico Zini]

Author: enrico
Date: Mon Oct 30 21:38:36 2006
New Revision: 2033

Modified:
   debtags-edit/1.2/   (props changed)
   debtags-edit/1.2/configure.ac
   debtags-edit/1.2/debian/changelog
   debtags-edit/1.2/debian/control
   debtags-edit/1.2/src/DebtagsDocument.cc
   debtags-edit/1.2/src/DebtagsDocument.h
   debtags-edit/1.2/src/DebtagsEditor.cc
   debtags-edit/1.2/src/PatchReview.cc
Log:
 r3570 at viaza:  enrico | 2006-10-30 21:38:12 +0100
 Ported to new libept


Modified: debtags-edit/1.2/configure.ac
==============================================================================
--- debtags-edit/1.2/configure.ac	(original)
+++ debtags-edit/1.2/configure.ac	Mon Oct 30 21:38:36 2006
@@ -21,7 +21,8 @@
 dnl AC_PROG_RANLIB
 dnl AM_PROG_LIBTOOL
 
-LIBTAGCOLL_DEFS
+LIBWIBBLE_DEFS
+LIBTAGCOLL2_DEFS
 LIBEPT_DEFS
 
 PKG_CHECK_MODULES([GTKMM], [sigc++-2.0 >= 2.0 gtkmm-2.4 >= 2.4.0])AC_SUBST([GTKMM_CFLAGS])
@@ -52,7 +53,7 @@
 dnl AC_PATH_PROG(PERL, "perl")
 dnl AC_SUBST(PERL)
 
-CXXFLAGS="$CXXFLAGS -Wall"
+CXXFLAGS="-Wall -gstabs+ $CXXFLAGS"
 
 AC_CONFIG_FILES([
 Makefile

Modified: debtags-edit/1.2/debian/changelog
==============================================================================
--- debtags-edit/1.2/debian/changelog	(original)
+++ debtags-edit/1.2/debian/changelog	Mon Oct 30 21:38:36 2006
@@ -1,3 +1,9 @@
+debtags-edit (1.1.4) unstable; urgency=low
+
+  * Ported to libept.  Closes: bug#356001, bug#391575.
+
+ -- Enrico Zini <enrico at debian.org>  Mon, 30 Oct 2006 20:23:41 +0100
+
 debtags-edit (1.1.3) unstable; urgency=low
 
   * Ported to new libapt-front.

Modified: debtags-edit/1.2/debian/control
==============================================================================
--- debtags-edit/1.2/debian/control	(original)
+++ debtags-edit/1.2/debian/control	Mon Oct 30 21:38:36 2006
@@ -2,7 +2,7 @@
 Section: misc
 Priority: optional
 Maintainer: Enrico Zini <enrico at debian.org>
-Build-Depends: cdbs, debhelper (>= 4.1), dh-buildinfo, pkg-config, libept-dev (>= 0.4), libept-dev (<< 0.4.1), libgtkmm-2.4-dev
+Build-Depends: cdbs, debhelper (>= 4.1), dh-buildinfo, pkg-config, libwibble-dev (>= 0.1.9), libwibble-dev (<< 0.2), libtagcoll2-dev (>= 2.0.3), libtagcoll2-dev (<< 2.1), libept-dev (>= 0.4.5), libept-dev (<< 0.4.1), libgtkmm-2.4-dev
 Standards-Version: 3.6.2.0
 
 Package: debtags-edit

Modified: debtags-edit/1.2/src/DebtagsDocument.cc
==============================================================================
--- debtags-edit/1.2/src/DebtagsDocument.cc	(original)
+++ debtags-edit/1.2/src/DebtagsDocument.cc	Mon Oct 30 21:38:36 2006
@@ -204,8 +204,8 @@
 
 bool DebtagsDocument::canReapply(const Package& pkg) const
 {
-	return _lastPatch.getItem() != Package() &&
-		   _lastPatch.getItem() != pkg;
+	return _lastPatch.item != Package() &&
+		   _lastPatch.item != pkg;
 }
 
 void DebtagsDocument::undo()
@@ -249,8 +249,8 @@
 	// Build the new patch
 	tagcoll::Patch<Package, Tag> newPatch(
 			pkg,
-			_lastPatch.getAdded(),
-			_lastPatch.getRemoved());
+			_lastPatch.added,
+			_lastPatch.removed);
 
 	applyChange(newPatch);
 }

Modified: debtags-edit/1.2/src/DebtagsDocument.h
==============================================================================
--- debtags-edit/1.2/src/DebtagsDocument.h	(original)
+++ debtags-edit/1.2/src/DebtagsDocument.h	Mon Oct 30 21:38:36 2006
@@ -29,7 +29,7 @@
 #include <ept/cache/debtags/tagmap.h>
 #include <ept/cache/debtags/vocabulary.h>
 
-#include <tagcoll/Patches.h>
+#include <tagcoll/patch.h>
 #include <tagcoll/coll/fast.h>
 #if 0
 #include <ept/cache/entity/package.h>

Modified: debtags-edit/1.2/src/DebtagsEditor.cc
==============================================================================
--- debtags-edit/1.2/src/DebtagsEditor.cc	(original)
+++ debtags-edit/1.2/src/DebtagsEditor.cc	Mon Oct 30 21:38:36 2006
@@ -20,7 +20,7 @@
 
 #include "DebtagsEditor.h"
 
-#include <tagcoll/Patches.h>
+#include <tagcoll/patch.h>
 #include "Environment.h"
 #include "DebtagsDocument.h"
 

Modified: debtags-edit/1.2/src/PatchReview.cc
==============================================================================
--- debtags-edit/1.2/src/PatchReview.cc	(original)
+++ debtags-edit/1.2/src/PatchReview.cc	Mon Oct 30 21:38:36 2006
@@ -21,7 +21,7 @@
 #include "PatchReview.h"
 
 #include "DebtagsDocument.h"
-#include <tagcoll/Patches.h>
+#include <tagcoll/patch.h>
 #include <gtkmm/frame.h>
 #include <gtkmm/paned.h>
 
@@ -307,8 +307,8 @@
 			row = *(patchListModel->append());
 			row[patchListModelColumns.pkg] = i->first;
 			row[patchListModelColumns.name] = i->first.name();
-			const std::set<Tag>& added = i->second.getAdded();
-			const std::set<Tag>& removed = i->second.getRemoved();
+			const std::set<Tag>& added = i->second.added;
+			const std::set<Tag>& removed = i->second.removed;
 			string p;
 			for (typename std::set<Tag>::const_iterator j = added.begin(); j != added.end(); j++)
 				if (p.empty())
@@ -347,8 +347,8 @@
 			descrBuf->set_text("Unable to access package informations");
 		}
 
-		const std::set<Tag>& added = p->second.getAdded();
-		const std::set<Tag>& removed = p->second.getRemoved();
+		const std::set<Tag>& added = p->second.added;
+		const std::set<Tag>& removed = p->second.removed;
 
 		for (typename std::set<Tag>::const_iterator i = added.begin();
 				i != added.end(); i++)