Back out (most of) the previous commit. The packing list was already

sorted properly; the one in the PR was not.

PR:		41465
Pointy hat to:	trevor

3 files changed, 57 insertions, 57 deletions

diff --git a/www/gallery/pkg-plist b/www/gallery/pkg-plist
index e05b63ea5728..525ab5181cc9 100644
--- a/www/gallery/pkg-plist
+++ b/www/gallery/pkg-plist
@@ -8,6 +8,17 @@
 %%GALLERYDIR%%/album_permissions.php
 %%GALLERYDIR%%/albums.php
 %%GALLERYDIR%%/captionator.php
+%%GALLERYDIR%%/classes/Album.php
+%%GALLERYDIR%%/classes/AlbumDB.php
+%%GALLERYDIR%%/classes/AlbumItem.php
+%%GALLERYDIR%%/classes/Comment.php
+%%GALLERYDIR%%/classes/Database.php
+%%GALLERYDIR%%/classes/EverybodyUser.php
+%%GALLERYDIR%%/classes/Image.php
+%%GALLERYDIR%%/classes/LoggedInUser.php
+%%GALLERYDIR%%/classes/NobodyUser.php
+%%GALLERYDIR%%/classes/User.php
+%%GALLERYDIR%%/classes/UserDB.php
 %%GALLERYDIR%%/classes/database/mysql/Database.php
 %%GALLERYDIR%%/classes/gallery/User.php
 %%GALLERYDIR%%/classes/gallery/UserDB.php
@@ -18,21 +29,10 @@
 %%GALLERYDIR%%/classes/postnuke/UserDB.php
 %%GALLERYDIR%%/classes/postnuke0.7.1/User.php
 %%GALLERYDIR%%/classes/postnuke0.7.1/UserDB.php
-%%GALLERYDIR%%/classes/Album.php
-%%GALLERYDIR%%/classes/AlbumItem.php
-%%GALLERYDIR%%/classes/AlbumDB.php
-%%GALLERYDIR%%/classes/Database.php
-%%GALLERYDIR%%/classes/Comment.php
-%%GALLERYDIR%%/classes/EverybodyUser.php
-%%GALLERYDIR%%/classes/Image.php
-%%GALLERYDIR%%/classes/LoggedInUser.php
-%%GALLERYDIR%%/classes/NobodyUser.php
-%%GALLERYDIR%%/classes/User.php
-%%GALLERYDIR%%/classes/UserDB.php
 %%GALLERYDIR%%/configure.sh
 %%GALLERYDIR%%/create_user.php
-%%GALLERYDIR%%/css/standalone_style.css.default
 %%GALLERYDIR%%/css/embedded_style.css.default
+%%GALLERYDIR%%/css/standalone_style.css.default
 %%GALLERYDIR%%/delete_album.php
 %%GALLERYDIR%%/delete_photo.php
 %%GALLERYDIR%%/delete_user.php
@@ -41,22 +41,22 @@
 %%GALLERYDIR%%/edit_caption.php
 %%GALLERYDIR%%/edit_field.php
 %%GALLERYDIR%%/edit_thumb.php
-%%GALLERYDIR%%/errors/configure_help.php
 %%GALLERYDIR%%/errors/configmode.php
+%%GALLERYDIR%%/errors/configure_help.php
 %%GALLERYDIR%%/errors/configure_instructions.php
 %%GALLERYDIR%%/errors/needinit.php
 %%GALLERYDIR%%/errors/reconfigure.php
 %%GALLERYDIR%%/errors/unconfigured.php
 %%GALLERYDIR%%/gallery_remote.php
+%%GALLERYDIR%%/highlight_photo.php
 %%GALLERYDIR%%/html/errorRow.inc
 %%GALLERYDIR%%/html/userData.inc
-%%GALLERYDIR%%/highlight_photo.php
-%%GALLERYDIR%%/html_wrap/inline_albumthumb.frame.default
 %%GALLERYDIR%%/html_wrap/album.footer.default
 %%GALLERYDIR%%/html_wrap/album.header.default
 %%GALLERYDIR%%/html_wrap/gallery.footer.default
 %%GALLERYDIR%%/html_wrap/gallery.header.default
 %%GALLERYDIR%%/html_wrap/inline_albumthumb.footer.default
