Permission request for fake-NMU upload of crossvc
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi,
I would like to ask for permission to do a "fake NMU" upload
of crossvc to testing-proposed-updates. The reason is that I
once uploaded version 1.5.0-1 which uses debconf to display
an upgrade hint, but since this caused a lot of trouble I then
uploaded 1.5.0-2 which replaced the debconf message with an application
supplied upgrade mechanism. However, meanwhile etch was frozen so that
the new package never made it into testing (I do feel guilty for that ;)
I meanwhile learned that I should simply have asked for letting it in...)
Anyway, there is already a new upstream version in unstable, so that
1.5.0-2 effectively does not exist anymore in the archives. My sponsor
told me (see below) that the proper way would be to re-upload 1.5.0-2
with an NMU version number, and that I need to ask for permission on
debian-release which I herewith would like to do :)
The output of
$ debdiff crossvc_1.5.0-1/crossvc_1.5.0-1.dsc crossvc_1.5.0-1.1/crossvc_1.5.0-1.1.dsc
is attached.
Thanks,
Andreas
- -------- Original Message --------
Subject: Re: Intent to NMU crossvc in testing-proposed-updates to add more translations of debconf
templates
Date: Sat, 03 Mar 2007 16:06:15 +0100
From: Daniel Baumann <daniel@debian.org>
Reply-To: daniel@debian.org
Organization: Debian - The Universal Operating System
To: Andreas Fester <Andreas.Fester@gmx.de>
CC: Christian Perrier <bubulle@debian.org>
References: <20070303133258.GA7433@kheops.homeunix.org> <45E98D31.7050609@gmx.de>
Andreas Fester wrote:
> I dont know if it would still be possible to upload 1.5.0-2
> to testing-proposed-updates to get rid of the whole debconf
> issue, especially because there is 1.5.1-1 in unstable;
> Daniel, would this be possible somehow?
I'm not sure if 1.5.0-2 can't be re-uploaded since it was already used.
To be on the save bet, I would prepare a fake-NMU, means re-uploading
1.5.0-2 as 1.5.0-1.1.
In any case, you need to ask for permission to do so on -release with an
attached debdiff anyway first. Once you did this, I'll upload for you.
If you have any further questions, feel free to ask.
- --
Address: Daniel Baumann, Burgunderstrasse 3, CH-4562 Biberist
Email: daniel.baumann@panthera-systems.net
Internet: http://people.panthera-systems.net/~daniel-baumann/
- --
Andreas Fester
mailto:andreas@littletux.net
WWW: http://www.littletux.net
ICQ: 326674288
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFF6cyJZ3bQVzeW+rsRAoN0AKD0LdLghK99M8gND6gayCRGEiAnYwCgwDiG
SFPw9Q6OvXRJXtgkNCOFaHQ=
=cdeK
-----END PGP SIGNATURE-----
diff -u crossvc-1.5.0/debian/patches/10-config.dpatch crossvc-1.5.0/debian/patches/10-config.dpatch
--- crossvc-1.5.0/debian/patches/10-config.dpatch
+++ crossvc-1.5.0/debian/patches/10-config.dpatch
@@ -1,8 +1,7 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 10-config.dpatch by <Andreas Fester <Andreas.Fester@gmx.de>>
##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Various path and configuration adjustments for smooth Debian integration
@DPATCH@
diff -urNad crossvc-1.5.0~/config/config.cpp crossvc-1.5.0/config/config.cpp
diff -u crossvc-1.5.0/debian/patches/20-fam.dpatch crossvc-1.5.0/debian/patches/20-fam.dpatch
--- crossvc-1.5.0/debian/patches/20-fam.dpatch
+++ crossvc-1.5.0/debian/patches/20-fam.dpatch
@@ -1,8 +1,7 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 20-fam.dpatch by <Andreas Fester <Andreas.Fester@gmx.de>>
##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Fix path to the fam library
@DPATCH@
diff -urNad crossvc-1.5.0~/lincvs.pro crossvc-1.5.0/lincvs.pro
diff -u crossvc-1.5.0/debian/patches/00list crossvc-1.5.0/debian/patches/00list
--- crossvc-1.5.0/debian/patches/00list
+++ crossvc-1.5.0/debian/patches/00list
@@ -2,0 +3,2 @@
+30-lincvs-upgrade
+40-usage
reverted:
--- crossvc-1.5.0/debian/po/templates.pot
+++ crossvc-1.5.0.orig/debian/po/templates.pot
@@ -1,62 +0,0 @@
-#
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-#
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-# Developers do not need to manually edit POT or PO files.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: Andreas.Fester@gmx.de\n"
-"POT-Creation-Date: 2006-06-04 18:05+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: note
-#. Description
-#: ../lincvs.templates:3
-msgid "LinCVS configuration hint"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../lincvs.templates:3
-msgid ""
-"The package \"lincvs\" has been renamed to \"crossvc\" to reflect the "
-"changed upstream name of the application."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../lincvs.templates:3
-msgid ""
-"To continue using your old LinCVS configuration, perform the following steps:"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../lincvs.templates:3
-msgid ""
-" - Rename ~/.lincvs to ~/.crossvc\n"
-" - Rename ~/.qt/lincvsrc to ~/.qt/crossvcrc\n"
-" - Adjust existing desktop application links so that they\n"
-" point to /usr/bin/crossvc instead of /usr/bin/lincvs."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../lincvs.templates:3
-msgid "See also /usr/share/doc/crossvc/README.Debian."
-msgstr ""
reverted:
--- crossvc-1.5.0/debian/po/POTFILES.in
+++ crossvc-1.5.0.orig/debian/po/POTFILES.in
@@ -1 +0,0 @@
-[type: gettext/rfc822deb] lincvs.templates
reverted:
--- crossvc-1.5.0/debian/po/de.po
+++ crossvc-1.5.0.orig/debian/po/de.po
@@ -1,68 +0,0 @@
-# translation of de.po to German
-#
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans#
-# Developers do not need to manually edit POT or PO files.
-#
-# Andreas Fester <Andreas.Fester@gmx.de>, 2006.
-msgid ""
-msgstr ""
-"Project-Id-Version: crossvc 1.5.0\n"
-"Report-Msgid-Bugs-To: Andreas.Fester@gmx.de\n"
-"POT-Creation-Date: 2006-06-04 18:05+0200\n"
-"PO-Revision-Date: 2006-06-04 18:56+0200\n"
-"Last-Translator: Andreas Fester <Andreas.Fester@gmx.de>\n"
-"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.2\n"
-
-#. Type: note
-#. Description
-#: ../lincvs.templates:3
-msgid "LinCVS configuration hint"
-msgstr "LinCVS Konfigurations-Hinweis"
-
-#. Type: note
-#. Description
-#: ../lincvs.templates:3
-msgid ""
-"The package \"lincvs\" has been renamed to \"crossvc\" to reflect the "
-"changed upstream name of the application."
-msgstr ""
-"Da das Programm \"LinCVS\" in \"CrossVC\" umbenannt wurde, wurde "
-"auch der Name des Debian-Pakets entsprechend von \"lincvs\" in \"crossvc\" geändert."
-
-#. Type: note
-#. Description
-#: ../lincvs.templates:3
-msgid "To continue using your old LinCVS configuration, perform the following steps:"
-msgstr "Führen Sie die folgenden Schritte durch, um die alte LinCVS-Konfiguration weiter zu verwenden:"
-
-#. Type: note
-#. Description
-#: ../lincvs.templates:3
-msgid ""
-" - Rename ~/.lincvs to ~/.crossvc\n"
-" - Rename ~/.qt/lincvsrc to ~/.qt/crossvcrc\n"
-" - Adjust existing desktop application links so that they\n"
-" point to /usr/bin/crossvc instead of /usr/bin/lincvs."
-msgstr ""
-" - Benennen Sie ~/.lincvs in ~/.crossvc um\n"
-" - Benennen Sie ~/.qt/lincvsrc in ~/.qt/crossvcrc um\n"
-" - Passen Sie eventuell vorhandene Verknüpfungen auf dem Desktop an,\n"
-" so dass diese /usr/bin/crossvc statt /usr/bin/lincvs starten."
-
-#. Type: note
-#. Description
-#: ../lincvs.templates:3
-msgid "See also /usr/share/doc/crossvc/README.Debian."
-msgstr "Diese Information kann unter /usr/share/doc/crossvc/README.Debian nachgelesen werden."
-
reverted:
--- crossvc-1.5.0/debian/lincvs.config
+++ crossvc-1.5.0.orig/debian/lincvs.config
@@ -1,9 +0,0 @@
-#!/bin/sh -e
-
-# Source debconf library.
-. /usr/share/debconf/confmodule
-
-if [ "$1" = "configure" ] && dpkg --compare-versions "$2" lt "1.5.0"; then
- db_input high lincvs/info || true
-fi
-db_go
diff -u crossvc-1.5.0/debian/rules crossvc-1.5.0/debian/rules
--- crossvc-1.5.0/debian/rules
+++ crossvc-1.5.0/debian/rules
@@ -21,7 +21,7 @@
manpage: debian/crossvc.1
debian/crossvc.1: CrossVC/crossvc.bin
- help2man --no-info $< > $@
+ help2man -n "A graphical CVS frontend" --no-info $< > $@
configure: configure-stamp
configure-stamp: patch-stamp
@@ -81,7 +81,6 @@
dh_testdir
dh_testroot
- dh_installdebconf
dh_installdocs
dh_installexamples CrossVC/Tools/*.sh
dh_installmenu
reverted:
--- crossvc-1.5.0/debian/lincvs.postinst
+++ crossvc-1.5.0.orig/debian/lincvs.postinst
@@ -1,10 +0,0 @@
-#!/bin/sh -e
-
-#DEBHELPER#
-
-# Source debconf library.
-. /usr/share/debconf/confmodule
-
-if [ "$1" = "configure" ] && dpkg --compare-versions "$2" lt "1.5.0"; then
- db_get lincvs/info || true
-fi
reverted:
--- crossvc-1.5.0/debian/lincvs.templates
+++ crossvc-1.5.0.orig/debian/lincvs.templates
@@ -1,15 +0,0 @@
-Template: lincvs/info
-Type: note
-_Description: LinCVS configuration hint
- The package "lincvs" has been renamed to "crossvc" to
- reflect the changed upstream name of the application.
- .
- To continue using your old LinCVS configuration, perform
- the following steps:
- .
- - Rename ~/.lincvs to ~/.crossvc
- - Rename ~/.qt/lincvsrc to ~/.qt/crossvcrc
- - Adjust existing desktop application links so that they
- point to /usr/bin/crossvc instead of /usr/bin/lincvs.
- .
- See also /usr/share/doc/crossvc/README.Debian.
diff -u crossvc-1.5.0/debian/README.Debian crossvc-1.5.0/debian/README.Debian
--- crossvc-1.5.0/debian/README.Debian
+++ crossvc-1.5.0/debian/README.Debian
@@ -7,8 +7,13 @@
-To continue using your old LinCVS configuration, perform
-the following steps:
+When the Debian crossvc application is started for the
+first time, it automatically checks if old configuration
+files exist and renames them:
- - Rename ~/.lincvs to ~/.crossvc
- - Rename ~/.qt/lincvsrc to ~/.qt/crossvcrc
- - Adjust existing desktop application links so that they
- point to /usr/bin/crossvc instead of /usr/bin/lincvs.
+ - ~/.lincvs is renamed to ~/.crossvc
+ - ~/.qt/lincvsrc is renamed to ~/.qt/crossvcrc
+ - If an additional configuration search path is passed
+ with the "-r" parameter, an existing file "lincvsrc"
+ under this additional path is also renamed to "crossvcrc".
+
+It is still necessary to adjust existing desktop application links so
+that they point to /usr/bin/crossvc instead of /usr/bin/lincvs.
diff -u crossvc-1.5.0/debian/control crossvc-1.5.0/debian/control
--- crossvc-1.5.0/debian/control
+++ crossvc-1.5.0/debian/control
@@ -2,7 +2,7 @@
Section: non-free/devel
Priority: optional
Maintainer: Andreas Fester <Andreas.Fester@gmx.de>
-Build-Depends: debhelper (>> 4.1.16), dpatch, libqt3-compat-headers, libqt3-mt-dev (>> 3.3), libfam-dev, help2man, po-debconf
+Build-Depends: debhelper (>> 5.0.0), dpatch, libqt3-compat-headers, libqt3-mt-dev (>> 3.3), libfam-dev, help2man
Build-Conflicts: kdelibs-dev
Standards-Version: 3.7.2
diff -u crossvc-1.5.0/debian/changelog crossvc-1.5.0/debian/changelog
--- crossvc-1.5.0/debian/changelog
+++ crossvc-1.5.0/debian/changelog
@@ -1,3 +1,22 @@
+crossvc (1.5.0-1.1) testing-proposed-updates; urgency=low
+
+ * fake NMU: promote version which was earlier numbered 1.5.0-2
+ into etch to get rid of debconf messages
+ * debian/patches: Added descriptions
+ * debian/patches/30-lincvs-upgrade.dpatch, debian/patches/00list:
+ new patch for smooth upgrade from LinCVS
+ * debian/patches/40-usage.dpatch: Fix application name in --help and
+ --version output
+ * debian/lincvs.config, debian/lincvs.postinst, debian/lincvs.templates,
+ debian/po: Removed to avoid unnecessary debconf message (upgrade is now
+ handled by the application) (closes: #384412, #393535)
+ * debian/rules: removed dh_installdebconf
+ * debian/README.Debian: Adjusted description of upgrade mechanism
+ * debian/compat: upgraded debhelper compatibility level to 5
+ * debian/control: adjusted debhelper version dependency
+
+ -- Andreas Fester <Andreas.Fester@gmx.de> Sat, 3 Mar 2007 16:22:06 +0100
+
crossvc (1.5.0-1) unstable; urgency=low
* New upstream release.
diff -u crossvc-1.5.0/debian/compat crossvc-1.5.0/debian/compat
--- crossvc-1.5.0/debian/compat
+++ crossvc-1.5.0/debian/compat
@@ -1 +1 @@
-4
+5
only in patch2:
unchanged:
--- crossvc-1.5.0.orig/debian/patches/30-lincvs-upgrade.dpatch
+++ crossvc-1.5.0/debian/patches/30-lincvs-upgrade.dpatch
@@ -0,0 +1,88 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30-lincvs-upgrade.dpatch by <Andreas Fester <Andreas.Fester@gmx.de>>
+##
+## DP: Let CrossVC upgrade old LinCVS configuration when started
+## DP: for the first time
+
+@DPATCH@
+--- crossvc-1.5.0~/src/cvscontrol.cpp 2006-05-14 16:17:06.000000000 +0200
++++ crossvc-1.5.0/src/cvscontrol.cpp 2006-12-03 18:51:51.000000000 +0100
+@@ -112,6 +112,9 @@
+ CvsControl::CvsControl( QString startUpDir)
+ : CMainWindow(0, "LinCVS main window", WType_TopLevel | WDestructiveClose)
+ {
++ // check if any upgrade of LinCVS configuration files is necessary
++ checkLincvsUpgrade();
++
+ conf = 0;
+ KILLED = false;
+ createTmpDir();
+@@ -197,6 +200,57 @@
+
+ //----------------------------------------------------------------------------
+
++void CvsControl::checkLincvsUpgrade() {
++ bool firstStart = false;
++
++ // Check if directory $HOME/.crossvc or a crossvcrc configuration file
++ // already exists. If any of them exists, then this system seems to know
++ // about crossvc already; do not perform any upgrade procedure then!
++ QDir home = QDir::home();
++ QDir rc1Dir(home.path() + "/.qt");
++ QDir rc2Dir(Misc::g_rcPath);
++
++ QFileInfo tmpDir(home, ".crossvc");
++ qDebug(tmpDir.absFilePath().latin1()
++ + (tmpDir.exists() ? QString(": exists") : QString(": does not exist")));
++ if (!tmpDir.exists()) {
++ QFileInfo rc1(rc1Dir, "crossvcrc");
++ qDebug(rc1.absFilePath().latin1()
++ + (rc1.exists() ? QString(": exists") : QString(": does not exist")));
++ if (!rc1.exists()) {
++ if (!Misc::g_rcPath.isEmpty()) {
++ QFileInfo rc2(rc2Dir, "crossvcrc"); // check optional path
++ qDebug(rc2.absFilePath().latin1()
++ + (rc2.exists() ? QString(": exists") : QString(": does not exist")));
++ if (!rc2.exists()) {
++ firstStart = true;
++ }
++ } else {
++ firstStart = true;
++ }
++ }
++ }
++
++ // if CrossVC was started for the first time, then try to rename the old
++ // LinCVS configuration files
++ if (firstStart) {
++ qDebug("CrossVC seems to start the first time - try to upgrade old LinCVS configuration");
++
++ qDebug(" " + home.path() + "/.lincvs ==> " + home.path() + "/.crossvc");
++ home.rename(".lincvs", ".crossvc");
++
++ qDebug(" " + rc1Dir.path() + "/lincvsrc ==> " + rc1Dir.path() + "/crossvcrc");
++ rc1Dir.rename("lincvsrc", "crossvcrc");
++
++ if (!Misc::g_rcPath.isEmpty()) {
++ qDebug(" " + rc2Dir.path() + "/lincvsrc ==> " + rc2Dir.path() + "/crossvcrc");
++ rc2Dir.rename("lincvsrc", "crossvcrc");
++ }
++ }
++}
++
++//----------------------------------------------------------------------------
++
+ void CvsControl::readSettings() {
+
+ delete conf;
+--- crossvc-1.5.0~/src/cvscontrol.h 2006-05-14 16:17:06.000000000 +0200
++++ crossvc-1.5.0/src/cvscontrol.h 2006-12-03 15:12:03.000000000 +0100
+@@ -132,6 +132,8 @@
+
+ protected:
+
++ void checkLincvsUpgrade();
++
+ void readSettings();
+ void writeSettings();
+ void writeCfg();
only in patch2:
unchanged:
--- crossvc-1.5.0.orig/debian/patches/40-usage.dpatch
+++ crossvc-1.5.0/debian/patches/40-usage.dpatch
@@ -0,0 +1,36 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 40-usage.dpatch by <Andreas Fester <Andreas.Fester@gmx.de>>
+##
+## DP: Fix application name in --help output
+
+@DPATCH@
+diff -urNad crossvc-1.5.0~/src/main.cpp crossvc-1.5.0/src/main.cpp
+--- crossvc-1.5.0~/src/main.cpp 2006-12-05 21:46:46.000000000 +0100
++++ crossvc-1.5.0/src/main.cpp 2006-12-05 21:47:10.000000000 +0100
+@@ -177,7 +177,7 @@
+ STARTHELPCONSOLE;
+
+ std::cout << message.latin1();
+- std::cout << "\nUsage: lincvs [options [arguments]] [dir]" << std::endl;
++ std::cout << "\nUsage: crossvc [options [arguments]] [dir]" << std::endl;
+ std::cout << "where options are:" << std::endl;
+ std::cout << "\t-d --debug write debug info to console" << std::endl;
+ std::cout << "\t-i --iconic start iconized" << std::endl;
+@@ -189,7 +189,7 @@
+ #endif
+ std::cout << "\t-v --version show version" << std::endl;
+ std::cout << "\t-h --help show this text" << std::endl;
+- std::cout << "\n\tIf dir is specified,\n\tLinCVS will start with only this dir in workbench" << std::endl << std::endl;
++ std::cout << "\n\tIf dir is specified,\n\tCrossVC will start with only this dir in workbench" << std::endl << std::endl;
+
+ FINISHHELPCONSOLE;
+ return 0;
+@@ -206,7 +206,7 @@
+ arg = argv[i];
+ if ((arg == "-v") || (arg == "--version")) {
+ STARTHELPCONSOLE;
+- std::cout << "LinCVS version " << LC_VERSION << "\n";
++ std::cout << "CrossVC version " << LC_VERSION << "\n";
+ FINISHHELPCONSOLE;
+ return 0;
+ } else if ((arg == "-h") || (arg == "--help")) {
Reply to: