[Python-apps-commits] r9065 - in packages/alot/trunk/debian (4 files)

Sat Aug 25 15:24:41 UTC 2012

Date: Saturday, August 25, 2012 @ 15:24:40
  Author: laarmen-guest
Revision: 9065

 * d/control: Fix versioned dependency on notmuch and add version on other deps.
 * d/rules: Fix the script installation and install the NEWS file as a changelog
 * d/copyright: Change the global license to GPL-3+ instead of GPL-3 and add specific copyright/license for extra/colour_picker.py

Modified:
  packages/alot/trunk/debian/alot.docs
  packages/alot/trunk/debian/control
  packages/alot/trunk/debian/copyright
  packages/alot/trunk/debian/rules

Modified: packages/alot/trunk/debian/alot.docs
===================================================================

--- packages/alot/trunk/debian/alot.docs	2012-08-25 07:43:13 UTC (rev 9064)
+++ packages/alot/trunk/debian/alot.docs	2012-08-25 15:24:40 UTC (rev 9065)
@@ -1,2 +1 @@
 README.md
-NEWS

Modified: packages/alot/trunk/debian/control
===================================================================
--- packages/alot/trunk/debian/control	2012-08-25 07:43:13 UTC (rev 9064)
+++ packages/alot/trunk/debian/control	2012-08-25 15:24:40 UTC (rev 9065)
@@ -7,8 +7,7 @@
  debhelper (>= 9),
  python (>= 2.7),
  python-sphinx (>= 1.0.7+dfsg),
- python-configobj,
- python-pyme
+ python-configobj
 X-Python-Version: >= 2.7
 Standards-Version: 3.9.3
 Homepage: http://github.com/pazz/alot/
@@ -22,9 +21,9 @@
  ${python:Depends},
  python-notmuch (>= 0.12),
  python-magic,
- python-configobj,
- python-twisted,
- python-pyme,
+ python-configobj (>= 4.6.0),
+ python-twisted (>= 10.2.0),
+ python-gpgme,
  python-urwid (>= 1.0)
 Suggests: alot-doc
 Description: Text mode MUA using notmuch mail

Modified: packages/alot/trunk/debian/copyright
===================================================================
--- packages/alot/trunk/debian/copyright	2012-08-25 07:43:13 UTC (rev 9064)
+++ packages/alot/trunk/debian/copyright	2012-08-25 15:24:40 UTC (rev 9065)
@@ -5,25 +5,38 @@
 
 Files: *
 Copyright: 2011-2012, Patrick Totzke <patricktotzke at gmail.com>
-License: GPL-3
+License: GPL-3+
 
+Files: extra/colour_picker.py
+Copyright: 2004-2009 Ian Ward
+License: LGPL-2.1+
+
 Files: debian/*
 Copyright: 2012,      Simon Chopin <chopin.simon at gmail.com>
-License: GPL-3
+License: GPL-3+
 
-License: GPL-3
- This program 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, at the version 3.
+License: GPL-3+
+ This file is released under the GNU GPL, version 3 or a later revision.
+ For further details see the COPYING file.
  .
- This program is distributed in the hope that it will be useful,
+ On Debian systems, the full text of the GNU General Public
+ License version 3 can be found in the file
+ `/usr/share/common-licenses/GPL-3'.
+
+License: LGPL-2.1+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This library 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.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
  .
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  .
- On Debian systems, the full text of the GNU General Public
- License version 3 can be found in the file
- `/usr/share/common-licenses/GPL-3'.
+ On Debian systems, the full text of the GNU Lesser General Public License
+ version 2.1 can be found in the file `/usr/share/common-licenses/LGPL-2.1`

Modified: packages/alot/trunk/debian/rules
===================================================================
--- packages/alot/trunk/debian/rules	2012-08-25 07:43:13 UTC (rev 9064)
+++ packages/alot/trunk/debian/rules	2012-08-25 15:24:40 UTC (rev 9065)
@@ -6,16 +6,19 @@
 override_dh_auto_build:
 	dh_auto_build
 	rm -rf $(CURDIR)/docs/build
-	$(MAKE) -C docs html man # The HTML generation seem to fail at generating a searchable index
+	$(MAKE) -C docs html man
 
 override_dh_auto_install:
 	dh_auto_install -- --install-lib=/usr/share/alot/
 
 override_dh_install:
 	dh_install
-	mkdir debian/alot/usr/share/alot/bin/
-	mv debian/alot/usr/bin/alot debian/alot/usr/share/alot/bin/
-	dh_link -palot /usr/share/alot/bin/alot /usr/bin/alot
+	mv debian/alot/usr/bin/alot debian/alot/usr/share/alot/alot.bin
+	dh_link -palot /usr/share/alot/alot.bin /usr/bin/alot
+	# install the NEWS file as a changelog
+	mkdir -p debian/alot/usr/share/doc/alot/ debian/alot-doc/usr/share/doc/alot-doc/
+	cp NEWS debian/alot/usr/share/doc/alot/changelog
+	cp NEWS debian/alot-doc/usr/share/doc/alot-doc/changelog
 
 override_dh_compress:
 	dh_compress -X.html -X.txt