+%%GALLERYDIR%%/html_wrap/inline_albumthumb.frame.default
 %%GALLERYDIR%%/html_wrap/inline_albumthumb.header.default
 %%GALLERYDIR%%/html_wrap/inline_gallerythumb.frame.default
 %%GALLERYDIR%%/html_wrap/inline_moviethumb.frame.default
@@ -101,10 +101,10 @@
 %%GALLERYDIR%%/init.php
 %%GALLERYDIR%%/java/ImageTools.jar
 %%GALLERYDIR%%/js/client_sniff.js
-%%GALLERYDIR%%/layout/commentboxbottom.inc
 %%GALLERYDIR%%/layout/adminbox.inc
 %%GALLERYDIR%%/layout/breadcrumb.inc
 %%GALLERYDIR%%/layout/commentbox.inc
+%%GALLERYDIR%%/layout/commentboxbottom.inc
 %%GALLERYDIR%%/layout/commentboxtop.inc
 %%GALLERYDIR%%/layout/commentdraw.inc
 %%GALLERYDIR%%/layout/navigator.inc
@@ -115,8 +115,8 @@
 %%GALLERYDIR%%/modify_user.php
 %%GALLERYDIR%%/move_album.php
 %%GALLERYDIR%%/move_photo.php
-%%GALLERYDIR%%/platform/fs_win32.php
 %%GALLERYDIR%%/platform/fs_unix.php
+%%GALLERYDIR%%/platform/fs_win32.php
 %%GALLERYDIR%%/progress_uploading.php
 %%GALLERYDIR%%/rename_album.php
 %%GALLERYDIR%%/resize_photo.php
@@ -125,10 +125,9 @@
 %%GALLERYDIR%%/search.php
 %%GALLERYDIR%%/secure.sh
 %%GALLERYDIR%%/session.php
-%%GALLERYDIR%%/setup/check_netpbm.php
 %%GALLERYDIR%%/setup/.htaccess
 %%GALLERYDIR%%/setup/check.inc
-%%GALLERYDIR%%/setup/mod_rewrite.template
+%%GALLERYDIR%%/setup/check_netpbm.php
 %%GALLERYDIR%%/setup/config_data.inc
 %%GALLERYDIR%%/setup/confirm.inc
 %%GALLERYDIR%%/setup/constants.inc
@@ -137,6 +136,7 @@
 %%GALLERYDIR%%/setup/gpl.txt
 %%GALLERYDIR%%/setup/index.php
 %%GALLERYDIR%%/setup/init.php
+%%GALLERYDIR%%/setup/mod_rewrite.template
 %%GALLERYDIR%%/setup/php_value.template
 %%GALLERYDIR%%/setup/php_value_ok.php
 %%GALLERYDIR%%/setup/phpinfo.php
diff --git a/www/gallery2/pkg-plist b/www/gallery2/pkg-plist
index e05b63ea5728..525ab5181cc9 100644
--- a/www/gallery2/pkg-plist
+++ b/www/gallery2/pkg-plist
@@ -8,6 +8,17 @@
 %%GALLERYDIR%%/album_permissions.php
 %%GALLERYDIR%%/albums.php
 %%GALLERYDIR%%/captionator.php
+%%GALLERYDIR%%/classes/Album.php
+%%GALLERYDIR%%/classes/AlbumDB.php
+%%GALLERYDIR%%/classes/AlbumItem.php
+%%GALLERYDIR%%/classes/Comment.php
+%%GALLERYDIR%%/classes/Database.php
+%%GALLERYDIR%%/classes/EverybodyUser.php
+%%GALLERYDIR%%/classes/Image.php
+%%GALLERYDIR%%/classes/LoggedInUser.php
+%%GALLERYDIR%%/classes/NobodyUser.php
+%%GALLERYDIR%%/classes/User.php
+%%GALLERYDIR%%/classes/UserDB.php
 %%GALLERYDIR%%/classes/database/mysql/Database.php
 %%GALLERYDIR%%/classes/gallery/User.php
 %%GALLERYDIR%%/classes/gallery/UserDB.php
