[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r3679 - in glibc-package/trunk/debian: . rules.d



Author: aurel32
Date: 2009-07-26 17:13:51 +0000 (Sun, 26 Jul 2009)
New Revision: 3679

Added:
   glibc-package/trunk/debian/changelog.upstream
Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/rules.d/debhelper.mk
Log:
  * Move all upstream changelogs in glibc-docs, and install a small
    changelog file explaining the reason.



Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog	2009-07-26 17:04:04 UTC (rev 3678)
+++ glibc-package/trunk/debian/changelog	2009-07-26 17:13:51 UTC (rev 3679)
@@ -11,9 +11,10 @@
     irrelevant for an already built GNU libc.
   * Move /usr/share/doc/libc6/{CONFORMANCE,NAMESPACE,NOTES}.gz to
     libc6-dev.
-  * Ship more changelogs in glibc-docs. 
+  * Move all upstream changelogs in glibc-docs, and install a small
+    changelog file explaining the reason.
 
- -- Aurelien Jarno <aurel32@debian.org>  Sun, 26 Jul 2009 19:03:53 +0200
+ -- Aurelien Jarno <aurel32@debian.org>  Sun, 26 Jul 2009 19:10:52 +0200
 
 eglibc (2.9-22) unstable; urgency=low
 

Added: glibc-package/trunk/debian/changelog.upstream
===================================================================
--- glibc-package/trunk/debian/changelog.upstream	                        (rev 0)
+++ glibc-package/trunk/debian/changelog.upstream	2009-07-26 17:13:51 UTC (rev 3679)
@@ -0,0 +1,3 @@
+The upstream changelog being composed of multiple files with a total size
+of more than 1.5MB, they are provided by the glibc-doc package in the
+/usr/share/doc/glibc-doc/ directory.

Modified: glibc-package/trunk/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/debhelper.mk	2009-07-26 17:04:04 UTC (rev 3678)
+++ glibc-package/trunk/debian/rules.d/debhelper.mk	2009-07-26 17:13:51 UTC (rev 3679)
@@ -18,8 +18,6 @@
 
 # Some per-package extra files to install.
 define $(libc)_extra_debhelper_pkg_install
-	install --mode=0644 ChangeLog debian/$(curpass)/usr/share/doc/$(curpass)/changelog
-	install --mode=0644 nptl/ChangeLog debian/$(curpass)/usr/share/doc/$(curpass)/ChangeLog.nptl
 	# dh_installmanpages thinks that .so is a language.
 	install --mode=0644 debian/local/manpages/ld.so.8 debian/$(curpass)/usr/share/man/man8/ld.so.8
 endef
@@ -42,7 +40,7 @@
 	dh_installman -p$(curpass)
 	dh_installinfo -p$(curpass)
 	dh_installdebconf -p$(curpass)
-	dh_installchangelogs -p$(curpass)
+	dh_installchangelogs -p$(curpass) debian/changelog.upstream
 	dh_installinit -p$(curpass)
 	dh_installdocs -p$(curpass) 
 	dh_link -p$(curpass)


Reply to: