mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

134 lines
4.8 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/tibit/dpkg/00-mk-docdir-skip-event.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  19. diff -ur orig-dpkg-1.9.21/Makefile.in dpkg-1.9.21/Makefile.in
  20. --- orig-dpkg-1.9.21/Makefile.in 2001-03-04 15:39:05.000000000 +0100
  21. +++ dpkg-1.9.21/Makefile.in 2003-02-21 11:29:07.000000000 +0100
  22. @@ -9,7 +9,7 @@
  23. include Makefile.conf
  24. SUBDIRS = include optlib lib intl dpkg-deb split scripts utils main \
  25. - utils @DSELECTDIR@ po methods doc
  26. + @DSELECTDIR@ po methods doc
  27. all: version.h all-recursive
  28. diff -ur orig-dpkg-1.9.21/doc/Makefile.in dpkg-1.9.21/doc/Makefile.in
  29. --- orig-dpkg-1.9.21/doc/Makefile.in 2000-12-30 23:12:10.000000000 +0100
  30. +++ dpkg-1.9.21/doc/Makefile.in 2003-02-21 11:23:48.000000000 +0100
  31. @@ -2,8 +2,6 @@
  32. srcdir = @srcdir@
  33. top_srcdir = @top_srcdir@
  34. -SUBDIRS = fr ja sv
  35. -
  36. include ../Makefile.conf
  37. MAN5PAGES = deb-control.5 deb-old.5 deb.5
  38. @@ -44,6 +42,7 @@
  39. $(INSTALL_DATA) $$i $(DESTDIR)$(docdir)/internals/$$bn ; \
  40. done
  41. endif
  42. + $(mkinstalldirs) $(DESTDIR)$(docdir)
  43. $(INSTALL_DATA) $(srcdir)/ChangeLog $(DESTDIR)$(docdir)/ChangeLog.manuals
  44. set -e ; for i in ChangeLog THANKS TODO ; do \
  45. $(INSTALL_DATA) $(top_srcdir)/$$i $(DESTDIR)$(docdir) ; \
  46. diff -ur orig-dpkg-1.9.21/dselect/mkcurkeys.pl dpkg-1.9.21/dselect/mkcurkeys.pl
  47. --- orig-dpkg-1.9.21/dselect/mkcurkeys.pl 1999-01-29 09:54:00.000000000 +0100
  48. +++ dpkg-1.9.21/dselect/mkcurkeys.pl 2003-02-21 10:46:51.000000000 +0100
  49. @@ -43,6 +43,7 @@
  50. m/#define KEY_(\w+)\s+\d+\s+/ || next;
  51. $rhs= $';
  52. $k= "KEY_$1";
  53. + if ($k eq 'KEY_EVENT') { next; }
  54. $_= $1;
  55. &capit;
  56. $base{$k}= $_;
  57. diff -ur orig-dpkg-1.9.21/scripts/Makefile.in dpkg-1.9.21/scripts/Makefile.in
  58. --- orig-dpkg-1.9.21/scripts/Makefile.in 2001-06-20 02:53:45.000000000 +0200
  59. +++ dpkg-1.9.21/scripts/Makefile.in 2003-02-21 11:32:55.000000000 +0100
  60. @@ -10,13 +10,12 @@
  61. dpkg-scanpackages dpkg-scansources \
  62. dpkg-architecture dpkg-checkbuilddeps
  63. -SBIN_SCRIPTS = update-rc.d update-alternatives install-info \
  64. - dpkg-divert dpkg-statoverride cleanup-info
  65. +SBIN_SCRIPTS = dpkg-divert dpkg-statoverride
  66. MAN1PAGES = dpkg-name.1 dpkg-source.1 822-date.1 \
  67. dpkg-checkbuilddeps.1
  68. -MAN8PAGES = update-rc.d.8 update-alternatives.8 install-info.8 \
  69. - cleanup-info.8 dpkg-scanpackages.8 dpkg-scansources.8 \
  70. +MAN8PAGES = update-alternatives.8 \
  71. + dpkg-scanpackages.8 dpkg-scansources.8 \
  72. dpkg-divert.8 dpkg-statoverride.8
  73. CHANGELOG_PARSERS = cl-debian
  74. diff -ur orig-dpkg-1.9.21/utils/Makefile.in dpkg-1.9.21/utils/Makefile.in
  75. --- orig-dpkg-1.9.21/utils/Makefile.in 2001-04-24 13:05:58.000000000 +0200
  76. +++ dpkg-1.9.21/utils/Makefile.in 2003-02-21 11:28:58.000000000 +0100
  77. @@ -12,23 +12,19 @@
  78. SSD_OBJECTS = $(patsubst %.c, %.o, $(SSD_SOURCES))
  79. SSD_MANPAGES = start-stop-daemon.8
  80. -MD5_SOURCES = md5sum.c
  81. -MD5_OBJECTS = $(patsubst %.c, %.o, $(MD5_SOURCES))
  82. -MD5_MANPAGES = md5sum.1
  83. -
  84. ENOENT_SOURCES = enoent.c
  85. ENOENT_OBJECTS = $(patsubst %.c, %.o, $(ENOENT_SOURCES))
  86. -GENFILES = $(MD5_OBJECTS) md5sum $(ENOENT_OBJECTS) enoent
  87. +GENFILES = $(ENOENT_OBJECTS) enoent
  88. ifeq (@USE_START_STOP_DAEMON@, true)
  89. GENFILES += $(SSD_OBJECTS) start-stop-daemon
  90. endif
  91. .PHONY: all
  92. ifeq (@USE_START_STOP_DAEMON@, true)
  93. -all:: start-stop-daemon md5sum enoent
  94. +all:: enoent
  95. else
  96. -all:: md5sum enoent
  97. +all:: enoent
  98. endif
  99. .PHONY: install
  100. @@ -51,9 +47,6 @@
  101. $(mkinstalldirs) $(DESTDIR)/$(sbindir)
  102. $(INSTALL_PROGRAM) start-stop-daemon $(DESTDIR)/$(sbindir)
  103. endif
  104. - $(mkinstalldirs) $(DESTDIR)/$(bindir)
  105. - $(INSTALL_PROGRAM) md5sum $(DESTDIR)/$(bindir)
  106. -
  107. $(mkinstalldirs) $(DESTDIR)/$(dpkglibdir)
  108. $(INSTALL_PROGRAM) enoent $(DESTDIR)/$(dpkglibdir)
  109. @@ -63,11 +56,7 @@
  110. $(mkinstalldirs) $(DESTDIR)/$(man8dir)
  111. $(INSTALL_DATA) $(srcdir)/$(SSD_MANPAGES) $(DESTDIR)/$(man8dir)
  112. endif
  113. - $(mkinstalldirs) $(DESTDIR)/$(man1dir)
  114. - $(INSTALL_DATA) $(srcdir)/$(MD5_MANPAGES) $(DESTDIR)/$(man1dir)
  115. start-stop-daemon: $(SSD_OBJECTS) ../lib/libdpkg.a
  116. $(CC) $(LDFLAGS) -o $@ $^ $(SSD_LIBS)
  117. -md5sum: $(MD5_OBJECTS) ../lib/libdpkg.a
  118. - $(CC) $(LDFLAGS) -o $@ $^ $(NLS_LIBS)