@@ -18,21 +29,10 @@
 %%GALLERYDIR%%/classes/postnuke/UserDB.php
 %%GALLERYDIR%%/classes/postnuke0.7.1/User.php
 %%GALLERYDIR%%/classes/postnuke0.7.1/UserDB.php
-%%GALLERYDIR%%/classes/Album.php
-%%GALLERYDIR%%/classes/AlbumItem.php
-%%GALLERYDIR%%/classes/AlbumDB.php
-%%GALLERYDIR%%/classes/Database.php
-%%GALLERYDIR%%/classes/Comment.php
-%%GALLERYDIR%%/classes/EverybodyUser.php
-%%GALLERYDIR%%/classes/Image.php
-%%GALLERYDIR%%/classes/LoggedInUser.php
-%%GALLERYDIR%%/classes/NobodyUser.php
-%%GALLERYDIR%%/classes/User.php
-%%GALLERYDIR%%/classes/UserDB.php
 %%GALLERYDIR%%/configure.sh
 %%GALLERYDIR%%/create_user.php
-%%GALLERYDIR%%/css/standalone_style.css.default
 %%GALLERYDIR%%/css/embedded_style.css.default
+%%GALLERYDIR%%/css/standalone_style.css.default
 %%GALLERYDIR%%/delete_album.php
 %%GALLERYDIR%%/delete_photo.php
 %%GALLERYDIR%%/delete_user.php
@@ -41,22 +41,22 @@
 %%GALLERYDIR%%/edit_caption.php
 %%GALLERYDIR%%/edit_field.php
 %%GALLERYDIR%%/edit_thumb.php
-%%GALLERYDIR%%/errors/configure_help.php
 %%GALLERYDIR%%/errors/configmode.php
+%%GALLERYDIR%%/errors/configure_help.php
 %%GALLERYDIR%%/errors/configure_instructions.php
 %%GALLERYDIR%%/errors/needinit.php
 %%GALLERYDIR%%/errors/reconfigure.php
 %%GALLERYDIR%%/errors/unconfigured.php
 %%GALLERYDIR%%/gallery_remote.php
+%%GALLERYDIR%%/highlight_photo.php
 %%GALLERYDIR%%/html/errorRow.inc
 %%GALLERYDIR%%/html/userData.inc
-%%GALLERYDIR%%/highlight_photo.php
-%%GALLERYDIR%%/html_wrap/inline_albumthumb.frame.default
 %%GALLERYDIR%%/html_wrap/album.footer.default
 %%GALLERYDIR%%/html_wrap/album.header.default
 %%GALLERYDIR%%/html_wrap/gallery.footer.default
 %%GALLERYDIR%%/html_wrap/gallery.header.default
 %%GALLERYDIR%%/html_wrap/inline_albumthumb.footer.default
+%%GALLERYDIR%%/html_wrap/inline_albumthumb.frame.default
 %%GALLERYDIR%%/html_wrap/inline_albumthumb.header.default
 %%GALLERYDIR%%/html_wrap/inline_gallerythumb.frame.default
 %%GALLERYDIR%%/html_wrap/inline_moviethumb.frame.default
@@ -101,10 +101,10 @@
 %%GALLERYDIR%%/init.php
 %%GALLERYDIR%%/java/ImageTools.jar
 %%GALLERYDIR%%/js/client_sniff.js
-%%GALLERYDIR%%/layout/commentboxbottom.inc
 %%GALLERYDIR%%/layout/adminbox.inc
 %%GALLERYDIR%%/layout/breadcrumb.inc
 %%GALLERYDIR%%/layout/commentbox.inc
+%%GALLERYDIR%%/layout/commentboxbottom.inc
 %%GALLERYDIR%%/layout/commentboxtop.inc
 %%GALLERYDIR%%/layout/commentdraw.inc
 %%GALLERYDIR%%/layout/navigator.inc
@@ -115,8 +115,8 @@
 %%GALLERYDIR%%/modify_user.php
 %%GALLERYDIR%%/move_album.php
 %%GALLERYDIR%%/move_photo.php
