[Python-apps-commits] r5866 - in packages/scribes/trunk/debian (7 files)

cds-guest at users.alioth.debian.org cds-guest at users.alioth.debian.org
Wed Jul 21 03:58:46 UTC 2010


    Date: Wednesday, July 21, 2010 @ 03:58:43
  Author: cds-guest
Revision: 5866

[svn-inject] Applying Debian modifications (0.4~r543-2) to trunk

Added:
  packages/scribes/trunk/debian/patches/03_sysconfdir.patch
Modified:
  packages/scribes/trunk/debian/changelog
  packages/scribes/trunk/debian/control
  packages/scribes/trunk/debian/copyright
  packages/scribes/trunk/debian/patches/01_gnomeprint_check.patch
  packages/scribes/trunk/debian/patches/02_gnome_check.patch
  packages/scribes/trunk/debian/patches/series

Modified: packages/scribes/trunk/debian/changelog
===================================================================
--- packages/scribes/trunk/debian/changelog	2010-07-20 20:31:04 UTC (rev 5865)
+++ packages/scribes/trunk/debian/changelog	2010-07-21 03:58:43 UTC (rev 5866)
@@ -1,3 +1,16 @@
+scribes (0.4~r543-2) unstable; urgency=low
+
+  * New maintainer (Closes: #587934)
+  * Updated Standards-Version to 3.9.0
+  * debian/copyright:
+    + Make copyright file DEP5 compliant
+  * debian/patches:
+    + Added subject and author - DEP3 compliant
+  * debian/patches/03_sysconfdir.patch:
+    + sysconfdir is /etc, not /usr/etc
+
+ -- Chris Silva <racerx at makeworld.com>  Tue, 20 Jul 2010 21:22:21 -0500
+
 scribes (0.4~r543-1) unstable; urgency=low
 
   * New upstream snapshost.

Modified: packages/scribes/trunk/debian/control
===================================================================
--- packages/scribes/trunk/debian/control	2010-07-20 20:31:04 UTC (rev 5865)
+++ packages/scribes/trunk/debian/control	2010-07-21 03:58:43 UTC (rev 5866)
@@ -1,7 +1,7 @@
 Source: scribes
 Section: editors
 Priority: optional
-Maintainer: Emilio Pozuelo Monfort <pochu at debian.org>
+Maintainer: Chris Silva <racerx at makeworld.com>
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 7.0.50~)
 Build-Depends-Indep: autotools-dev,
@@ -16,7 +16,7 @@
                      python-gtksourceview2,
                      scrollkeeper,
                      yelp (>= 2.12)
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 Homepage: http://scribes.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/python-apps/packages/scribes/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/scribes/trunk/

Modified: packages/scribes/trunk/debian/copyright
===================================================================
--- packages/scribes/trunk/debian/copyright	2010-07-20 20:31:04 UTC (rev 5865)
+++ packages/scribes/trunk/debian/copyright	2010-07-21 03:58:43 UTC (rev 5866)
@@ -1,39 +1,34 @@
-This package was debianized by Emilio Pozuelo Monfort <pochu at ubuntu.com> on
-Wed,  9 May 2007 22:19:43 +0200.
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Name: scribes
+Maintainer: Chris Silva <racerx at makeworld.com>
+Source: http://scribes.sourceforge.net/download.html
+Upsteam author: Lateef Alabi-Oki <mystilleef at gmail.com>
 
