[DebianBRTeam-commits] r584 - in /packages/album-data/trunk/debian: README.Debian album-data.lintian-overrides changelog compat control copyright dirs rules
eriberto-guest at users.alioth.debian.org
eriberto-guest at users.alioth.debian.org
Wed Jan 13 16:15:15 UTC 2010
Author: eriberto-guest
Date: Wed Jan 13 16:15:14 2010
New Revision: 584
URL: http://svn.debian.org/wsvn/?sc=1&rev=584
Log:
album-data_4.05-2
* Removed debian/copyright2 (a mistake).
album-data_4.05-1
* New upstream release.
* Fixed license confusion. This package is non-free and -dfsg suffix was
removed. The DropFloat theme was accepted now.
* Added in debian/{control,README.Debian} a link to a website about
screenshots of the themes.
* Updated debian/README.Debian.
* Updated debhelper version from 6 to 7.
* debian/control:
- Added ${misc:Depends} in Depends field.
- Removed the suggests field. This package depends of the album and it
already suggests apache2.
- Updated Standards-Version from 3.8.0 to 3.8.3.
- Updated short and long descriptions.
* debian/copyright:
- Updated packaging date and added the "copyright" word before
the years.
- Updated information about licenses used by upstream in source code.
* debian/rules:
- Added an override to maintain a blank directory to No-Theme theme.
- Changed from dh_clean -k to dh_prep in install target.
- Moved all {changelog,credit,readme,screenshot} files from main themes
folders to /usr/share/doc/album-data/<theme>.
- Removed unnecessary files.
Added:
packages/album-data/trunk/debian/album-data.lintian-overrides
Modified:
packages/album-data/trunk/debian/README.Debian
packages/album-data/trunk/debian/changelog
packages/album-data/trunk/debian/compat
packages/album-data/trunk/debian/control
packages/album-data/trunk/debian/copyright
packages/album-data/trunk/debian/dirs
packages/album-data/trunk/debian/rules
Modified: packages/album-data/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/packages/album-data/trunk/debian/README.Debian?rev=584&op=diff
==============================================================================
--- packages/album-data/trunk/debian/README.Debian (original)
+++ packages/album-data/trunk/debian/README.Debian Wed Jan 13 16:15:14 2010
@@ -5,62 +5,70 @@
The configuration file (/etc/album.conf) will be created after the first
execution of the album. This file has basic parameters. See below:
-
+
#
# Configuration file automatically created by album
#
conf_version 4.04
theme_path /usr/share/album/Themes
theme_url /Themes/
-
+
Then, if you need to use Album with a web server, you must make a
symbolic link from /var/www/Themes, pointing to /usr/share/album/Themes.
Example:
-
+
# ln -s /usr/share/album/Themes /var/www
-
+
In Apache2, you can put a .conf file into /etc/apache2/conf.d (please,
see an example in /usr/share/doc/album-data/examples/).
-
+
2. How to use themes
From http://marginalhacks.com/Hacks/album/Docs/Section_2.html:
-------------------------------------
"4: Using A Theme
-
+
If themes were installed properly and are in your theme_path then
you should be able to use a theme with your album:
-
+
% album -theme Blue /home/httpd/test/Photos
-
+
The photo album should now be using the Blue theme. If it has
a bunch of broken images, then your theme probably hasn't been
installed into a web-accessible directory, see the Installation docs.
-
+
Album saves the options you specify, so the next time you run album:
-
+
% album /home/httpd/test/Photos
-
+
You'll still be using the Blue theme. To turn off a theme, you can:
-
+
% album -no_theme /home/httpd/test/Photos"
- -------------------------------------
-
+ -------------------------------------
- TIP: Perhaps the program ask about themes directory in the first use. You
- will can use "-theme_path". Example:
-
+
+ TIP1: Perhaps the program ask about themes directory in the first use. You
+ will can use "-theme_path". Example:
+
$ album -theme Baby -theme_path /usr/share/album/Themes/
+
+ TIP2: To see all available themes, type the command:
+
+ $ ls /usr/share/album-data/Themes/
+
+ Or go to http://davepics.com/Theme_Album/.
3. Good references
- Theme's demo site: http://davepics.com/Theme_Album
- Translations status: http://marginalhacks.com/Hacks/album/Languages.html
- Screenshot of Album: http://www.eriberto.pro.br/debian/screenshots/album.jpg
- Documentation: http://marginalhacks.com/Hacks/album/Docs
+ Theme's demo site: http://davepics.com/Theme_Album
+ Notes about plugins: http://marginalhacks.com/Hacks/album/Plugins.html
+ Translations status: http://marginalhacks.com/Hacks/album/Languages.html
+ Screenshot of Album: http://www.eriberto.pro.br/debian/screenshots/album.jpg
+ Screenshots of themes: http://davepics.com/Theme_Album/
+ Documentation: http://marginalhacks.com/Hacks/album/Docs
- -- Joao Eriberto Mota Filho <eriberto at eriberto.pro.br> Thu, 19 Jun 2008 09:43:12 -0300
+ -- Joao Eriberto Mota Filho <eriberto at eriberto.pro.br> Fri, 08 Jan 2010 12:16:23 -0300
Added: packages/album-data/trunk/debian/album-data.lintian-overrides
URL: http://svn.debian.org/wsvn/packages/album-data/trunk/debian/album-data.lintian-overrides?rev=584&op=file
==============================================================================
--- packages/album-data/trunk/debian/album-data.lintian-overrides (added)
+++ packages/album-data/trunk/debian/album-data.lintian-overrides Wed Jan 13 16:15:14 2010
@@ -1,0 +1,1 @@
+album-data: package-contains-empty-directory usr/share/album-data/Themes/No-Theme/
Modified: packages/album-data/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/packages/album-data/trunk/debian/changelog?rev=584&op=diff
==============================================================================
--- packages/album-data/trunk/debian/changelog (original)
+++ packages/album-data/trunk/debian/changelog Wed Jan 13 16:15:14 2010
@@ -1,3 +1,37 @@
+album-data (4.05-2) unstable; urgency=low
+
+ * Removed debian/copyright2 (a mistake).
+
+ -- Joao Eriberto Mota Filho <eriberto at eriberto.pro.br> Wed, 13 Jan 2010 14:03:17 -0200
+
+album-data (4.05-1) unstable; urgency=low
+
+ * New upstream release.
+ * Fixed license confusion. This package is non-free and -dfsg suffix was
+ removed. The DropFloat theme was accepted now.
+ * Added in debian/{control,README.Debian} a link to a website about
+ screenshots of the themes.
+ * Updated debian/README.Debian.
+ * Updated debhelper version from 6 to 7.
+ * debian/control:
+ - Added ${misc:Depends} in Depends field.
+ - Removed the suggests field. This package depends of the album and it
+ already suggests apache2.
+ - Updated Standards-Version from 3.8.0 to 3.8.3.
+ - Updated short and long descriptions.
+ * debian/copyright:
+ - Updated packaging date and added the "copyright" word before
+ the years.
+ - Updated information about licenses used by upstream in source code.
+ * debian/rules:
+ - Added an override to maintain a blank directory to No-Theme theme.
+ - Changed from dh_clean -k to dh_prep in install target.
+ - Moved all {changelog,credit,readme,screenshot} files from main themes
+ folders to /usr/share/doc/album-data/<theme>.
+ - Removed unnecessary files.
+
+ -- Joao Eriberto Mota Filho <eriberto at eriberto.pro.br> Fri, 08 Jan 2010 11:04:58 -0200
+
album-data (4.03.dfsg-2) unstable; urgency=low
* Changed priority from optional to extra, in debian/control, to make
Modified: packages/album-data/trunk/debian/compat
URL: http://svn.debian.org/wsvn/packages/album-data/trunk/debian/compat?rev=584&op=diff
==============================================================================
--- packages/album-data/trunk/debian/compat (original)
+++ packages/album-data/trunk/debian/compat Wed Jan 13 16:15:14 2010
@@ -1,1 +1,1 @@
-6
+7
Modified: packages/album-data/trunk/debian/control
URL: http://svn.debian.org/wsvn/packages/album-data/trunk/debian/control?rev=584&op=diff
==============================================================================
--- packages/album-data/trunk/debian/control (original)
+++ packages/album-data/trunk/debian/control Wed Jan 13 16:15:14 2010
@@ -2,25 +2,25 @@
Section: non-free/web
Priority: extra
Maintainer: Joao Eriberto Mota Filho <eriberto at eriberto.pro.br>
-Build-Depends: debhelper (>= 6)
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 7)
+Standards-Version: 3.8.3
Vcs-Svn: svn://svn.debian.org/svn/debian-br-team/packages/album-data
Vcs-Browser: http://svn.debian.org/wsvn/debian-br-team/packages/album-data
Homepage: http://marginalhacks.com/Hacks/album
Package: album-data
Architecture: all
-Depends: album
-Suggests: apache2
-Description: themes and translations for album
+Depends: ${misc:Depends}, album
+Description: themes, plugins and translations for album
Album is a perl script that can create HTML photo albums for your
- directories of images. This package provides themes and translations
- for Album.
+ directories of images. This package provides themes, plugins and
+ translations for Album.
.
The available languages are Catalan, Czech, German, Spanish, French,
- Hebreu, Italian, Korean, Dutch, Polish, Swedish Chef and Chinese. The
- original Album package is in English.
+ Hebreu, Hungarian, Italian, Korean, Dutch, Polish, Swedish Chef,
+ Chinese and Leet Hacker. The original Album package is in English.
.
- Theme's demo site: http://davepics.com/Theme_Album
- Translations status: http://marginalhacks.com/Hacks/album/Languages.html
- Screenshot of Album: http://www.eriberto.pro.br/debian/screenshots/album.jpg
+ Theme's demo site: http://davepics.com/Theme_Album
+ Translations status: http://marginalhacks.com/Hacks/album/Languages.html
+ Screenshot of Album: http://www.eriberto.pro.br/debian/screenshots/album.jpg
+ Screenshots of themes: http://davepics.com/Theme_Album/
Modified: packages/album-data/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/packages/album-data/trunk/debian/copyright?rev=584&op=diff
==============================================================================
--- packages/album-data/trunk/debian/copyright (original)
+++ packages/album-data/trunk/debian/copyright Wed Jan 13 16:15:14 2010
@@ -7,8 +7,7 @@
Developer: David Ljung Madison <contactRequest at MarginalHacks.com>
- Contributors (themes): please, see CREDIT file into each theme folder
- (/usr/share/album-data/themes/<theme name>).
+ Contributors: please, see /usr/share/doc/album-data/<theme>/CREDIT file.
Copyright: (C) 2000-2008 David Ljung Madison
@@ -91,17 +90,43 @@
===============================================================================
-The themes were developed by unlike peoples. Then, there are different licenses
-in some packages. See above:
+The themes and plugins were developed by unlike peoples. Then, there are
+different licenses in some packages. See above:
+ - Theme DropFloat is under Creative Commons Attribution-Share Alike 2.5
+ Generic (CC-by-sa 2.5).
- Themes IFI_Emboss and NewFloat are under GPL 2 (or later) license.
- - Theme Outdoors is under Creative Commons Attribution 3.0 License (CC-by
- 3.0, available at http://creativecommons.org/licenses/by/3.0).
- - Theme Zeitoun is under LGPL license.
-
-The Debian packaging is (C) 2008 by Joao Eriberto Mota Filho
-<eriberto at eriberto.pro.br> and is licensed under the GPL 2 or later.
+ - Theme Outdoors has a component named lytebox.js under Creative Commons
+ Attribution 3.0 License (CC-by 3.0).
+ - Theme Zeitoun is under LGPL license.
+ - Plugins audio.alp, epeg.alp, reorganizer.alp and specified_sort.alp are
+ under MIT license.
+ - Plugins digikam.alp and gps.alp are under LGPL license.
+ - Plugin flv has a component named player.swf under Creative Commons
+ Attribution-Noncommercial-Share Alike 3.0 Unported License
+ (CC-by-nc-sa 3.0).
+ - Plugin rss2.alp is under Artisitc license.
+ - The file plugins/captions/exif/exiftool/lib/File/RandomAccessFile.pm is
+ under the same terms of the Perl.
-On Debian systems, the complete text of the GNU General Public License can be
-found in `/usr/share/common-licenses/GPL-2'. The GNU Lesser General Public
-License is available in `/usr/share/common-licenses/LGPL-2'.
+The Debian packaging is Copyright 2008-2010 by Joao Eriberto Mota Filho
+<eriberto at eriberto.pro.br> and is licensed under the GPL 3 or later.
+
+On Debian systems, the complete text of the GNU General Public License, GNU
+Lesser General Public License and Artistic license is available in
+`/usr/share/common-licenses/'.
+
+The complete text of the CC-by-sa 2.5 is available at
+http://creativecommons.org/licenses/by-sa/2.5.
+
+The complete text of the CC-by 3.0 is available at
+http://creativecommons.org/licenses/by/3.0.
+
+The complete text of the MIT license is available at
+http://www.opensource.org/licenses/mit-license.php.
+
+The complete text of the CC-by-nc-sa 3.0 is available at
+http://creativecommons.org/licenses/by-nc-sa/3.0.
+
+The complete text of the Perl terms is available at
+http://dev.perl.org/licenses.
Modified: packages/album-data/trunk/debian/dirs
URL: http://svn.debian.org/wsvn/packages/album-data/trunk/debian/dirs?rev=584&op=diff
==============================================================================
--- packages/album-data/trunk/debian/dirs (original)
+++ packages/album-data/trunk/debian/dirs Wed Jan 13 16:15:14 2010
@@ -1,1 +1,2 @@
usr/share/album-data
+usr/share/doc/album-data/themes
Modified: packages/album-data/trunk/debian/rules
URL: http://svn.debian.org/wsvn/packages/album-data/trunk/debian/rules?rev=584&op=diff
==============================================================================
--- packages/album-data/trunk/debian/rules (original)
+++ packages/album-data/trunk/debian/rules Wed Jan 13 16:15:14 2010
@@ -4,12 +4,14 @@
#export DH_VERBOSE=1
DESTDIR = $(CURDIR)/debian/album-data
+DOCS = $(DESTDIR)/usr/share/doc/album-data
+DOCSTH = $(DOCS)/themes
AD_PATH = $(DESTDIR)/usr/share/album-data
LANGS = $(AD_PATH)/lang
PLUGINS = $(AD_PATH)/plugins
THEMES = $(AD_PATH)/Themes
-clean:
+clean:
dh_testdir
dh_testroot
rm -rf lang License.txt plugins Themes WWW
@@ -18,19 +20,42 @@
install:
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
- tar -xvzf data-4.03.tar.gz
+ tar -xvzf data-*.tar.gz
cp -a lang plugins Themes $(AD_PATH)
- find $(AD_PATH) -type f | egrep -v '(banner|\.pl)' | xargs chmod 644
- find $(THEMES) | egrep '(Thumbs.db|\.DS_Store)' | xargs rm -f
- find $(THEMES) | grep CVS | xargs rm -rf
- find $(THEMES) | egrep '(LICENSE|COPYING)' | xargs rm -f
+ find $(AD_PATH) -type f -not -name banner -and -not -name .pl -exec chmod 644 "{}" \;
+ find $(THEMES) -name "Thumbs.db" -delete -or -name ".DS_Store" -delete -or \
+ -name LICENSE -delete -or -name COPYING -delete -or -name thumb.jpg -delete
+ find $(THEMES) -name CVS -prune -exec rm -rf {} \;
+ for dirstheme in `ls -A $(THEMES)|tr [A-Z] [a-z]` w_peterman.old; do \
+ mkdir $(DOCSTH)/$$dirstheme; \
+ done
+ for readtheme in `find $(THEMES)|grep -i readme`; do \
+ readthemename=`echo $$readtheme|sed 's/Themes\/\|\/readme/;/gi'|cut -d";" -f2|tr '/[A-Z]' '.[a-z]'`; \
+ mv $$readtheme $(DOCSTH)/$$readthemename/README; \
+ done
+ for credittheme in `find $(THEMES)|grep -i credit`; do \
+ creditthemename=`echo $$credittheme|sed 's/Themes\/\|\/credit/;/gi'|cut -d";" -f2|tr '/[A-Z]' '.[a-z]'`; \
+ mv $$credittheme $(DOCSTH)/$$creditthemename/CREDIT; \
+ done
+ for snapshottheme in `find $(THEMES)|grep -i snapshot.jpg`; do \
+ snapshotthemename=`echo $$snapshottheme|sed 's/Themes\/\|\/snapshot.jpg/;/gi'|cut -d";" -f2|tr '/[A-Z]' '.[a-z]'`; \
+ mv $$snapshottheme $(DOCSTH)/$$snapshotthemename/snapshot.jpg; \
+ done
+ for changelogtheme in `find $(THEMES)|grep -i changelog`; do \
+ changelogthemename=`echo $$changelogtheme|sed 's/Themes\/\|\/changelog/;/gi'|cut -d";" -f2|tr '/[A-Z]' '.[a-z]'`; \
+ mv $$changelogtheme $(DOCSTH)/$$changelogthemename/CHANGELOG; \
+ done
+ mv $(THEMES)/IFI_Emboss/USAGE $(DOCSTH)/ifi_emboss/
+ mv $(THEMES)/Uptight/NOTES $(DOCSTH)/uptight/
rm -rf $(PLUGINS)/captions/exif/exiftool/lib/File/tn
rm -f $(LANGS)/banner
rm -f $(THEMES)/Stars/custom_theme.zip
rm -rf $(THEMES)/Craftsman/src
- chmod 755 $(PLUGINS)/captions/exif/p
+ rm -rf $(THEMES)/AlfredsWorld/Gimp
+ rm -rf $(THEMES)/DropPurple/Other_Colors/XCF_GIMP_files
+ chmod 755 $(PLUGINS)/captions/exif/p $(PLUGINS)/captions/exif/exiftool.pl
binary-indep: install
dh_testdir
@@ -41,6 +66,7 @@
dh_installexamples debian/album-data.conf lang/banner
dh_compress -Xusr/share/doc/album-data/examples/banner
dh_fixperms
+ dh_lintian
dh_installdeb
dh_gencontrol
dh_md5sums
More information about the debian-br-team-commits
mailing list