-%%GALLERYDIR%%/platform/fs_win32.php
 %%GALLERYDIR%%/platform/fs_unix.php
+%%GALLERYDIR%%/platform/fs_win32.php
 %%GALLERYDIR%%/progress_uploading.php
 %%GALLERYDIR%%/rename_album.php
 %%GALLERYDIR%%/resize_photo.php
@@ -125,10 +125,9 @@
 %%GALLERYDIR%%/search.php
 %%GALLERYDIR%%/secure.sh
 %%GALLERYDIR%%/session.php
-%%GALLERYDIR%%/setup/check_netpbm.php
 %%GALLERYDIR%%/setup/.htaccess
 %%GALLERYDIR%%/setup/check.inc
-%%GALLERYDIR%%/setup/mod_rewrite.template
+%%GALLERYDIR%%/setup/check_netpbm.php
 %%GALLERYDIR%%/setup/config_data.inc
 %%GALLERYDIR%%/setup/confirm.inc
 %%GALLERYDIR%%/setup/constants.inc
@@ -137,6 +136,7 @@
 %%GALLERYDIR%%/setup/gpl.txt
 %%GALLERYDIR%%/setup/index.php
 %%GALLERYDIR%%/setup/init.php
+%%GALLERYDIR%%/setup/mod_rewrite.template
 %%GALLERYDIR%%/setup/php_value.template
 %%GALLERYDIR%%/setup/php_value_ok.php
 %%GALLERYDIR%%/setup/phpinfo.php
diff --git a/www/gallery3/pkg-plist b/www/gallery3/pkg-plist
index e05b63ea5728..525ab5181cc9 100644
--- a/www/gallery3/pkg-plist
+++ b/www/gallery3/pkg-plist
@@ -8,6 +8,17 @@
 %%GALLERYDIR%%/album_permissions.php
 %%GALLERYDIR%%/albums.php
 %%GALLERYDIR%%/captionator.php
+%%GALLERYDIR%%/classes/Album.php
+%%GALLERYDIR%%/classes/AlbumDB.php
+%%GALLERYDIR%%/classes/AlbumItem.php
+%%GALLERYDIR%%/classes/Comment.php
+%%GALLERYDIR%%/classes/Database.php
+%%GALLERYDIR%%/classes/EverybodyUser.php
+%%GALLERYDIR%%/classes/Image.php
+%%GALLERYDIR%%/classes/LoggedInUser.php
+%%GALLERYDIR%%/classes/NobodyUser.php
+%%GALLERYDIR%%/classes/User.php
+%%GALLERYDIR%%/classes/UserDB.php
 %%GALLERYDIR%%/classes/database/mysql/Database.php
 %%GALLERYDIR%%/classes/gallery/User.php
 %%GALLERYDIR%%/classes/gallery/UserDB.php
@@ -18,21 +29,10 @@
 %%GALLERYDIR%%/classes/postnuke/UserDB.php
 %%GALLERYDIR%%/classes/postnuke0.7.1/User.php
 %%GALLERYDIR%%/classes/postnuke0.7.1/UserDB.php
-%%GALLERYDIR%%/classes/Album.php
-%%GALLERYDIR%%/classes/AlbumItem.php
-%%GALLERYDIR%%/classes/AlbumDB.php
-%%GALLERYDIR%%/classes/Database.php
-%%GALLERYDIR%%/classes/Comment.php
-%%GALLERYDIR%%/classes/EverybodyUser.php
-%%GALLERYDIR%%/classes/Image.php
-%%GALLERYDIR%%/classes/LoggedInUser.php
-%%GALLERYDIR%%/classes/NobodyUser.php
-%%GALLERYDIR%%/classes/User.php
-%%GALLERYDIR%%/classes/UserDB.php
 %%GALLERYDIR%%/configure.sh
 %%GALLERYDIR%%/create_user.php
-%%GALLERYDIR%%/css/standalone_style.css.default
 %%GALLERYDIR%%/css/embedded_style.css.default
+%%GALLERYDIR%%/css/standalone_style.css.default
 %%GALLERYDIR%%/delete_album.php
 %%GALLERYDIR%%/delete_photo.php
 %%GALLERYDIR%%/delete_user.php
