[DebianBRTeam-commits] r582 - in /packages/album/trunk/debian: README.source changelog control copyright dirs docs patches/ patches/00list patches/01_album.1.dpatch rules

eriberto-guest at users.alioth.debian.org eriberto-guest at users.alioth.debian.org
Wed Jan 13 15:39:56 UTC 2010 

Author: eriberto-guest
Date: Wed Jan 13 15:39:54 2010
New Revision: 582

URL: http://svn.debian.org/wsvn/?sc=1&rev=582
Log:
  * New upstream release
  * Added debian/README.source file.
  * Remade the patch 01.
  * debian/control:
      - Added ${misc:Depends} as dependency.
      - Updated Standards-Version from 3.8.0 to 3.8.3.
  * debian/copyright: updated program and packaging dates.
  * debian/docs: removed because hlml files listed are an Album website clone.
  * debian/rules:
      - Cancelled procedures to adjust the documentation because it was removed.
      - Changed from dh_clean -k to dh_prep.


Added:
    packages/album/trunk/debian/README.source
    packages/album/trunk/debian/patches/
    packages/album/trunk/debian/patches/00list
    packages/album/trunk/debian/patches/01_album.1.dpatch
Removed:
    packages/album/trunk/debian/docs
Modified:
    packages/album/trunk/debian/changelog
    packages/album/trunk/debian/control
    packages/album/trunk/debian/copyright
    packages/album/trunk/debian/dirs
    packages/album/trunk/debian/rules

Added: packages/album/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/packages/album/trunk/debian/README.source?rev=582&op=file
==============================================================================
--- packages/album/trunk/debian/README.source (added)
+++ packages/album/trunk/debian/README.source Wed Jan 13 15:39:54 2010
@@ -1,0 +1,2 @@
+This package uses dpatch to fix some errors.
+To know more about dpatch, see /usr/share/doc/dpatch/README.source.gz file.

Modified: packages/album/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/packages/album/trunk/debian/changelog?rev=582&op=diff
==============================================================================
--- packages/album/trunk/debian/changelog (original)
+++ packages/album/trunk/debian/changelog Wed Jan 13 15:39:54 2010
@@ -1,10 +1,18 @@
+album (4.06-1) unstable; urgency=low
 
-album (4.04-4) UNRELEASED; urgency=low
+  * New upstream release
+  * Added debian/README.source file.
+  * Remade the patch 01.
+  * debian/control:
+      - Added ${misc:Depends} as dependency.
+      - Updated Standards-Version from 3.8.0 to 3.8.3.
+  * debian/copyright: updated program and packaging dates.
+  * debian/docs: removed because hlml files listed are an Album website clone.
+  * debian/rules:
+      - Cancelled procedures to adjust the documentation because it was removed.
+      - Changed from dh_clean -k to dh_prep.
 
-  * Undo the change from extra to optional in debian/control. The FTP Master
-    Team considers it the best option for this package.
-
- -- Joao Eriberto Mota Filho <eriberto at eriberto.pro.br>  Wed, 02 Jul 2008 19:02:05 -0300
+ -- Joao Eriberto Mota Filho <eriberto at eriberto.pro.br>  Wed, 06 Jan 2010 17:27:59 -0200
 
 album (4.04-3) unstable; urgency=low
 
@@ -64,9 +72,9 @@
   * Added debian/compat file.
   * Added debian/watch file.
   * Added the upstream changelog obtained from program website.
-  
+
  -- Joao Eriberto Mota Filho <eriberto at eriberto.pro.br>  Sun, 18 Nov 2007 09:53:42 -0200
- 
+
 album (3.04-2.1) unstable; urgency=low
 
   * Non-maintainer upload to fix longstanding l10n and debconf-related issues

Modified: packages/album/trunk/debian/control
URL: http://svn.debian.org/wsvn/packages/album/trunk/debian/control?rev=582&op=diff
==============================================================================
--- packages/album/trunk/debian/control (original)
+++ packages/album/trunk/debian/control Wed Jan 13 15:39:54 2010
@@ -1,16 +1,16 @@
 Source: album
 Section: non-free/web
-Priority: extra
+Priority: optional
 Maintainer: Joao Eriberto Mota Filho <eriberto at eriberto.pro.br>
 Build-Depends: debhelper (>= 7), dpatch
-Standards-Version: 3.8.0
+Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/svn/debian-br-team/packages/album
 Vcs-Browser: http://svn.debian.org/wsvn/debian-br-team/packages/album
 Homepage: http://marginalhacks.com/Hacks/album
 
 Package: album
 Architecture: all
-Depends: ${perl:Depends}, imagemagick
+Depends: ${misc:Depends}, ${perl:Depends}, imagemagick
 Suggests: apache2
 Recommends: album-data
 Description: HTML photo album generator with theme support

Modified: packages/album/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/packages/album/trunk/debian/copyright?rev=582&op=diff
==============================================================================
--- packages/album/trunk/debian/copyright (original)
+++ packages/album/trunk/debian/copyright Wed Jan 13 15:39:54 2010
@@ -7,7 +7,7 @@
 
 Upstream Author: David Ljung Madison <contactRequest at MarginalHacks.com>
 