-It was downloaded from http://scribes.sourceforge.net/download.html
+Files: *
+Copyright: © 2005-2007, Lateef Alabi-Oki <mystilleef at gmail.com>
+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; version 2 dated June, 1991.
+ .
+ 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 GNU/Linux systems, the complete text of the GNU General Public
+ License can be found in `/usr/share/common-licenses/GPL-2'.
 
-Upstream Author:
+Files: help/C/*
+Copyright: © 2005, Lateef Alabi-Oki <mystilleef at gmail.com>
+License: GFDL
 
-    Lateef Alabi-Oki <mystilleef at gmail.com>
-
-Copyright: 
-
-    Copyright (C) 2005-2007 Lateef Alabi-Oki
-
-License:
-
-    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 complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'.
-
-The Debian packaging is Copyright (C) 2007-2009 Emilio Pozuelo Monfort <pochu at ubuntu.com> and
-is licensed under the GPL, see above.
-
-The documentation is licensed under the GNU General Free Documentation License
-(GFDL), with permissions granted to copy, distribute and/or modify it under
-terms of that license. The complete license can be found
-in `/usr/share/common-licenses/GFDL-1.2'.
+Files: debian/*
+Copyright: © 2005-2007, Lateef Alabi-Oki <mystilleef at gmail.com>,
+           © 2007-2009, Emilio Pozuelo Monfort <pochu at ubuntu.com>,
+           © 2009-2010, Emilio Pozuelo Monfort <pochu at debian.org>,
+           © 2010, Chris Silva <racerx at makeworld.com>
+License: GPL-2

Modified: packages/scribes/trunk/debian/patches/01_gnomeprint_check.patch
===================================================================
--- packages/scribes/trunk/debian/patches/01_gnomeprint_check.patch	2010-07-20 20:31:04 UTC (rev 5865)
+++ packages/scribes/trunk/debian/patches/01_gnomeprint_check.patch	2010-07-21 03:58:43 UTC (rev 5866)
@@ -1,3 +1,5 @@
+Subject: Gnome Python Desktop Check
+Author: Emilio Pozuelo Monfort <pochu at debian.org>
 --- a/depcheck.py
 +++ b/depcheck.py
 @@ -61,13 +61,6 @@

Modified: packages/scribes/trunk/debian/patches/02_gnome_check.patch
===================================================================
--- packages/scribes/trunk/debian/patches/02_gnome_check.patch	2010-07-20 20:31:04 UTC (rev 5865)
+++ packages/scribes/trunk/debian/patches/02_gnome_check.patch	2010-07-21 03:58:43 UTC (rev 5866)
@@ -1,3 +1,5 @@
+Subject: Gnome Python Check
+Author: Emilio Pozuelo Monfort <pochu at debian.org>
 --- a/SCRIBES/CommandLineInfo.py
 +++ b/SCRIBES/CommandLineInfo.py
 @@ -15,8 +15,6 @@

Added: packages/scribes/trunk/debian/patches/03_sysconfdir.patch
===================================================================
--- packages/scribes/trunk/debian/patches/03_sysconfdir.patch	                        (rev 0)
+++ packages/scribes/trunk/debian/patches/03_sysconfdir.patch	2010-07-21 03:58:43 UTC (rev 5866)
@@ -0,0 +1,13 @@
+Subject: Correct path for sysconfdir
+Author: Chris Silva <racerx at makeworld.com>
+--- scribes-0.4~r543.orig/SCRIBES/Globals.py
++++ scribes-0.4~r543/SCRIBES/Globals.py
+@@ -23,7 +23,7 @@ name = "scribes"
+ prefix = "/usr"
+ executable_path = join(prefix, "bin")
+ data_path = "/usr/share"
+-sysconfdir = "/usr/etc"
++sysconfdir = "/etc"
+ data_folder = join(data_path, "scribes")
+ core_plugin_folder = join(data_folder, "plugins")
+ core_language_plugin_folder = join(data_folder, "LanguagePlugins")

Modified: packages/scribes/trunk/debian/patches/series
===================================================================
--- packages/scribes/trunk/debian/patches/series	2010-07-20 20:31:04 UTC (rev 5865)
+++ packages/scribes/trunk/debian/patches/series	2010-07-21 03:58:43 UTC (rev 5866)
@@ -1,2 +1,3 @@
 01_gnomeprint_check.patch
 02_gnome_check.patch
+03_sysconfdir.patch




More information about the Python-apps-commits mailing list