[Debtags-commits] [svn] r1026 - in debtags/trunk: debian src

[Enrico Zini]

Author: enrico
Date: Sun Jul 31 13:36:27 2005
New Revision: 1026

Modified:
   debtags/trunk/debian/changelog
   debtags/trunk/debian/control
   debtags/trunk/debian/dirs
   debtags/trunk/debian/postinst
   debtags/trunk/src/debtags.cc
Log:
Preseed download dir in postinst if it's empty
Depend on new libdebtags1
Create DebtagsSimple in update mode when doing tag add/rm


Modified: debtags/trunk/debian/changelog
==============================================================================
--- debtags/trunk/debian/changelog	(original)
+++ debtags/trunk/debian/changelog	Sun Jul 31 13:36:27 2005
@@ -1,3 +1,13 @@
+debtags (1.2) unstable; urgency=low
+
+  * Updated bash-completion
+  * Preseed /var/cache/debtags in postinst before first upload, so that
+    installation works on networkless machines
+  * Initialize libdebtags1 in update mode when doing tag add or tag rm.
+    Closes: #319655.
+
+ -- Enrico Zini <enrico at debian.org>  Sun, 31 Jul 2005 15:34:37 +0200
+
 debtags (1.1) unstable; urgency=low
 
   * Upload to unstable

Modified: debtags/trunk/debian/control
==============================================================================
--- debtags/trunk/debian/control	(original)
+++ debtags/trunk/debian/control	Sun Jul 31 13:36:27 2005
@@ -2,7 +2,7 @@
 Section: admin
 Priority: optional
 Maintainer: Enrico Zini <enrico at debian.org>
-Build-Depends: cdbs, debhelper (>> 4.1), dh-buildinfo, pkg-config, apt, libdebtags1-dev (>= 1.0.3), libdebtags1-dev (<< 1.1)
+Build-Depends: cdbs, debhelper (>> 4.1), dh-buildinfo, pkg-config, apt, libdebtags1-dev (>= 1.0.7), libdebtags1-dev (<< 1.1)
 Standards-Version: 3.6.2.0
 
 Package: debtags

Modified: debtags/trunk/debian/dirs
==============================================================================
--- debtags/trunk/debian/dirs	(original)
+++ debtags/trunk/debian/dirs	Sun Jul 31 13:36:27 2005
@@ -1,5 +1,6 @@
 usr/bin
 var/cache/debtags
+var/cache/debtags/partial
 var/lib/debtags
 etc/debtags/tagpatch.d
 etc/debtags/tagvoc.d

Modified: debtags/trunk/debian/postinst
==============================================================================
--- debtags/trunk/debian/postinst	(original)
+++ debtags/trunk/debian/postinst	Sun Jul 31 13:36:27 2005
@@ -2,6 +2,23 @@
 
 #set +C # turn off noclobber
 
+CACHEDTAGS='/var/cache/debtags/people.debian.org_%7eenrico_tags_tags-current.gz'
+CACHEDVOC='/var/cache/debtags/people.debian.org_%7eenrico_tags_vocabulary.gz'
+
+# Use the shipped tags and vocabulary to preseed the download cache
+# This allows debtags to be installed on networkless systems, and to be
+# upgraded cleanly afterwards
+
+if [ ! -e "$CACHEDTAGS" ]
+then
+	cp /usr/share/debtags/tags-current.gz "$CACHEDTAGS"
+fi
+
+if [ ! -e "$CACHEDVOC" ]
+then
+	cat /usr/share/debtags/vocabulary | gzip > "$CACHEDVOC"
+fi
+
 debtags update
 
 #DEBHELPER#

Modified: debtags/trunk/src/debtags.cc
==============================================================================
--- debtags/trunk/src/debtags.cc	(original)
+++ debtags/trunk/src/debtags.cc	Sun Jul 31 13:36:27 2005
@@ -1436,13 +1436,13 @@
 			{
 				using namespace Debtags;
 
-				DebtagsSimple<Package> debtags(false);
-				wantTagDatabase(debtags);
-
 				std::string cmd = args.next();
 
 				if (cmd == "add" || cmd == "rm")
 				{
+					DebtagsSimple<Package> debtags(true);
+					wantTagDatabase(debtags);
+
 					string name = args.next();
 
 					Package pkg = debtags.serializer().stringToItem(name);
@@ -1478,6 +1478,9 @@
 				}
 				else if (cmd == "ls")
 				{
+					DebtagsSimple<Package> debtags(false);
+					wantTagDatabase(debtags);
+
 					string name = args.next();
 					Package pkg = debtags.serializer().stringToItem(name);
 					if (pkg)