Author: aurel32
Date: 2009-07-26 18:01:48 +0000 (Sun, 26 Jul 2009)
New Revision: 3683
Added:
glibc-package/branches/multiarch/debian/debhelper.in/glibc-doc.install
Removed:
glibc-package/branches/multiarch/debian/debhelper.in/glibc-doc.docs
Modified:
glibc-package/branches/multiarch/debian/rules.d/debhelper.mk
Log:
Merge from trunk
Deleted: glibc-package/branches/multiarch/debian/debhelper.in/glibc-doc.docs
===================================================================
--- glibc-package/branches/multiarch/debian/debhelper.in/glibc-doc.docs
2009-07-26 17:59:54 UTC (rev 3682)
+++ glibc-package/branches/multiarch/debian/debhelper.in/glibc-doc.docs
2009-07-26 18:01:48 UTC (rev 3683)
@@ -1,4 +0,0 @@
-ChangeLog*
-nptl/ChangeLog*
-nptl_db/ChangeLog*
-ports/ChangeLog*
Added: glibc-package/branches/multiarch/debian/debhelper.in/glibc-doc.install
===================================================================
--- glibc-package/branches/multiarch/debian/debhelper.in/glibc-doc.install
(rev 0)
+++ glibc-package/branches/multiarch/debian/debhelper.in/glibc-doc.install
2009-07-26 18:01:48 UTC (rev 3683)
@@ -0,0 +1,4 @@
+ChangeLog* /usr/share/doc/glibc-doc
+nptl/ChangeLog* /usr/share/doc/glibc-doc/nptl
+nptl_db/ChangeLog* /usr/share/doc/glibc-doc/nptl_db
+ports/ChangeLog* /usr/share/doc/glibc-doc/ports
Modified: glibc-package/branches/multiarch/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/branches/multiarch/debian/rules.d/debhelper.mk
2009-07-26 17:59:54 UTC (rev 3682)
+++ glibc-package/branches/multiarch/debian/rules.d/debhelper.mk
2009-07-26 18:01:48 UTC (rev 3683)
@@ -40,7 +40,11 @@
dh_installman -p$(curpass)
dh_installinfo -p$(curpass)
dh_installdebconf -p$(curpass)
- dh_installchangelogs -p$(curpass) debian/changelog.upstream
+ if [ $(curpass) = glibc-doc ] ; then \
+ dh_installchangelogs -p$(curpass) ; \
+ else ; \
+ dh_installchangelogs -p$(curpass) debian/changelog.upstream ; \
+ fi
dh_installinit -p$(curpass)
dh_installdocs -p$(curpass)
dh_link -p$(curpass)
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
