Author: waldi
Date: Wed Dec 20 23:03:06 2006
New Revision: 8031

Modified:
   dists/trunk/linux-modules-contrib-2.6/debian/rules.real
   dists/trunk/linux-modules-extra-2.6/debian/rules.real
   dists/trunk/linux-modules-nonfree-2.6/debian/rules.real
Log:
debian/rules.real: Fix copyright installation.


Modified: dists/trunk/linux-modules-contrib-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-modules-contrib-2.6/debian/rules.real     (original)
+++ dists/trunk/linux-modules-contrib-2.6/debian/rules.real     Wed Dec 20 
23:03:06 2006
@@ -48,10 +48,11 @@
        $(MAKE) -C $(HEADERS_DIR) M=$(CURDIR)/$(DIR) $(JOBS_ARG)
        touch $@
 
+install-base: DH_OPTIONS = -p$(PACKAGE)
 install-base:
        dh_installchangelogs
        dh_installdocs
-       install -D -m 644 $(MODULE)/copyright 
debian/$(MODULE)-modules-$(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION)/usr/share/doc/$(MODULE)-modules-$(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION)/copyright
+       install -D -m 644 $(MODULE)/copyright 
debian/$(PACKAGE)/usr/share/doc/$(PACKAGE)/copyright
        dh_installmodules
        dh_compress
        dh_fixperms
@@ -75,9 +76,9 @@
        $(MAKE) -f debian/rules.real install
        $(MAKE) -f debian/rules.real install-base \
                
GENCONTROL_ARGS="-v$(VERSION_SOURCE)+$(MODULEVERSION)-$(VERSION_DEBIAN)" \
-               PACKAGE="$(PACKAGE_NAME)" DH_OPTIONS="-p$(PACKAGE_NAME)"
+               PACKAGE="$(PACKAGE_NAME)"
        $(MAKE) -f debian/rules.real install-base \
                GENCONTROL_ARGS="-v2:$(VERSION_SOURCE)-$(VERSION_DEBIAN)" \
-               PACKAGE="$(PACKAGE_LATEST_NAME)" 
DH_OPTIONS="-p$(PACKAGE_LATEST_NAME)"
+               PACKAGE="$(PACKAGE_LATEST_NAME)"
 
 -include $(MODULE)/rules

Modified: dists/trunk/linux-modules-extra-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-modules-extra-2.6/debian/rules.real       (original)
+++ dists/trunk/linux-modules-extra-2.6/debian/rules.real       Wed Dec 20 
23:03:06 2006
@@ -48,10 +48,11 @@
        $(MAKE) -C $(HEADERS_DIR) M=$(CURDIR)/$(DIR) $(JOBS_ARG)
        touch $@
 
+install-base: DH_OPTIONS = -p$(PACKAGE)
 install-base:
        dh_installchangelogs
        dh_installdocs
-       install -D -m 644 $(MODULE)/copyright 
debian/$(MODULE)-modules-$(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION)/usr/share/doc/$(MODULE)-modules-$(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION)/copyright
+       install -D -m 644 $(MODULE)/copyright 
debian/$(PACKAGE)/usr/share/doc/$(PACKAGE)/copyright
        dh_installmodules
        dh_compress
        dh_fixperms
@@ -75,9 +76,9 @@
        $(MAKE) -f debian/rules.real install
        $(MAKE) -f debian/rules.real install-base \
                
GENCONTROL_ARGS="-v$(VERSION_SOURCE)+$(MODULEVERSION)-$(VERSION_DEBIAN)" \
-               PACKAGE="$(PACKAGE_NAME)" DH_OPTIONS="-p$(PACKAGE_NAME)"
+               PACKAGE="$(PACKAGE_NAME)"
        $(MAKE) -f debian/rules.real install-base \
                GENCONTROL_ARGS="-v2:$(VERSION_SOURCE)-$(VERSION_DEBIAN)" \
-               PACKAGE="$(PACKAGE_LATEST_NAME)" 
DH_OPTIONS="-p$(PACKAGE_LATEST_NAME)"
+               PACKAGE="$(PACKAGE_LATEST_NAME)"
 
 -include $(MODULE)/rules

Modified: dists/trunk/linux-modules-nonfree-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-modules-nonfree-2.6/debian/rules.real     (original)
+++ dists/trunk/linux-modules-nonfree-2.6/debian/rules.real     Wed Dec 20 
23:03:06 2006
@@ -48,10 +48,11 @@
        $(MAKE) -C $(HEADERS_DIR) M=$(CURDIR)/$(DIR) $(JOBS_ARG)
        touch $@
 
+install-base: DH_OPTIONS = -p$(PACKAGE)
 install-base:
        dh_installchangelogs
        dh_installdocs
-       install -D -m 644 $(MODULE)/copyright 
debian/$(MODULE)-modules-$(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION)/usr/share/doc/$(MODULE)-modules-$(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION)/copyright
+       install -D -m 644 $(MODULE)/copyright 
debian/$(PACKAGE)/usr/share/doc/$(PACKAGE)/copyright
        dh_installmodules
        dh_compress
        dh_fixperms
@@ -75,9 +76,9 @@
        $(MAKE) -f debian/rules.real install
        $(MAKE) -f debian/rules.real install-base \
                
GENCONTROL_ARGS="-v$(VERSION_SOURCE)+$(MODULEVERSION)-$(VERSION_DEBIAN)" \
-               PACKAGE="$(PACKAGE_NAME)" DH_OPTIONS="-p$(PACKAGE_NAME)"
+               PACKAGE="$(PACKAGE_NAME)"
        $(MAKE) -f debian/rules.real install-base \
                GENCONTROL_ARGS="-v2:$(VERSION_SOURCE)-$(VERSION_DEBIAN)" \
-               PACKAGE="$(PACKAGE_LATEST_NAME)" 
DH_OPTIONS="-p$(PACKAGE_LATEST_NAME)"
+               PACKAGE="$(PACKAGE_LATEST_NAME)"
 
 -include $(MODULE)/rules

_______________________________________________
Kernel-svn-changes mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

Reply via email to