[COMMIT LOGREPORT] package/debian TODO,1.43,1.44 changelog,1.115,1.116 lire.config,1.3,1.4 lire.postinst,1.3,1.4 templates,1.39,1.40

[Joost van Baal]

Update of /cvsroot/logreport/package/debian
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv9216

Modified Files:
	TODO changelog lire.config lire.postinst templates 
Log Message:
debconf upgradingvariables upgrading_to_15 upgrating_to_20 are gone

Index: TODO
===================================================================
RCS file: /cvsroot/logreport/package/debian/TODO,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- TODO	22 Jul 2006 12:59:50 -0000	1.43
+++ TODO	22 Jul 2006 14:27:32 -0000	1.44
@@ -16,6 +16,10 @@
     non-google urls
   * test wether cups-bug is really fixed.
 
+don't support upgrading from version < 2.0.1-4 (the version in sarge).
+upgrading from 20020214-7 as shipped with woody (oldstable) is not supported.
+  See also #334996
+
 older stuff
 ===========
 

Index: changelog
===================================================================
RCS file: /cvsroot/logreport/package/debian/changelog,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- changelog	22 Jul 2006 12:59:50 -0000	1.115
+++ changelog	22 Jul 2006 14:27:32 -0000	1.116
@@ -16,6 +16,10 @@
     adhere to FHS: architecture-independent files belong in /usr/share.
   * debian/lire.preinst: Fix deprecated chown(1) usage.
   * debian/apache2.cfg: added.  Thanks Vincent Danjean. (Closes: #360957).
+  * debian/{lire.config,lire.postinst,templates}: drop support for upgrades
+    from versions < 2.0: Debian 3.1 "Sarge", shipped june 2005, comes with
+    2.0.1-4.  We've removed buggy (thanks Andrew Pollock for pointing this
+    out) code which dealt with this, which (Closes: #334996).
   * debian/templates: Fix 2 language bugs.  Thanks Clytie Siddall.
     (Closes: #312505).
   * debian/po/sv.po: Added Swedish translation, thanks to Daniel Nylander

Index: lire.config
===================================================================
RCS file: /cvsroot/logreport/package/debian/lire.config,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lire.config	7 Sep 2004 21:26:23 -0000	1.3
+++ lire.config	22 Jul 2006 14:27:32 -0000	1.4
@@ -93,24 +93,8 @@
 db_input high lire/purge_user_files || true
 db_go || true
 
-# check if we might have a <= 20020214 lire config file
-# could run something like dpkg --compare-versions on $2 here, btw)
-if test -f /etc/lire/defaults.local
-then
-    if egrep -q ^KEEP\|^FROM\|^DISCLAIMERFILE\|^LOGGING\|^DEBUG\|^DEFAULT_OUTPUT_FORMAT\|^INCLUDEIMAGES\|^ARCHIVE /etc/lire/defaults.local
-    then
-        db_input high lire/upgradingvariables || true
-    fi
-fi
-
 # tell the user to do manual configuration
 db_input high lire/config || true
 db_go || true
 
-db_input high lire/upgrading_to_15 || true
-db_go || true
-
-db_input high lire/upgrading_to_20 || true
-db_go || true
-
 exit 0

Index: lire.postinst
===================================================================
RCS file: /cvsroot/logreport/package/debian/lire.postinst,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lire.postinst	16 Nov 2003 03:11:34 -0000	1.3
+++ lire.postinst	22 Jul 2006 14:27:32 -0000	1.4
@@ -43,7 +43,7 @@
             leftuser leftgroup \
             usingexistinguser usingexistinggroup \
             wronguser wronggroup \
-            lire_user_not_lire
+            lire_user_not_lire upgradingvariables upgrading_to_15 upgrating_to_20
           do
           db_unregister "lire/$value" || true
         done

Index: templates
===================================================================
RCS file: /cvsroot/logreport/package/debian/templates,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- templates	20 Jul 2006 14:17:32 -0000	1.39
+++ templates	22 Jul 2006 14:27:32 -0000	1.40
@@ -67,33 +67,3 @@
  .
  Refer to /usr/share/doc/lire/README.Debian for details.
 
-Template: lire/upgradingvariables
-Type: note
-_Description: Your Lire configuration files are probably deprecated
- Since version 20020415, Lire uses new configuration variables.  Your local
- Lire configuration file /etc/lire/defaults.local contains the now obsolete
- names for these variables.  You'll have to update your configuration file
- manually.
- .
- Refer to /usr/share/doc/lire/README.Debian for details.
-
-Template: lire/upgrading_to_15
-Type: note
-_Description: Upgrading from a release prior to Lire 1.5
- If you are upgrading from a release prior to Lire 1.5 and if you have
- cronjobs configured to be run through the "lr_cron" command, make sure you
- edit your crontabs to reflect the new syntax of the "lr_cron" invocation.
- .
- Refer to /usr/share/doc/lire/INSTALL for details.
-
-Template: lire/upgrating_to_20
-Type: note
-_Description: Upgrading to Lire 2.0
- Many things have changed since Lire 1.5 and previous releases. You are
- encouraged to read carefully the NEWS and INSTALL files located in
- /usr/share/doc/lire/.
- .
- Besides, a couple of dependencies were removed after the huge code cleanup
- that occurred in the last months. You might therefore have a look at the
- Changelog.Debian files as well to clean your system from packages that are no
- longer needed.

-- 
To UNSUBSCRIBE, email to commit-request at logreport.org with a subject of 
"unsubscribe". Trouble? Send an email with subject "help" to 
commit-request at logreport.org