Author: guillem
Date: 2006-08-10 15:45:40 +0000 (Thu, 10 Aug 2006)
New Revision: 500
Modified:
trunk/ChangeLog
trunk/debian/changelog
trunk/dselect/helpmsgs.cc
trunk/dselect/helpmsgs.h
Log:
Remove comment headers in dselect/helpmsgs.{cc,h} about the files being
autogenerated, replace them with a proper license and copyright comment.
Closes: #382308
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-08-08 03:38:54 UTC (rev 499)
+++ trunk/ChangeLog 2006-08-10 15:45:40 UTC (rev 500)
@@ -1,3 +1,9 @@
+2006-08-10 Guillem Jover <[EMAIL PROTECTED]>
+
+ * dselect/helpmsgs.cc: Replace the comment header about the file being
+ autogenerated with a proper copyright and license one. Reindented.
+ * dselect/helpmsgs.h: Likewise.
+
2006-08-08 Guillem Jover <[EMAIL PROTECTED]>
* scripts/dpkg-architecture.pl (dpkglibdir): Set to '.' where
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-08-08 03:38:54 UTC (rev 499)
+++ trunk/debian/changelog 2006-08-10 15:45:40 UTC (rev 500)
@@ -5,6 +5,9 @@
Thanks to Ian Jackson <[EMAIL PROTECTED]>. Closes: #375703
* Use dpkg-architecture from the source tree to get the target Debian
architecture, instead of duplicating the logic in the m4 files.
+ * Remove comment headers in dselect/helpmsgs.{cc,h} about the files being
+ autogenerated, replace them with a proper license and copyright comment.
+ Closes: #382308
[ Added dpkg Translations ]
* Dzongkha (Kinley Tshering)
Modified: trunk/dselect/helpmsgs.cc
===================================================================
--- trunk/dselect/helpmsgs.cc 2006-08-08 03:38:54 UTC (rev 499)
+++ trunk/dselect/helpmsgs.cc 2006-08-10 15:45:40 UTC (rev 500)
@@ -1,9 +1,26 @@
/*
- * WARNING - THIS FILE IS GENERATED AUTOMATICALLY - DO NOT EDIT
- * It is generated by mkhelpmsgs.pl from helpmsgs.src.
+ * dselect - Debian package maintenance user interface
+ * helpmsgs.cc - list of help messages
+ *
+ * Copyright (C) 1995 Ian Jackson <[EMAIL PROTECTED]>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2,
+ * or (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "helpmsgs.h"
+
const struct helpmessage hlp_listkeys = {
N_("Keystrokes"), N_("\
Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n\
@@ -29,6 +46,7 @@
U set all to sUggested state / search (Return to
cancel)\n\
D set all to Directly requested state n, \\ repeat last search\n")
};
+
const struct helpmessage hlp_mainintro = {
N_("Introduction to package selections"), N_("\
Welcome to dselect's main package listing.\n\n\
@@ -53,6 +71,7 @@
\
Press <space> to leave help and enter the list now.\n")
};
+
const struct helpmessage hlp_readonlyintro = {
N_("Introduction to read-only package list browser"), N_("\
Welcome to dselect's main package listing.\n\n\
@@ -71,6 +90,7 @@
\
Press <space> to leave help and enter the list now.\n")
};
+
const struct helpmessage hlp_recurintro = {
N_("Introduction to conflict/dependency resolution sub-list"), N_("\
Dependency/conflict resolution - introduction.\n\n\
@@ -96,6 +116,7 @@
\
Press <space> to leave help and enter the sub-list; remember: press `?' for
help.\n")
};
+
const struct helpmessage hlp_displayexplain1 = {
N_("Display, part 1: package listing and status chars"), N_("\
The top half of the screen shows a list of packages. For each package you
see\n\
@@ -121,6 +142,7 @@
Also displayed are each package's Priority, Section, name, installed and\n\
available version numbers (shift-V to display/hide) and summary
description.\n")
};
+
const struct helpmessage hlp_displayexplain2 = {
N_("Display, part 2: list highlight; information display"), N_("\
* Highlight: One line in the package list will be highlighted. It indicates\n\
@@ -144,6 +166,7 @@
Use the `i' key to cycle through the displays, and `I' to hide the\n\
information display or expand it to use almost all of the screen.\n")
};
+
const struct helpmessage hlp_methintro = {
N_("Introduction to method selection display"), N_("\
dselect and dpkg can do automatic installation, loading the package files to
be\n\
@@ -163,6 +186,7 @@
A full list of keystrokes is available by pressing `k' now, or from the help\n\
menu reachable by pressing `?'.\n")
};
+
const struct helpmessage hlp_methkeys = {
N_("Keystrokes for method selection"), N_("\
Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n\
Modified: trunk/dselect/helpmsgs.h
===================================================================
--- trunk/dselect/helpmsgs.h 2006-08-08 03:38:54 UTC (rev 499)
+++ trunk/dselect/helpmsgs.h 2006-08-10 15:45:40 UTC (rev 500)
@@ -1,15 +1,37 @@
/*
- * WARNING - THIS FILE IS GENERATED AUTOMATICALLY - DO NOT EDIT
- * It is generated by mkhelpmsgs.pl from helpmsgs.src.
+ * dselect - Debian package maintenance user interface
+ * helpmsgs.h - external definitions for the list of help messages
+ *
+ * Copyright (C) 1995 Ian Jackson <[EMAIL PROTECTED]>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2,
+ * or (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef HELPMSGS_H
#define HELPMSGS_H
+
extern "C" {
#include <config.h>
#include <dpkg.h>
}
-struct helpmessage { const char *title; const char *text; };
+
+struct helpmessage {
+ const char *title;
+ const char *text;
+};
+
extern const struct helpmessage hlp_listkeys;
extern const struct helpmessage hlp_mainintro;
extern const struct helpmessage hlp_readonlyintro;
@@ -18,4 +40,5 @@
extern const struct helpmessage hlp_displayexplain2;
extern const struct helpmessage hlp_methintro;
extern const struct helpmessage hlp_methkeys;
+
#endif /* HELPMSGS_H */
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
