xubuntu-dev team mailing list archive

[Steve Langasek <steve.langasek@xxxxxxxxxxxxx>]

Steve Langasek has proposed merging lp:~vorlon/xubuntu-default-settings/linaro-alip-default-settings into lp:~tom-gall/xubuntu-default-settings/linaro-alip-default-settings.

Requested reviews:
  Xubuntu Developers (xubuntu-dev)


Various minor cleanups that I'd like to see incorporated before upload to the linaro overlay ppa
-- 
https://code.launchpad.net/~vorlon/xubuntu-default-settings/linaro-alip-default-settings/+merge/37222
Your team Xubuntu Developers is requested to review the proposed merge of lp:~vorlon/xubuntu-default-settings/linaro-alip-default-settings into lp:~tom-gall/xubuntu-default-settings/linaro-alip-default-settings.

=== modified file 'debian/changelog'
--- debian/changelog	2010-09-29 02:30:45 +0000
+++ debian/changelog	2010-10-01 07:41:04 +0000
@@ -1,3 +1,11 @@
+linaro-alip-default-settings (10.10.6) UNRELEASED; urgency=low
+
+  * Correct various URIs inherited from xubuntu-default-settings.
+  * Update debian/copyright to use current DEP5 draft format instead of an
+    obsolete wiki draft.
+
+ -- Steve Langasek <steve.langasek@xxxxxxxxxx>  Fri, 01 Oct 2010 00:27:55 -0700
+
 linaro-alip-default-settings (10.10.5) maverick; urgency=low
 
   * add etc/gdm/custom.conf

=== modified file 'debian/control'
--- debian/control	2010-09-08 16:52:59 +0000
+++ debian/control	2010-10-01 07:41:04 +0000
@@ -6,7 +6,7 @@
 Standards-Version: 3.9.1
 Homepage: https://launchpad.net/linaro-alip-default-settings
 Vcs-Bzr: lp:~tom-gall/xubuntu-default-settings/linaro-alip-default-settings
-Vcs-Browser: http://bazaar.launchpad.net/~tom-gall/xubuntu-default-settings/linaro-alip-default-settings/trunk/files
+Vcs-Browser: http://bazaar.launchpad.net/~tom-gall/xubuntu-default-settings/linaro-alip-default-settings/files
 
 Package: linaro-alip-default-settings
 Architecture: all

=== modified file 'debian/copyright'
--- debian/copyright	2010-09-08 16:52:59 +0000
+++ debian/copyright	2010-10-01 07:41:04 +0000
@@ -1,14 +1,27 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
-Upstream-Name: Linaro-Alip Default Settings
-Upstream-Maintainer: Linaro Team <linaro-dev@xxxxxxxxxxxxxxxx>
-Upstream-Source: https://launchpad.net/linaro-default-settings
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Name: Linaro-Alip Default Settings
+Maintainer: Linaro Team <linaro-dev@xxxxxxxxxxxxxxxx>
 
 Files: *
-Copyright: Copyright 2010, Tom Gall, Linaro <tom.gall@xxxxxxxxxx>
-Copyright: Copyright 2007-2009, Cody A.W. Somerville <cody-somerville@xxxxxxxxxx>
-Copyright: Copyright 2007-2009, Lionel Le Folgoc <mrpouit@xxxxxxxxxx>
-Copyright: Copyright 2006-2008, Gauvain Pocentek <gauvainpocentek@xxxxxxxxxx>
-Copyright: Copyright 2005-2008, Jani Monoses <jani@xxxxxxxxxx>
+Copyright: 2010, Linaro Limited
+           2007-2009, Cody A.W. Somerville <cody-somerville@xxxxxxxxxx>
+           2007-2009, Lionel Le Folgoc <mrpouit@xxxxxxxxxx>
+           2006-2008, Gauvain Pocentek <gauvainpocentek@xxxxxxxxxx>
+           2005-2008, Jani Monoses <jani@xxxxxxxxxx>
 License: GPL-2+
+ This package 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; either version 2 of the License, or
+ (at your option) any later version.
+ 
+ This package 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.
+ 
+ You should have received a copy of the GNU General Public License
+ along with this package; 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 can be found
  in the `/usr/share/common-licenses/GPL' file.