Author: fabbione
Date: 2004-11-22 04:50:45 -0500 (Mon, 22 Nov 2004)
New Revision: 2037
Modified:
branches/ubuntu/debian/changelog
branches/ubuntu/debian/rules
Log:
Import 4.3.0.dfsg.1-6ubuntu26 release.
Modified: branches/ubuntu/debian/changelog
===================================================================
--- branches/ubuntu/debian/changelog 2004-11-22 09:32:17 UTC (rev 2036)
+++ branches/ubuntu/debian/changelog 2004-11-22 09:50:45 UTC (rev 2037)
@@ -1,5 +1,15 @@
-xfree86 (4.3.0.dfsg.1-6ubuntu26) warty-security; urgency=low
+xfree86 (4.3.0.dfsg.1-6ubuntu26) hoary; urgency=low
+ Changes by Fabio M. Di Nitto:
+
+ * Sync debian/rules install-server target with install and make
+ binary-server work again.
+
+ * Start shipping only xserver-xfree86 and xserver-xfree86-dbg as a temporary
+ stage, while waiting for full removal.
+ This will give the opportunity for users to be able to revert to an "old"
+ and well known server if the xserver-xorg package does not work for them.
+
Changes by Daniel Stone:
* Security upload: further fixes to the libXpm issues reported in
Modified: branches/ubuntu/debian/rules
===================================================================
--- branches/ubuntu/debian/rules 2004-11-22 09:32:17 UTC (rev 2036)
+++ branches/ubuntu/debian/rules 2004-11-22 09:50:45 UTC (rev 2037)
@@ -394,9 +394,12 @@
check-manifest-arch: check-manifest
check-manifest-indep: check-manifest
-binary-indep: check-manifest-indep $(STAMP_DIR)/binary-indep
-$(STAMP_DIR)/binary-indep: DH_OPTIONS=-i
-$(STAMP_DIR)/binary-indep: $(STAMP_DIR)/build $(STAMP_DIR)/install
$(STAMP_DIR)/check-manifest
+binary-indep:
+ # do nothing
+
+binary-indep-old: check-manifest-indep $(STAMP_DIR)/binary-indep-old
+$(STAMP_DIR)/binary-indep-old: DH_OPTIONS=-i
+$(STAMP_DIR)/binary-indep-old: $(STAMP_DIR)/build $(STAMP_DIR)/install
$(STAMP_DIR)/check-manifest
dh_testdir
dh_testroot
dh_install --sourcedir=debian/tmp
@@ -428,12 +431,15 @@
dh_builddeb
touch $@
+binary-arch: binary-server
+ echo "All i need is looooove.. looove.. love.."
+
# DO NOT CHANGE THIS RULE WITHOUT CHECKING FOR SYNCHRONICITY WITH THE
binary-server RULE BELOW
# See the build-arch-only target above.
-binary-arch: check-manifest-arch $(STAMP_DIR)/binary-arch
-$(STAMP_DIR)/binary-arch: DH_OPTIONS=-s
-$(STAMP_DIR)/binary-arch: IMAKE_DEFINES+= -DBuildSpecsDocs=NO -DBuildFonts=NO
-$(STAMP_DIR)/binary-arch: $(STAMP_DIR)/build $(STAMP_DIR)/install
debian/shlibs.local $(STAMP_DIR)/check-manifest
+binary-arch-old: check-manifest-arch $(STAMP_DIR)/binary-arch-old
+$(STAMP_DIR)/binary-arch-old: DH_OPTIONS=-s
+$(STAMP_DIR)/binary-arch-old: IMAKE_DEFINES+= -DBuildSpecsDocs=NO
-DBuildFonts=NO
+$(STAMP_DIR)/binary-arch-old: $(STAMP_DIR)/build $(STAMP_DIR)/install
debian/shlibs.local $(STAMP_DIR)/check-manifest
dh_testdir
dh_testroot
dh_install --sourcedir=debian/tmp
@@ -566,6 +572,9 @@
umask 022
dh_clean -k
$(MAKE) -C $(SOURCE_TREE) SHELL="/bin/sh -e" DESTDIR=$(DEBTREEDIR)
install install.man
+ # rename the XF86Config manpage to XF86Config-4
+ mv $(DEBTREEDIR)/usr/X11R6/man/man5/XF86Config.5x \
+ $(DEBTREEDIR)/usr/X11R6/man/man5/XF86Config-4.5x
# copy the static, debuggable XFree86 server
install -m 755
$(SOURCE_TREE)-xserver-xfree86-dbg/programs/Xserver/XFree86 \
debian/tmp/usr/X11R6/bin/XFree86-debug
@@ -617,7 +626,7 @@
.PHONY: patch-audit
.PHONY: clean configure install
.PHONY: build build-arch-only build-all real-build
-.PHONY: binary binary-arch binary-indep
+.PHONY: binary binary-arch bynary-arch-old binary-indep binary-indep-old
.PHONY: check-manifest check-manifest-arch check-manifest-indep
.PHONY: environment
.PHONY: build-server install-server binary-server
