Просмотр исходного кода

Remove comment headers in dselect/helpmsgs.{cc,h} about the files being
autogenerated, replace them with a proper license and copyright comment.
Closes: #382308

Guillem Jover лет назад: 20
Родитель
Сommit
962b147e2c
4 измененных файлов с 61 добавлено и 5 удалено
  1. 6 0
      ChangeLog
  2. 3 0
      debian/changelog
  3. 26 2
      dselect/helpmsgs.cc
  4. 26 3
      dselect/helpmsgs.h

+ 6 - 0
ChangeLog

@@ -1,3 +1,9 @@
+2006-08-10  Guillem Jover  <guillem@debian.org>
+
+	* 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  <guillem@debian.org>
 2006-08-08  Guillem Jover  <guillem@debian.org>
 
 
 	* scripts/dpkg-architecture.pl (dpkglibdir): Set to '.' where
 	* scripts/dpkg-architecture.pl (dpkglibdir): Set to '.' where

+ 3 - 0
debian/changelog

@@ -5,6 +5,9 @@ dpkg (1.13.23~) UNRELEASED; urgency=low
     Thanks to Ian Jackson <iwj@ubuntu.com>. Closes: #375703
     Thanks to Ian Jackson <iwj@ubuntu.com>. Closes: #375703
   * Use dpkg-architecture from the source tree to get the target Debian
   * Use dpkg-architecture from the source tree to get the target Debian
     architecture, instead of duplicating the logic in the m4 files.
     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 ]
   [ Added dpkg Translations ]
   * Dzongkha (Kinley Tshering)
   * Dzongkha (Kinley Tshering)

+ 26 - 2
dselect/helpmsgs.cc

@@ -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 <ian@chiark.greenend.org.uk>
+ *
+ * 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"
 #include "helpmsgs.h"
+
 const struct helpmessage hlp_listkeys = {
 const struct helpmessage hlp_listkeys = {
   N_("Keystrokes"), N_("\
   N_("Keystrokes"), N_("\
 Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n\
 Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n\
@@ -29,6 +46,7 @@ Quit, exit, overwrite (note capitals!):       ?, F1 request help (also Help)\n\
    U     set all to sUggested state             /   search (Return to cancel)\n\
    U     set all to sUggested state             /   search (Return to cancel)\n\
    D     set all to Directly requested state  n, \\  repeat last search\n")
    D     set all to Directly requested state  n, \\  repeat last search\n")
 };
 };
+
 const struct helpmessage hlp_mainintro = {
 const struct helpmessage hlp_mainintro = {
   N_("Introduction to package selections"), N_("\
   N_("Introduction to package selections"), N_("\
 Welcome to dselect's main package listing.\n\n\
 Welcome to dselect's main package listing.\n\n\
@@ -53,6 +71,7 @@ dependencies will be done - here too you may see a sublist.\n\n\
 \
 \
 Press <space> to leave help and enter the list now.\n")
 Press <space> to leave help and enter the list now.\n")
 };
 };
+
 const struct helpmessage hlp_readonlyintro = {
 const struct helpmessage hlp_readonlyintro = {
   N_("Introduction to read-only package list browser"), N_("\
   N_("Introduction to read-only package list browser"), N_("\
 Welcome to dselect's main package listing.\n\n\
 Welcome to dselect's main package listing.\n\n\
@@ -71,6 +90,7 @@ When you have finished browsing, press `Q' or <enter> to quit.\n\n\
 \
 \
 Press <space> to leave help and enter the list now.\n")
 Press <space> to leave help and enter the list now.\n")
 };
 };
+
 const struct helpmessage hlp_recurintro = {
 const struct helpmessage hlp_recurintro = {
   N_("Introduction to conflict/dependency resolution sub-list"), N_("\
   N_("Introduction to conflict/dependency resolution sub-list"), N_("\
 Dependency/conflict resolution - introduction.\n\n\
 Dependency/conflict resolution - introduction.\n\n\
@@ -96,6 +116,7 @@ override a recommendation or think that the program is mistaken.\n\n\
 \
 \
 Press <space> to leave help and enter the sub-list; remember: press `?' for help.\n")
 Press <space> to leave help and enter the sub-list; remember: press `?' for help.\n")
 };
 };
+
 const struct helpmessage hlp_displayexplain1 = {
 const struct helpmessage hlp_displayexplain1 = {
   N_("Display, part 1: package listing and status chars"), N_("\
   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\
 The top half of the screen shows a list of packages.  For each package you see\n\
@@ -121,6 +142,7 @@ four columns for its current status on the system and mark.  In terse mode (use\
 Also displayed are each package's Priority, Section, name, installed and\n\
 Also displayed are each package's Priority, Section, name, installed and\n\
 available version numbers (shift-V to display/hide) and summary description.\n")
 available version numbers (shift-V to display/hide) and summary description.\n")
 };
 };
+
 const struct helpmessage hlp_displayexplain2 = {
 const struct helpmessage hlp_displayexplain2 = {
   N_("Display, part 2: list highlight; information display"), N_("\
   N_("Display, part 2: list highlight; information display"), N_("\
 * Highlight: One line in the package list will be highlighted.  It indicates\n\
 * Highlight: One line in the package list will be highlighted.  It indicates\n\
@@ -144,6 +166,7 @@ const struct helpmessage hlp_displayexplain2 = {
   Use the `i' key to cycle through the displays, and `I' to hide the\n\
   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")
   information display or expand it to use almost all of the screen.\n")
 };
 };
+
 const struct helpmessage hlp_methintro = {
 const struct helpmessage hlp_methintro = {
   N_("Introduction to method selection display"), N_("\
   N_("Introduction to method selection display"), N_("\
 dselect and dpkg can do automatic installation, loading the package files to be\n\
 dselect and dpkg can do automatic installation, loading the package files to be\n\
@@ -163,6 +186,7 @@ of installation methods.\n\n\
 A full list of keystrokes is available by pressing `k' now, or from the help\n\
 A full list of keystrokes is available by pressing `k' now, or from the help\n\
 menu reachable by pressing `?'.\n")
 menu reachable by pressing `?'.\n")
 };
 };
+
 const struct helpmessage hlp_methkeys = {
 const struct helpmessage hlp_methkeys = {
   N_("Keystrokes for method selection"), N_("\
   N_("Keystrokes for method selection"), N_("\
 Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n\
 Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n\

+ 26 - 3
dselect/helpmsgs.h

@@ -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 <ian@chiark.greenend.org.uk>
+ *
+ * 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
 #ifndef HELPMSGS_H
 #define HELPMSGS_H
 #define HELPMSGS_H
+
 extern "C" {
 extern "C" {
 #include <config.h>
 #include <config.h>
 #include <dpkg.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_listkeys;
 extern const struct helpmessage hlp_mainintro;
 extern const struct helpmessage hlp_mainintro;
 extern const struct helpmessage hlp_readonlyintro;
 extern const struct helpmessage hlp_readonlyintro;
@@ -18,4 +40,5 @@ extern const struct helpmessage hlp_displayexplain1;
 extern const struct helpmessage hlp_displayexplain2;
 extern const struct helpmessage hlp_displayexplain2;
 extern const struct helpmessage hlp_methintro;
 extern const struct helpmessage hlp_methintro;
 extern const struct helpmessage hlp_methkeys;
 extern const struct helpmessage hlp_methkeys;
+
 #endif /* HELPMSGS_H */
 #endif /* HELPMSGS_H */