[Pkg-sysvinit-commits] r1491 - in sysvinit/trunk/debian: . patches

[Petter Reinholdtsen]

Author: pere
Date: 2009-07-24 10:24:57 +0000 (Fri, 24 Jul 2009)
New Revision: 1491

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/patches/14_doc_fsf_addr.dpatch
Log:
Update patch 14_doc_fsf_addr to drop the parts now included upstream.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-07-24 10:16:35 UTC (rev 1490)
+++ sysvinit/trunk/debian/changelog	2009-07-24 10:24:57 UTC (rev 1491)
@@ -4,6 +4,7 @@
     - Update patch 10_doc_manuals to drop the parts now included upstream.
     - Drop patch 11_doc_mountpoint now included upstream.
     - Drop patch 13_doc_telinit now included upstream.
+    - Update patch 14_doc_fsf_addr to drop the parts now included upstream.
     - Drop patch 41_utmp_64bit now included upstream.
     - Drop patch 60_init_race now included upstream.
 

Modified: sysvinit/trunk/debian/patches/14_doc_fsf_addr.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/14_doc_fsf_addr.dpatch	2009-07-24 10:16:35 UTC (rev 1490)
+++ sysvinit/trunk/debian/patches/14_doc_fsf_addr.dpatch	2009-07-24 10:24:57 UTC (rev 1491)
@@ -1,22 +1,17 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 14_doc_fsf_addr.dpatch by Petter Reinholdtsen
+## 14_doc_fsf_addr.dpatch by Kel Modderman
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Update the address of FSF in the copyright file.
-## DP: Also refer to /usr/share/common-licenses/GPL-2 and not the
+## DP: Refer to /usr/share/common-licenses/GPL-2 and not the
 ## DP: versionless symlink /usr/share/common-licenses/GPL.
 
 @DPATCH@
 diff -urNad sysvinit~/COPYRIGHT sysvinit/COPYRIGHT
 --- sysvinit~/COPYRIGHT	2009-02-02 17:11:24.000000000 +1000
 +++ sysvinit/COPYRIGHT	2009-07-19 23:49:37.000000000 +1000
-@@ -12,8 +12,8 @@
+@@ -15,5 +15,5 @@
+     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  
-     You should have received a copy of the GNU General Public License
-     along with this program; if not, write to the Free Software
--    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+    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'.
 +Public License can be found in `/usr/share/common-licenses/GPL-2'.