-Copyright: (C) 2000-2008 David Ljung Madison
+Copyright: (C) 2000-2009 David Ljung Madison
 
 The author requests that you please visit http://MarginalHacks.com/Pay/
 for information about supporting his development efforts.
@@ -88,8 +88,8 @@
 
 About the Debian packaging:
   Copyright (C) 2002-2004 Elie Rosenblum <fnord at debian.org>
-  Copyright (C) 2007-2008 Joao Eriberto Mota Filho <eriberto at eriberto.pro.br>
-  The work is licensed under the GPL 2 or later.
+  Copyright (C) 2007-2010 Joao Eriberto Mota Filho <eriberto at eriberto.pro.br>
+  The work is licensed under the GPL 3 or later.
 
 On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'.
+Public License can be found in `/usr/share/common-licenses/'.

Modified: packages/album/trunk/debian/dirs
URL: http://svn.debian.org/wsvn/packages/album/trunk/debian/dirs?rev=582&op=diff
==============================================================================
--- packages/album/trunk/debian/dirs (original)
+++ packages/album/trunk/debian/dirs Wed Jan 13 15:39:54 2010
@@ -1,3 +1,2 @@
 usr/bin
 usr/share/man/man1
-usr/share/doc/album/translations

Added: packages/album/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/packages/album/trunk/debian/patches/00list?rev=582&op=file
==============================================================================
--- packages/album/trunk/debian/patches/00list (added)
+++ packages/album/trunk/debian/patches/00list Wed Jan 13 15:39:54 2010
@@ -1,0 +1,1 @@
+01_album.1.dpatch

Added: packages/album/trunk/debian/patches/01_album.1.dpatch
URL: http://svn.debian.org/wsvn/packages/album/trunk/debian/patches/01_album.1.dpatch?rev=582&op=file
==============================================================================
--- packages/album/trunk/debian/patches/01_album.1.dpatch (added)
+++ packages/album/trunk/debian/patches/01_album.1.dpatch Wed Jan 13 15:39:54 2010
@@ -1,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_album.1.dpatch by Joao Eriberto Mota Filho <eriberto at eriberto.pro.br>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix album.1.
+
+ at DPATCH@
+diff -urNad album-4.06~/album.1 album-4.06/album.1
+--- album-4.06~/album.1	2010-01-06 18:14:33.000000000 -0200
++++ album-4.06/album.1	2010-01-06 18:15:36.000000000 -0200
+@@ -129,6 +129,7 @@
+ .\" way too many mistakes in technical documents.
+ .if n .ad l
+ .nh
++.SH "NAME"
+ album \- Make a web photo album
+ .SH "SYNOPSIS"
+ .IX Header "SYNOPSIS"
+@@ -594,9 +595,3 @@
+ .SH "AUTHOR"
+ .IX Header "AUTHOR"
+ David Ljung Madison <http://MarginalHacks.com/>
+-.SH "POD ERRORS"
+-.IX Header "POD ERRORS"
+-Hey! \fBThe above document had some coding errors, which are explained below:\fR
+-.IP "Around line 7193:" 4
+-.IX Item "Around line 7193:"
+-=pod directives shouldn't be over one line long!  Ignoring all 2 lines of content

Modified: packages/album/trunk/debian/rules
URL: http://svn.debian.org/wsvn/packages/album/trunk/debian/rules?rev=582&op=diff
==============================================================================
--- packages/album/trunk/debian/rules (original)
+++ packages/album/trunk/debian/rules Wed Jan 13 15:39:54 2010
@@ -6,10 +6,7 @@
 
 include /usr/share/dpatch/dpatch.make
 
-# Define variables
-DESTDIR =	$(CURDIR)/debian/album
-DOCS =		$(DESTDIR)/usr/share/doc/album
-LANGS =		de fr it nl
+DESTDIR = $(CURDIR)/debian/album
 
 clean: unpatch
 	dh_testdir
@@ -19,25 +16,17 @@
 install: patch-stamp
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 	cp album $(DESTDIR)/usr/bin
 	dh_installdocs
-#	Adjust the documentation
-	cp -a Docs/txt* Docs/make_docs Docs/messages_8 Docs/conf $(DOCS)/translations
-	for i in $(LANGS); \
-	do \
-	    mkdir $(DOCS)/translations/$${i}; \
-	    mv $(DOCS)/$${i}/conf $(DOCS)/$${i}/txt* $(DOCS)/translations/$${i}; \
-	done
-	rm -f $(DOCS)/fr/=.txt_2
 
 binary-indep: install
 	dh_testdir
 	dh_testroot
 	dh_installman album.1
 	dh_installchangelogs CHANGELOG
-	dh_compress -Xtxt -Xmessages
+	dh_compress
 	dh_fixperms
 	dh_installdeb
 	dh_perl

More information about the debian-br-team-commits mailing list