Changeset 32014 in vbox

Timestamp:

Aug 26, 2010 7:21:32 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

65264

Message:

deb: fixes

Location:

trunk

Files:

trunk/debian/rules

-              r32007
+              r32014
 arch     := $(shell dpkg --print-architecture)
 verfile  := $(builddir)/version-generated.mk
 ose      := 1
+ose      := $(if $(OSE),1,$(if $(wildcard $(vboxroot)/src/VBox/RDP/server),,1))
 svnrev   := 0
 NOMODS   ?= $(ose)
 …
         for i in rdesktop-vrdp.tar.gz additions/VBoxGuestAdditions.iso; do \
             mv $(archdir)/$$i $(prefix)/usr/share/$(package); done
-        rmdir $(archdir)/additions
         if [ -d $(archdir)/accessible ]; then mv $(archdir)/accessible $(prefix)/usr/lib/virtualbox; fi
 else
+        dh_installdocs
+endif
+        dh_installdocs \
+            $(archdir)/UserManual*.pdf
+        rm $(addprefix $(archdir)/,UserManual*.pdf)
+        for i in additions/VBoxGuestAdditions.iso; do \
+            mv $(archdir)/$$i $(prefix)/usr/share/$(package); done
+endif
+        rmdir $(archdir)/additions
         rmdir $(archdir)
         rmdir $(prefix)/opt

-              r32008
+              r32014
 arch     := $(shell dpkg --print-architecture)
 verfile  := $(builddir)/version-generated.mk
 ose      := $(if $(OSE),1,$(if $(wildcard $(vboxroot)/src/VBox/Devices/USB),,1))
+ose      := $(if $(OSE),1,$(if $(wildcard $(vboxroot)/src/VBox/RDP/server),,1))
 -include $(vboxroot)/SVN_REVISION
 svnrev   :=$(if $(svn_revision),$(svn_revision),0)
 …
         $(if $(HEADLESS),,mv $(archdir)/rdesktop-vrdp $(prefix)/usr/bin)
         $(if $(HEADLESS),,mv $(archdir)/rdesktop-vrdp-keymaps $(prefix)/usr/share/$(package))
-        rmdir $(archdir)/additions
         if [ -d $(archdir)/accessible ]; then mv $(archdir)/accessible $(prefix)/usr/lib/virtualbox; fi
 else
+        dh_installdocs
+endif
+        dh_installdocs \
+            $(archdir)/UserManual*.pdf
+        rm $(addprefix $(archdir)/,UserManual*.pdf)
+        for i in additions/VBoxGuestAdditions.iso; do \
+            mv $(archdir)/$$i $(prefix)/usr/share/$(package); done
+endif
+        rmdir $(archdir)/additions
         rmdir $(archdir)
         rmdir $(prefix)/opt

Note: See TracChangeset for help on using the changeset viewer.