Author: branden
Date: 2003-09-17 17:27:05 -0500 (Wed, 17 Sep 2003)
New Revision: 542
Removed:
branches/4.3.0/sid/debian/shlibs.local
Modified:
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/rules
Log:
debian/shlibs.local is a generated file, so we might as well generate it
during the build process.
- debian/shlibs.local: deleted from source package
- debian/rules:
+ (clean): remove debian/shlibs.local
+ (debian/shlibs.local): new target
+ ($(STAMPDIR)/binary-arch): depends on debian/shlibs.local
+ ($(STAMPDIR)/binary-server): depends on debian/shlibs.local
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2003-09-17 22:15:06 UTC (rev 541)
+++ branches/4.3.0/sid/debian/changelog 2003-09-17 22:27:05 UTC (rev 542)
@@ -139,8 +139,17 @@
+ debian/patches/000_xf-4.3-branch.diff
+ debian/patches/046_radeon_dualhead_cursor_crash.diff
- -- Branden Robinson <[EMAIL PROTECTED]> Mon, 25 Aug 2003 17:45:54 -0500
+ * debian/shlibs.local is a generated file, so we might as well generate it
+ during the build process.
+ - debian/shlibs.local: deleted from source package
+ - debian/rules:
+ + (clean): remove debian/shlibs.local
+ + (debian/shlibs.local): new target
+ + ($(STAMPDIR)/binary-arch): depends on debian/shlibs.local
+ + ($(STAMPDIR)/binary-server): depends on debian/shlibs.local
+ -- Branden Robinson <[EMAIL PROTECTED]> Wed, 17 Sep 2003 17:24:56 -0500
+
xfree86 (4.3.0-0pre1v1) experimental; urgency=low
* new upstream release
Modified: branches/4.3.0/sid/debian/rules
===================================================================
--- branches/4.3.0/sid/debian/rules 2003-09-17 22:15:06 UTC (rev 541)
+++ branches/4.3.0/sid/debian/rules 2003-09-17 22:27:05 UTC (rev 542)
@@ -143,7 +143,8 @@
rm -rf $(STAMP_DIR) $(SOURCE_DIR)
perl $(SCRIPT_DIR)/dbs_split clean
rm -rf debian/local/exports debian/local/xlibmesa-drm-source/modules
- dh_clean debian/local/xserver-wrapper debian/local/xterm.faq.text.gz
debian/MANIFEST.$(ARCH).new
+ dh_clean debian/local/xserver-wrapper debian/local/xterm.faq.text.gz \
+ debian/MANIFEST.$(ARCH).new debian/shlibs.local
# All 'important' targets have 2 lines. The one that is run by
# dpkg-buildpackage or the user, and the one that does the actual work. This
@@ -187,6 +188,10 @@
debian/xserver-xfree86-dbg.templates
touch $@
+# Rule to generate the shlibs.local file.
+debian/shlibs.local:
+ cat debian/*.shlibs > $@
+
configure: $(STAMP_DIR)/stamp-configure
$(STAMP_DIR)/stamp-configure: $(patched)
dh_testdir
@@ -382,7 +387,7 @@
# DO NOT CHANGE THIS RULE WITHOUT CHECKING FOR SYNCHRONICITY WITH THE
binary-server RULE BELOW
binary-arch: $(STAMP_DIR)/binary-arch
$(STAMP_DIR)/binary-arch: DH_OPTIONS=-s
-$(STAMP_DIR)/binary-arch: $(STAMP_DIR)/stamp-build $(STAMP_DIR)/install
+$(STAMP_DIR)/binary-arch: $(STAMP_DIR)/stamp-build $(STAMP_DIR)/install
debian/shlibs.local
dh_testdir
dh_testroot
dh_install --sourcedir=debian/tmp
@@ -527,7 +532,7 @@
# DO NOT CHANGE THIS RULE WITHOUT CHECKING FOR SYNCHRONICITY WITH THE
binary-arch RULE ABOVE
binary-server: $(STAMP_DIR)/binary-server
$(STAMP_DIR)/binary-server: DH_OPTIONS=-pxserver-xfree86 -pxserver-xfree86-dbg
-$(STAMP_DIR)/binary-server: $(STAMP_DIR)/build-server
$(STAMP_DIR)/install-server
+$(STAMP_DIR)/binary-server: $(STAMP_DIR)/build-server
$(STAMP_DIR)/install-server debian/shlibs.local
dh_testdir
dh_testroot
dh_install --sourcedir=debian/tmp
Deleted: branches/4.3.0/sid/debian/shlibs.local
===================================================================
--- branches/4.3.0/sid/debian/shlibs.local 2003-09-17 22:15:06 UTC (rev
541)
+++ branches/4.3.0/sid/debian/shlibs.local 2003-09-17 22:27:05 UTC (rev
542)
@@ -1,23 +0,0 @@
-libdps 1 libdps1 (>> 4.1.0)
-libdpstk 1 libdps1 (>> 4.1.0)
-libpsres 1 libdps1 (>> 4.1.0)
-libXaw 6 libxaw6 (>> 4.1.0)
-libXaw 7 libxaw7 (>> 4.1.0)
-libGL 1 xlibmesa-gl | libgl1
-libGLU 1 xlibmesa-glu | libglu1
-libOSMesa 4 xlibosmesa4
-libICE 6 xlibs (>> 4.1.0)
-libSM 6 xlibs (>> 4.1.0)
-libX11 6 xlibs (>> 4.1.0)
-libXTrap 6 xlibs (>> 4.2.0)
-libXext 6 xlibs (>> 4.1.0)
-libXft 1 xlibs (>> 4.1.0)
-libXi 6 xlibs (>> 4.1.0)
-libXmu 6 xlibs (>> 4.1.0)
-libXmuu 1 xlibs (>> 4.1.0)
-libXp 6 xlibs (>> 4.1.0)
-libXpm 4 xlibs (>> 4.1.0)
-libXrandr 2 xlibs (>> 4.3.0)
-libXt 6 xlibs (>> 4.1.0)
-libXtst 6 xlibs (>> 4.1.0)
-libXv 1 xlibs (>> 4.3.0)