@@ -41,22 +41,22 @@
 %%GALLERYDIR%%/edit_caption.php
 %%GALLERYDIR%%/edit_field.php
 %%GALLERYDIR%%/edit_thumb.php
-%%GALLERYDIR%%/errors/configure_help.php
 %%GALLERYDIR%%/errors/configmode.php
+%%GALLERYDIR%%/errors/configure_help.php
 %%GALLERYDIR%%/errors/configure_instructions.php
 %%GALLERYDIR%%/errors/needinit.php
 %%GALLERYDIR%%/errors/reconfigure.php
 %%GALLERYDIR%%/errors/unconfigured.php
 %%GALLERYDIR%%/gallery_remote.php
+%%GALLERYDIR%%/highlight_photo.php
 %%GALLERYDIR%%/html/errorRow.inc
 %%GALLERYDIR%%/html/userData.inc
-%%GALLERYDIR%%/highlight_photo.php
-%%GALLERYDIR%%/html_wrap/inline_albumthumb.frame.default
 %%GALLERYDIR%%/html_wrap/album.footer.default
 %%GALLERYDIR%%/html_wrap/album.header.default
 %%GALLERYDIR%%/html_wrap/gallery.footer.default
 %%GALLERYDIR%%/html_wrap/gallery.header.default
 %%GALLERYDIR%%/html_wrap/inline_albumthumb.footer.default
+%%GALLERYDIR%%/html_wrap/inline_albumthumb.frame.default
 %%GALLERYDIR%%/html_wrap/inline_albumthumb.header.default
 %%GALLERYDIR%%/html_wrap/inline_gallerythumb.frame.default
 %%GALLERYDIR%%/html_wrap/inline_moviethumb.frame.default
@@ -101,10 +101,10 @@
 %%GALLERYDIR%%/init.php
 %%GALLERYDIR%%/java/ImageTools.jar
 %%GALLERYDIR%%/js/client_sniff.js
-%%GALLERYDIR%%/layout/commentboxbottom.inc
 %%GALLERYDIR%%/layout/adminbox.inc
 %%GALLERYDIR%%/layout/breadcrumb.inc
 %%GALLERYDIR%%/layout/commentbox.inc
+%%GALLERYDIR%%/layout/commentboxbottom.inc
 %%GALLERYDIR%%/layout/commentboxtop.inc
 %%GALLERYDIR%%/layout/commentdraw.inc
 %%GALLERYDIR%%/layout/navigator.inc
@@ -115,8 +115,8 @@
 %%GALLERYDIR%%/modify_user.php
 %%GALLERYDIR%%/move_album.php
 %%GALLERYDIR%%/move_photo.php
-%%GALLERYDIR%%/platform/fs_win32.php
 %%GALLERYDIR%%/platform/fs_unix.php
+%%GALLERYDIR%%/platform/fs_win32.php
 %%GALLERYDIR%%/progress_uploading.php
 %%GALLERYDIR%%/rename_album.php
 %%GALLERYDIR%%/resize_photo.php
@@ -125,10 +125,9 @@
 %%GALLERYDIR%%/search.php
 %%GALLERYDIR%%/secure.sh
 %%GALLERYDIR%%/session.php
-%%GALLERYDIR%%/setup/check_netpbm.php
 %%GALLERYDIR%%/setup/.htaccess
 %%GALLERYDIR%%/setup/check.inc
-%%GALLERYDIR%%/setup/mod_rewrite.template
+%%GALLERYDIR%%/setup/check_netpbm.php
 %%GALLERYDIR%%/setup/config_data.inc
 %%GALLERYDIR%%/setup/confirm.inc
 %%GALLERYDIR%%/setup/constants.inc
@@ -137,6 +136,7 @@
 %%GALLERYDIR%%/setup/gpl.txt
 %%GALLERYDIR%%/setup/index.php
 %%GALLERYDIR%%/setup/init.php
+%%GALLERYDIR%%/setup/mod_rewrite.template
 %%GALLERYDIR%%/setup/php_value.template
 %%GALLERYDIR%%/setup/php_value_ok.php
 %%GALLERYDIR%%/setup/phpinfo.php