[SCM] Debian package checker branch, master, updated. 2.5.10-89-g18852eb
The following commit has been merged in the master branch:
commit 18852ebaa0c8c5b5f316d74302e27fb1f0e945bb
Author: Niels Thykier <niels@thykier.net>
Date: Mon Jul 23 21:48:52 2012 +0200
c/menu-format: Move a table of categories to a data file
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/menu-format b/checks/menu-format
index ca812f6..34de8fa 100644
--- a/checks/menu-format
+++ b/checks/menu-format
@@ -180,129 +180,7 @@ my %main_categories = map { $_ => 1 }
# This is a list of all Additional Categories for .desktop files. Ideally we
# should be checking to be sure the associated Main Categories are present,
# but we don't have support for that yet.
-my %categories = map { $_ => 1 }
- qw(
- Building
- Debugger
- IDE
- GUIDesigner
- Profiling
- RevisionControl
- Translation
- Calendar
- ContactManagement
- Database
- Dictionary
- Chart
- Email
- Finance
- FlowChart
- PDA
- ProjectManagement
- Presentation
- Spreadsheet
- WordProcessor
- 2DGraphics
- VectorGraphics
- RasterGraphics
- 3DGraphics
- Scanning
- OCR
- Photography
- Publishing
- Viewer
- TextTools
- DesktopSettings
- HardwareSettings
- Printing
- PackageManager
- Dialup
- InstantMessaging
- Chat
- IRCClient
- FileTransfer
- HamRadio
- News
- P2P
- RemoteAccess
- Telephony
- TelephonyTools
- VideoConference
- WebBrowser
- WebDevelopment
- Midi
- Mixer
- Sequencer
- Tuner
- TV
- AudioVideoEditing
- Player
- Recorder
- DiscBurning
- ActionGame
- AdventureGame
- ArcadeGame
- BoardGame
- BlocksGame
- CardGame
- KidsGame
- LogicGame
- RolePlaying
- Simulation
- SportsGame
- StrategyGame
- Art
- Construction
- Music
- Languages
- Science
- ArtificialIntelligence
- Astronomy
- Biology
- Chemistry
- ComputerScience
- DataVisualization
- Economy
- Electricity
- Geography
- Geology
- Geoscience
- History
- ImageProcessing
- Literature
- Math
- NumericalAnalysis
- MedicalSoftware
- Physics
- Robotics
- Sports
- ParallelComputing
- Amusement
- Archiving
- Compression
- Electronics
- Emulator
- Engineering
- FileTools
- FileManager
- TerminalEmulator
- Filesystem
- Monitor
- Security
- Accessibility
- Calculator
- Clock
- TextEditor
- Documentation
- Core
- KDE
- GNOME
- GTK
- Qt
- Motif
- Java
- ConsoleOnly
- );
+my $ADD_CATEGORIES = Lintian::Data->new ('menu-format/add-categories');
# This is a list of Reserved Categories for .desktop files. To use one of
# these, the desktop entry must also have an OnlyShowIn key limiting the
@@ -795,7 +673,7 @@ sub VerifyDesktopFile {
unless $vals{'OnlyShowIn'};
$saw_main = 1;
$in_reserved = 1;
- } elsif (not $categories{$cat} and not $main_categories{$cat}) {
+ } elsif (not $ADD_CATEGORIES->known ($cat) and not $main_categories{$cat}) {
tag 'desktop-entry-invalid-category', "$cat $file";
} elsif ($main_categories{$cat}) {
$saw_main = 1;
diff --git a/debian/changelog b/debian/changelog
index 0855b98..0e35850 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -47,6 +47,8 @@ lintian (2.5.11) UNRELEASED; urgency=low
the groff pipeline.
+ [CW,NT] Use the L::Util gzip decompressor to open gzipped
manpages.
+ * checks/menu-format:
+ + [NT] Move a table of categories to a data file.
* checks/md5sums:
+ [NT] Use L::Collect's conffile API instead of accessing the
"conffiles" control file directly.
@@ -71,6 +73,8 @@ lintian (2.5.11) UNRELEASED; urgency=low
Nicholas Bamber for the report. (Closes: #682022)
* data/doc-base/sections:
+ [NT] Update section list. (Closes: #678650)
+ * data/menu-format/add-categories:
+ + [NT] New file.
* data/spelling/corrections:
+ [NT] Add new corrections. Thanks to Justin B Rye.
(Closes: #681527)
diff --git a/vendors/debian/ftp-master-auto-reject/data/menu-format/add-categories b/vendors/debian/ftp-master-auto-reject/data/menu-format/add-categories
new file mode 100644
index 0000000..8b4c229
--- /dev/null
+++ b/vendors/debian/ftp-master-auto-reject/data/menu-format/add-categories
@@ -0,0 +1,124 @@
+# This is a list of all Additional Categories for .desktop files.
+#
+# It is manually maintained; please keep it sorted.
+
+2DGraphics
+3DGraphics
+Accessibility
+ActionGame
+AdventureGame
+Amusement
+ArcadeGame
+Archiving
+Art
+ArtificialIntelligence
+Astronomy
+AudioVideoEditing
+Biology
+BlocksGame
+BoardGame
+Building
+Calculator
+Calendar
+CardGame
+Chart
+Chat
+Chemistry
+Clock
+Compression
+ComputerScience
+ConsoleOnly
+Construction
+ContactManagement
+Core
+Database
+DataVisualization
+Debugger
+DesktopSettings
+Dialup
+Dictionary
+DiscBurning
+Documentation
+Economy
+Electricity
+Electronics
+Email
+Emulator
+Engineering
+FileManager
+Filesystem
+FileTools
+FileTransfer
+Finance
+FlowChart
+Geography
+Geology
+Geoscience
+GNOME
+GTK
+GUIDesigner
+HamRadio
+HardwareSettings
+History
+IDE
+ImageProcessing
+InstantMessaging
+IRCClient
+Java
+KDE
+KidsGame
+Languages
+Literature
+LogicGame
+Math
+MedicalSoftware
+Midi
+Mixer
+Monitor
+Motif
+Music
+News
+NumericalAnalysis
+OCR
+P2P
+PackageManager
+ParallelComputing
+PDA
+Photography
+Physics
+Player
+Presentation
+Printing
+Profiling
+ProjectManagement
+Publishing
+Qt
+RasterGraphics
+Recorder
+RemoteAccess
+RevisionControl
+Robotics
+RolePlaying
+Scanning
+Science
+Security
+Sequencer
+Simulation
+Sports
+SportsGame
+Spreadsheet
+StrategyGame
+Telephony
+TelephonyTools
+TerminalEmulator
+TextEditor
+TextTools
+Translation
+Tuner
+TV
+VectorGraphics
+VideoConference
+Viewer
+WebBrowser
+WebDevelopment
+WordProcessor
--
Debian package checker
Reply to: