[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force X.Org X11 SVN commit: r415 - trunk/debian



Author: dnusinow
Date: 2005-07-26 10:54:27 -0500 (Tue, 26 Jul 2005)
New Revision: 415

Modified:
   trunk/debian/changelog
   trunk/debian/rules
Log:
- Clean up changelog. Eugene and I have worked on some tasks together, so
  give us a section together.
- Apply patch from Eugene to debian/rules. Fixes real-build target to not
  depend on the phony setup.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-07-26 15:45:49 UTC (rev 414)
+++ trunk/debian/changelog	2005-07-26 15:54:27 UTC (rev 415)
@@ -3,9 +3,6 @@
   Changes by David Nusinow:
      - Incorporate ELF loader patch for arm. Thanks Steve Langasek.
        Closes: #319298
-     - Switch from dbs to quilt based on Eugene Konev's work
-       - Document how to use the system in debian/README
-       - Re-organize patches in to subdirectories
      - Re-enable failure on manifest check fail
      - Deal with Speedo fonts removal
        - Document in NEWS.Debian
@@ -13,10 +10,6 @@
          translators!
      - Edit various Debian files for XFree86 -> X.Org branding changes
      - Remove general/033_no_html.diff
-     - Drop xmh
-       - Add general/022_disable_xmh.diff to not build it
-       - Remove xmh from MANIFEST files and xlibs-data.installs (Thanks Eugene
-         Konev)
 
   Changes by Eugene Konev:
      - Do not impose selinux on the whole world out there: move selinux 
@@ -29,6 +22,14 @@
   Changes by Julien Cristau:
      - Clean up FAQ to refer to X.Org instead of XFree86. Closes: #319407
 
+  Changes by Eugene Konev and David Nusinow
+     - Switch from dbs to quilt
+       - Document how to use the system in debian/README
+       - Re-organize patches in to subdirectories
+     - Drop xmh
+       - Add general/022_disable_xmh.diff to not build it
+       - Remove xmh from MANIFEST files and xlibs-data.installs
+
  -- David Nusinow <dnusinow@debian.org>  Wed, 20 Jul 2005 14:38:43 -0400
 
 xorg-x11 (6.8.2.dfsg.1-4) unstable; urgency=low

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2005-07-26 15:45:49 UTC (rev 414)
+++ trunk/debian/rules	2005-07-26 15:54:27 UTC (rev 415)
@@ -285,7 +285,7 @@
 
 # DO NOT CHANGE THIS RULE WITHOUT CHECKING FOR SYNCHRONICITY WITH THE build-server RULE BELOW
 real-build: $(STAMP_DIR)/build
-$(STAMP_DIR)/build: setup $(STAMP_DIR)/genscripts
+$(STAMP_DIR)/build: $(STAMP_DIR)/setup $(STAMP_DIR)/genscripts
 	# build Debian's X server wrapper
 	$(CC) -Wall -g -O2 -o debian/local/xserver-wrapper debian/local/xserver-wrapper.c
 	# Generate plain text documents from (X)HTML.



Reply to: