[Pkg-sysvinit-commits] r1751 - sysvinit/trunk/debian

Wed Sep 9 21:52:47 UTC 2009

Author: pere
Date: 2009-09-09 21:52:47 +0000 (Wed, 09 Sep 2009)
New Revision: 1751

Added:
   sysvinit/trunk/debian/copyright.in
Removed:
   sysvinit/trunk/debian/copyright
Modified:
   sysvinit/trunk/debian/rules
Log:
Only generate copyright file once.

Deleted: sysvinit/trunk/debian/copyright
===================================================================

--- sysvinit/trunk/debian/copyright	2009-09-09 21:44:05 UTC (rev 1750)
+++ sysvinit/trunk/debian/copyright	2009-09-09 21:52:47 UTC (rev 1751)
@@ -1,41 +0,0 @@
-This is the Debian GNU/Linux prepackaged version of System V Init.
-
-Init was written by Miquel van Smoorenburg <miquels at cistron.nl>.
-
-This package was first put together by Bruce Perens <Bruce at Pixar.com>
-from pre-distribution sources. Ian Murdock <imurdock at debian.org>
-integrated it into the base system maintained it until the end of 1995.
-Miquel van Smoorenburg <miquels at cistron.nl> implemented Debian support.
-In version 2.85 the package was split into three (sysvinit, sysv-rc,
-and initscripts) in order to make room for alternative rc mechanisms.
-
-The upstream source is available at:
-
-Primary-Site:   ftp.cistron.nl /pub/people/miquels/software
-                92K sysvinit-2.86.tar.gz
-Alternate-Site: sunsite.unc.edu /pub/Linux/system/daemons/init
-                92K sysvinit-2.86.tar.gz
-
-The sysvinit package in Debian is maintained as an alioth project.
-The project page is http://alioth.debian.org/projects/pkg-sysvinit/.
-
-Copyright 1997-2005 Miquel van Smoorenburg <miquels at cistron.nl> and
-the members pkg-sysvinit project.
-
-    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; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program 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 program; 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'.

Copied: sysvinit/trunk/debian/copyright.in (from rev 1717, sysvinit/trunk/debian/copyright)
===================================================================
--- sysvinit/trunk/debian/copyright.in	                        (rev 0)
+++ sysvinit/trunk/debian/copyright.in	2009-09-09 21:52:47 UTC (rev 1751)
@@ -0,0 +1,41 @@
+This is the Debian GNU/Linux prepackaged version of System V Init.
+
+Init was written by Miquel van Smoorenburg <miquels at cistron.nl>.
+
+This package was first put together by Bruce Perens <Bruce at Pixar.com>
+from pre-distribution sources. Ian Murdock <imurdock at debian.org>
+integrated it into the base system maintained it until the end of 1995.
+Miquel van Smoorenburg <miquels at cistron.nl> implemented Debian support.
+In version 2.85 the package was split into three (sysvinit, sysv-rc,
+and initscripts) in order to make room for alternative rc mechanisms.
+
+The upstream source is available at:
+
+Primary-Site:   ftp.cistron.nl /pub/people/miquels/software
+                92K sysvinit-2.86.tar.gz
+Alternate-Site: sunsite.unc.edu /pub/Linux/system/daemons/init
+                92K sysvinit-2.86.tar.gz
+
+The sysvinit package in Debian is maintained as an alioth project.
+The project page is http://alioth.debian.org/projects/pkg-sysvinit/.
+
+Copyright 1997-2005 Miquel van Smoorenburg <miquels at cistron.nl> and
+the members pkg-sysvinit project.
+
+    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; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program 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 program; 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'.

Modified: sysvinit/trunk/debian/rules
===================================================================
--- sysvinit/trunk/debian/rules	2009-09-09 21:44:05 UTC (rev 1750)
+++ sysvinit/trunk/debian/rules	2009-09-09 21:52:47 UTC (rev 1751)
@@ -74,6 +74,8 @@
 	$(MAKE) -C src $(CROSS) ROOT=$(tmp) DISTRO=Debian install
 	dh_install
 	dh_link
+	# Used by sysvinit and sysvinit-utils
+	cat debian/copyright.in COPYRIGHT > debian/copyright
 	#
 	# sysvinit package
 	#
@@ -98,9 +100,6 @@
 	rm -f $(sysvtmp)/sbin/halt
 	rm -f $(sysvtmp)/sbin/reboot
 endif
-	$(INSTALL_DATA) debian/copyright \
-		$(sysvtmp)$(doc)/sysvinit/copyright
-	cat COPYRIGHT >> $(sysvtmp)$(doc)/sysvinit/copyright
 	dh_installchangelogs -psysvinit doc/Changelog
 	dh_installdeb -psysvinit
 	dh_shlibdeps -psysvinit $(sysvtmp)/sbin/init
@@ -108,9 +107,6 @@
 	# sysvinit-utils package
 	#
 	$(MAKE) $(CROSS) -C debian/startpar DESTDIR=$(utiltmp) install
-	$(INSTALL_DATA) debian/copyright \
-		$(utiltmp)$(doc)/sysvinit-utils/copyright
-	cat COPYRIGHT >> $(utiltmp)$(doc)/sysvinit-utils/copyright
 	dh_installchangelogs -psysvinit-utils doc/Changelog
 	dh_shlibdeps -psysvinit-utils $(utiltmp)/sbin//init debian/$(utiltmp)/sbin/startpar
 	#
@@ -135,6 +131,7 @@
 
 	# Wrap it all up
 	dh_installman -a
+	dh_installdocs -a
 	dh_lintian -a
 	dh_strip -a
 	dh_compress -a
@@ -173,7 +170,7 @@
 	$(MAKE) -C src clobber
 	$(MAKE) -C debian/startpar clean
 	$(MAKE) -f debian/rules unpatch
-	dh_clean build-stamp debian/readlink
+	dh_clean build-stamp debian/readlink debian/copyright
 
 binary: binary-arch binary-indep
 


