CVS:oo-deb/debian changelog,1.195,1.196 rules,1.132,1.133

To: debian-openoffice@lists.debian.org
Subject: CVS:oo-deb/debian changelog,1.195,1.196 rules,1.132,1.133
From: Chris Halls <halls@gluck.debian.org>
Date: Thu, 02 Oct 2003 15:23:26 +0000
Message-id: <[🔎] E1A55Ic-0003TE-00@gluck.debian.org>
Reply-to: debian-openoffice@lists.debian.org
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv13289

Modified Files:
	changelog rules 
Log Message:
Split install target into install-arch and install-indep


Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -d -r1.195 -r1.196
--- changelog	1 Oct 2003 12:22:52 -0000	1.195
+++ changelog	2 Oct 2003 15:23:24 -0000	1.196
@@ -43,6 +43,7 @@
     + put splashscreen modified for Debian as uuencoded xcf in -- uudecode it
       and convert it to bmp during build (thanks Alexander Wirt for his
       xcftobmp) [RE]
+    + split install target into install-arch and install-indep parts [CH]
   * debian/openoffice.org{,-bin}.install:
     + remove mozilla files [RE]
     + install usr/lib/openoffice/share/gallery/htmlexpo/*.png [MK]
@@ -79,7 +80,7 @@
   * debian/setperms:
     + add xcftobmp [RE]
 
- -- Rene Engelhard <rene@debian.org>  Wed,  1 Oct 2003 14:18:31 +0200
+ -- Chris Halls <halls@debian.org>  Thu,  2 Oct 2003 17:22:08 +0200
 
 openoffice.org (1.0.99+1.1rc3-1) unstable; urgency=low
 

Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- rules	1 Oct 2003 11:40:46 -0000	1.132
+++ rules	2 Oct 2003 15:23:24 -0000	1.133
@@ -222,7 +222,8 @@
 # 'debian/rules <target> <target> ... FORCE=1', and the stamp files
 # that match the given targets will be removed automagically.
 stampdir_targets=build.prepare configure bootstrap solver instsetoo
-stampdir_targets+=setupins setup install langpacks binary-common binary-arch binary-indep
+stampdir_targets+=setupins setup install-arch install-indep manifest
+stampdir_targets+=langpacks binary-common binary-arch binary-indep
 stampdir_targets+=source.make patchapply
 stampdir_targets+=source.build source.unpack fix.source.patch source.patch
 stampdir_targets+=unfix.source.patch
@@ -669,23 +670,11 @@
 
 	touch $@
 
-# Install files generated by setup into package directories
-install: $(STAMP_DIR)/install
-$(STAMP_DIR)/install: debian/openoffice.org$(VER).install debian/openoffice.org$(VER)-bin.install
-$(STAMP_DIR)/install: debian/MANIFEST.$(ARCH) debian/openoffice.org$(VER).dirs
-$(STAMP_DIR)/install: $(STAMP_DIR)/setup
+manifest: $(STAMP_DIR)/manifest
+$(STAMP_DIR)/manifest: debian/MANIFEST.$(ARCH) $(STAMP_DIR)/setup
 	dh_testdir
-	dh_testroot
 	umask 022
-
-	# Remove package directories
-	rm -rf $(MAINPKGDIR) $(MAINPKGDIR)-bin $(MAINPKGDIR)-gnome \
-		$(MAINPKGDIR)-mimelnk
-	rm -f $(MAINPKGDIR).*.debhelper
-	rm -f $(MAINPKGDIR)-bin.*.debhelper
-
-	dh_installdirs
-
+	
 	# compare manifests
 	(cd debian/tmp && find -type f -o -type l | LC_ALL=C sort | cut -c3-) > debian/MANIFEST.$(ARCH).new
 	# confirm that the installed file list has not changed
@@ -702,30 +691,26 @@
 	    fi; \
 	  fi; \
 	fi;
+	touch $@
 
-	dh_install --sourcedir=debian/tmp
+install-arch: $(STAMP_DIR)/install-arch
+$(STAMP_DIR)/install-arch: debian/openoffice.org$(VER)-bin.install
+$(STAMP_DIR)/install-arch: debian/openoffice.org$(VER)-gnome.install
+$(STAMP_DIR)/install-arch: debian/openoffice.org$(VER)-crashrep.install
+$(STAMP_DIR)/install-arch: $(STAMP_DIR)/manifest
+	dh_testdir
+	dh_testroot
+	umask 022
 
-	# Disable desktop (KDE, GNOME, CDE) integration for user installs
-	# Copied from Mandrake.  Thanks, Gwenole!
-	for module in gid_Module_Optional_Gnome gid_Module_Optional_Kde gid_Module_Optional_Cde; do \
-	   perl -pi -e "/^Module $$module/ .. /^End/ and s|(Installed.*)=.*|\1= NO;|" \
-	       $(MAINPKGDIR)-bin/$(OPENOFFICEDIR)/program/instdb.ins ;\
-	done
+	# Remove package directories
+	rm -rf $(MAINPKGDIR)-bin $(MAINPKGDIR)-gnome $(MAINPKGDIR)-crashrep \
+	rm -f $(MAINPKGDIR)-bin.*.debhelper \
+	      $(MAINPKGDIR)-gnome.*.debhelper \
+	      $(MAINPKGDIR)-crashrep.*.debhelper
 
-	# convert program/icon paths in desktop shortcuts
-	for I in $(MAINPKGDIR)/usr/share/applnk/*/*.desktop \
-		 $(MAINPKGDIR)-gnome/usr/share/applications/*.desktop; do \
-	    sed -e 's,Exec="\?/.*\(/usr/lib/openoffice$(VER)/program/setup\)"\?,Exec=\1,' \
-	        -e 's,Exec="\?/.*/usr/lib/openoffice$(VER)/program/s\?\([^"]*\)"\?,Exec=/usr/bin/oo\1$(VER),' \
-		-e 's,/oooffice ,/ooffice ,' \
-	        -e 's,Icon=.*/\([^/]*\.png\),Icon=/usr/lib/openoffice$(VER)/share/icons/\1,' \
-	        < "$$I" > "$$I.new" ;\
-	    rm "$$I"; mv "$$I.new" "$$I" ;\
-	done
+	dh_installdirs -a
+	dh_install --sourcedir=debian/tmp -a
 
-	# Workaround for co-existing 1.0 and 1.1 - don't install icons in /usr/share/icons for 1.1 yet
-	#rm -r $(MAINPKGDIR)/usr/share/icons
-	 
 ifneq "$(MOZILLA)" "n"
 ifeq "$(ARCH)" "i386"
 	for i in libmozab2.so libmozabdrv2.so; do \
@@ -739,8 +724,6 @@
 		cp -rf $(PKGOPENOFFICEDIR)/program/$$i \
 	   	   $(MAINPKGDIR)-bin/$(OPENOFFICEDIR)/program; \
 	done
-	cp -rf $(PKGOPENOFFICEDIR)/program/defaults \
-		$(MAINPKGDIR)/$(OPENOFFICEDIR)/program
 endif
 
 ifneq "$(USE_SYSTEM_LIBS)" "y"
@@ -757,6 +740,58 @@
 	  mv "$$FILE".new "$$FILE"; \
 	done
 
+	# install regcomp and configimport utililities
+	install -m755 \
+	$(SOURCE_TREE)/solver/$(BUILDNUM)/$(ARCHBUILDDIR)/bin/regcomp \
+	$(SOURCE_TREE)/solver/$(BUILDNUM)/$(ARCHBUILDDIR)/bin/configimport.bin \
+		$(MAINPKGDIR)-bin/$(OPENOFFICEDIR)/program
+
+	touch $@
+
+# Install files generated by setup into package directories
+install-indep: $(STAMP_DIR)/install
+$(STAMP_DIR)/install-indep: debian/openoffice.org$(VER).install 
+$(STAMP_DIR)/install-indep: debian/openoffice.org$(VER)-mimelnk.install 
+$(STAMP_DIR)/install-indep: debian/openoffice.org$(VER).dirs
+$(STAMP_DIR)/install-indep: $(STAMP_DIR)/manifest
+	dh_testdir
+	dh_testroot
+	umask 022
+
+	# Remove package directories
+	rm -rf $(MAINPKGDIR) \
+		$(MAINPKGDIR)-mimelnk
+	rm -f $(MAINPKGDIR).*.debhelper
+
+	dh_installdirs -i
+	dh_install --sourcedir=debian/tmp -i
+
+	# Disable desktop (KDE, GNOME, CDE) integration for user installs
+	# Copied from Mandrake.  Thanks, Gwenole!
+	for module in gid_Module_Optional_Gnome gid_Module_Optional_Kde gid_Module_Optional_Cde; do \
+	   perl -pi -e "/^Module $$module/ .. /^End/ and s|(Installed.*)=.*|\1= NO;|" \
+	       $(MAINPKGDIR)-bin/$(OPENOFFICEDIR)/program/instdb.ins ;\
+	done
+
+	# convert program/icon paths in desktop shortcuts
+	for I in $(MAINPKGDIR)/usr/share/applnk/*/*.desktop \
+		 $(MAINPKGDIR)-gnome/usr/share/applications/*.desktop; do \
+	    sed -e 's,Exec="\?/.*\(/usr/lib/openoffice$(VER)/program/setup\)"\?,Exec=\1,' \
+	        -e 's,Exec="\?/.*/usr/lib/openoffice$(VER)/program/s\?\([^"]*\)"\?,Exec=/usr/bin/oo\1$(VER),' \
+		-e 's,/oooffice ,/ooffice ,' \
+	        -e 's,Icon=.*/\([^/]*\.png\),Icon=/usr/lib/openoffice$(VER)/share/icons/\1,' \
+	        < "$$I" > "$$I.new" ;\
+	    rm "$$I"; mv "$$I.new" "$$I" ;\
+	done
+
+	# Workaround for co-existing 1.0 and 1.1 - don't install icons in /usr/share/icons for 1.1 yet
+	#rm -r $(MAINPKGDIR)/usr/share/icons
+	 
+ifneq "$(MOZILLA)" "n"
+	cp -rf $(PKGOPENOFFICEDIR)/program/defaults \
+		$(MAINPKGDIR)/$(OPENOFFICEDIR)/program
+endif
+
 	# there are some wrong permissions; fix them ourselves
 	#find $(MAINPKGDIR) $(MAINPKGDIR)-bin \
 	#	-type f \( -name "*.xpt" -o -name "*.js" -o -name "*en_US.*" \
@@ -768,12 +803,6 @@
 	    chmod ugo-x $(MAINPKGDIR)/$(OPENOFFICEDIR)/share/config/webcast/$$FILE.pl; \
 	done
 
-	# install regcomp and configimport utililities
-	install -m755 \
-	$(SOURCE_TREE)/solver/$(BUILDNUM)/$(ARCHBUILDDIR)/bin/regcomp \
-	$(SOURCE_TREE)/solver/$(BUILDNUM)/$(ARCHBUILDDIR)/bin/configimport.bin \
-		$(MAINPKGDIR)-bin/$(OPENOFFICEDIR)/program
-
 	# install openoffice-xlate-lang
 	install -m755 debian/local/openoffice-xlate-lang \
 		$(MAINPKGDIR)/usr/share/openoffice$(VER)/bin
@@ -859,19 +888,19 @@
 
 # Build architecture independant packages using the common target.
 binary-indep: $(STAMP_DIR)/binary-indep
-$(STAMP_DIR)/binary-indep: $(STAMP_DIR)/install $(STAMP_DIR)/langpacks debian/control $(STAMP_DIR)/maintscripts
+$(STAMP_DIR)/binary-indep: $(STAMP_DIR)/install-indep $(STAMP_DIR)/langpacks debian/control $(STAMP_DIR)/maintscripts
 	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
 
 	touch $@
 
 # Build architecture dependant packages using the common target.
 binary-arch: $(STAMP_DIR)/binary-arch
-$(STAMP_DIR)/binary-arch: $(STAMP_DIR)/install debian/control $(STAMP_DIR)/maintscripts
+$(STAMP_DIR)/binary-arch: $(STAMP_DIR)/install-arch debian/control $(STAMP_DIR)/maintscripts
 	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
 	touch $@
 
 # Any other binary targets build just one binary package at a time.
-binary-%: $(STAMP_DIR)/install $(STAMP_DIR)/langpacks $(STAMP_DIR)/maintscripts
+binary-%: $(STAMP_DIR)/install-indep $(STAMP_DIR)/install-arch $(STAMP_DIR)/langpacks $(STAMP_DIR)/maintscripts
 	$(MAKE) -f debian/rules binary-common DH_OPTIONS=-p$*
 
 binary: binary-arch binary-indep
Reply to:
Prev by Date: Bug#210608: glibc: breaks OpenOffice.org...
Next by Date: CVS:oo-deb/debian/scripts vars,1.24,1.25
Previous by thread: Bug#210608: glibc: breaks OpenOffice.org...
Next by thread: CVS:oo-deb/debian/scripts vars,1.24,1.25
Index(es):
- Date
- Thread