← Back to branch summary

~ubuntu-branches/ubuntu/precise/netatalk/precise

« back to all changes in this revision

Viewing changes to debian/patches/100_psf_path.diff

  • Committer: Bazaar Package Importer
  • Author(s): Sebastian Rittau
  • Date: 2004-01-19 12:43:49 UTC
  • Revision ID: james.westby@ubuntu.com-20040119124349-q7nhb37vuw9hvsb3
Tags: 1.6.4-2
* The following changes from Jonas (thanks!):
  + Tighten netatalk-dev dependency on exact same version of netatalk.
  + Bump up dependency on libpam-runtime to 0.76-14 (reflecting a recent
    update to Debian-PAM-MiniPolicy).
  + Drop patch no longer needed: 204_netatalk_pamd_enable_password.diff.
  + Enable SRVLOC support, recommend slpd and build-depend on
    libslp-dev.
  + Use (and build-depend on) d-devlibdeps.
  + Use (and build-depend on) dh-buildinfo.
  + Move around logcheck files to be recognized by dh_installlogcheck,
    and tighten build-dependencies of debhelper and cdbs.
  + Remove cracklib-related (build-)dependencies (they are only used
    when compiled with ssl support).
  + Support enabling ssl-related options simply by setting
    "DEB_BUILD_OPTIONS=ssl" at build time.
    - Include cracklib-support to PAM config on ssl build.
    - Only enable DHX plugin on ssl build.
  + Add TODO with notes on things to (re)add when (if ever?) ssl support
    is enabled again by default.
* Use Berkeley DB 4.2.
  + debian/control: Changed build-dependencies accordingly.
  + debian/NEWS.Debian: Updated.
  + debian/README.Debian: Updated.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/100_psf_path.diff
 
1
--- etc/psf/Makefile.am.old     2003-06-13 01:36:40.000000000 +0200
 
2
+++ etc/psf/Makefile.am 2003-12-07 15:29:26.000000000 +0100
 
3
@@ -1,7 +1,7 @@
 
4
 # Makefile.am for etc/psf/
 
5
 
 
6
-sbin_PROGRAMS = psf psa
 
7
-sbin_SCRIPTS = etc2ps.sh
 
8
+libexec_PROGRAMS = psf psa
 
9
+libexec_SCRIPTS = etc2ps.sh
 
10
 
 
11
 pkgdata_DATA = pagecount.ps
 
12
 
 
13
@@ -12,8 +12,8 @@
 
14
        -DZEROWIDTH \
 
15
        -D_PATH_PAP=\"$(bindir)/pap\" \
 
16
        -D_PATH_PSORDER=\"$(bindir)/psorder\" \
 
17
-       -D_PATH_PSA=\"$(sbindir)/psa\" \
 
18
-       -D_PATH_PSFILTER=\"$(sbindir)/etc2ps.sh\" \
 
19
+       -D_PATH_PSA=\"$(libexecdir)/psa\" \
 
20
+       -D_PATH_PSFILTER=\"$(libexecdir)/etc2ps.sh\" \
 
21
        -D_PATH_PAGECOUNT=\"$(pkgdatadir)/pagecount.ps\"
 
22
 
 
23
 EXTRA_DIST = etc2ps.sh pagecount.ps
 
24
@@ -30,8 +30,8 @@
 
25
 
 
26
 install-exec-hook:
 
27
        @list='$(psf_LINKS)'; for l in $$list; do \
 
28
-               rm $(DESTDIR)$(sbindir)/$$l 2>/dev/null || true; \
 
29
-               (cd $(DESTDIR)$(sbindir) && $(LN_S) psf $$l);  \
 
30
+               rm $(DESTDIR)$(libexecdir)/$$l 2>/dev/null || true; \
 
31
+               (cd $(DESTDIR)$(libexecdir) && $(LN_S) psf $$l);  \
 
32
        done
 
33
 
 
34
 #
 
35
--- etc/psf/Makefile.in.old     2003-12-02 21:19:32.000000000 +0100
 
36
+++ etc/psf/Makefile.in 2003-12-07 15:30:12.000000000 +0100
 
37
@@ -193,8 +193,8 @@
 
38
 target_os = @target_os@
 
39
 target_vendor = @target_vendor@
 
40
 
 
41
-sbin_PROGRAMS = psf psa
 
42
-sbin_SCRIPTS = etc2ps.sh
 
43
+libexec_PROGRAMS = psf psa
 
44
+libexec_SCRIPTS = etc2ps.sh
 
45
 
 
46
 pkgdata_DATA = pagecount.ps
 
47
 
 
48
@@ -205,8 +205,8 @@
 
49
        -DZEROWIDTH \
 
50
        -D_PATH_PAP=\"$(bindir)/pap\" \
 
51
        -D_PATH_PSORDER=\"$(bindir)/psorder\" \
 
52
-       -D_PATH_PSA=\"$(sbindir)/psa\" \
 
53
-       -D_PATH_PSFILTER=\"$(sbindir)/etc2ps.sh\" \
 
54
+       -D_PATH_PSA=\"$(libexecdir)/psa\" \
 
55
+       -D_PATH_PSFILTER=\"$(libexecdir)/etc2ps.sh\" \
 
56
        -D_PATH_PAGECOUNT=\"$(pkgdatadir)/pagecount.ps\"
 
57
 
 
58
 
 
59
@@ -228,8 +228,8 @@
 
60
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 
61
 CONFIG_HEADER = $(top_builddir)/config.h
 
62
 CONFIG_CLEAN_FILES =
 
63
-sbin_PROGRAMS = psf$(EXEEXT) psa$(EXEEXT)
 
64
-PROGRAMS = $(sbin_PROGRAMS)
 
65
+libexec_PROGRAMS = psf$(EXEEXT) psa$(EXEEXT)
 
66
+PROGRAMS = $(libexec_PROGRAMS)
 
67
 
 
68
 am_psa_OBJECTS = psa.$(OBJEXT)
 
69
 psa_OBJECTS = $(am_psa_OBJECTS)
 
70
@@ -241,7 +241,7 @@
 
71
 psf_LDADD = $(LDADD)
 
72
 psf_DEPENDENCIES =
 
73
 psf_LDFLAGS =
 
74
-SCRIPTS = $(sbin_SCRIPTS)
 
75
+SCRIPTS = $(libexec_SCRIPTS)
 
76
 
 
77
 
 
78
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
 
79
@@ -267,34 +267,34 @@
 
80
 .SUFFIXES: .c .lo .o .obj
 
81
 $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 
82
        cd $(top_srcdir) && \
 
83
-         $(AUTOMAKE) --foreign  etc/psf/Makefile
 
84
+         $(AUTOMAKE) --gnu  etc/psf/Makefile
 
85
 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 
86
        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
 
87
-sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 
88
-install-sbinPROGRAMS: $(sbin_PROGRAMS)
 
89
+libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 
90
+install-libexecPROGRAMS: $(libexec_PROGRAMS)
 
91
        @$(NORMAL_INSTALL)
 
92
-       $(mkinstalldirs) $(DESTDIR)$(sbindir)
 
93
-       @list='$(sbin_PROGRAMS)'; for p in $$list; do \
 
94
+       $(mkinstalldirs) $(DESTDIR)$(libexecdir)
 
95
+       @list='$(libexec_PROGRAMS)'; for p in $$list; do \
 
96
          p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 
97
          if test -f $$p \
 
98
             || test -f $$p1 \
 
99
          ; then \
 
100
            f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
 
101
-          echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f"; \
 
102
-          $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f || exit 1; \
 
103
+          echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f"; \
 
104
+          $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f || exit 1; \
 
105
          else :; fi; \
 
106
        done
 
107
 
 
108
-uninstall-sbinPROGRAMS:
 
109
+uninstall-libexecPROGRAMS:
 
110
        @$(NORMAL_UNINSTALL)
 
111
-       @list='$(sbin_PROGRAMS)'; for p in $$list; do \
 
112
+       @list='$(libexec_PROGRAMS)'; for p in $$list; do \
 
113
          f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
 
114
-         echo " rm -f $(DESTDIR)$(sbindir)/$$f"; \
 
115
-         rm -f $(DESTDIR)$(sbindir)/$$f; \
 
116
+         echo " rm -f $(DESTDIR)$(libexecdir)/$$f"; \
 
117
+         rm -f $(DESTDIR)$(libexecdir)/$$f; \
 
118
        done
 
119
 
 
120
-clean-sbinPROGRAMS:
 
121
-       @list='$(sbin_PROGRAMS)'; for p in $$list; do \
 
122
+clean-libexecPROGRAMS:
 
123
+       @list='$(libexec_PROGRAMS)'; for p in $$list; do \
 
124
          f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 
125
          echo " rm -f $$p $$f"; \
 
126
          rm -f $$p $$f ; \
 
127
@@ -305,25 +305,25 @@
 
128
 psf$(EXEEXT): $(psf_OBJECTS) $(psf_DEPENDENCIES) 
 
129
        @rm -f psf$(EXEEXT)
 
130
        $(LINK) $(psf_LDFLAGS) $(psf_OBJECTS) $(psf_LDADD) $(LIBS)
 
131
-sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 
132
-install-sbinSCRIPTS: $(sbin_SCRIPTS)
 
133
+libexecSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 
134
+install-libexecSCRIPTS: $(libexec_SCRIPTS)
 
135
        @$(NORMAL_INSTALL)
 
136
-       $(mkinstalldirs) $(DESTDIR)$(sbindir)
 
137
-       @list='$(sbin_SCRIPTS)'; for p in $$list; do \
 
138
+       $(mkinstalldirs) $(DESTDIR)$(libexecdir)
 
139
+       @list='$(libexec_SCRIPTS)'; for p in $$list; do \
 
140
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 
141
          if test -f $$d$$p; then \
 
142
            f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
 
143
-           echo " $(sbinSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(sbindir)/$$f"; \
 
144
-           $(sbinSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(sbindir)/$$f; \
 
145
+           echo " $(libexecSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(libexecdir)/$$f"; \
 
146
+           $(libexecSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(libexecdir)/$$f; \
 
147
          else :; fi; \
 
148
        done
 
149
 
 
150
-uninstall-sbinSCRIPTS:
 
151
+uninstall-libexecSCRIPTS:
 
152
        @$(NORMAL_UNINSTALL)
 
153
-       @list='$(sbin_SCRIPTS)'; for p in $$list; do \
 
154
+       @list='$(libexec_SCRIPTS)'; for p in $$list; do \
 
155
          f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
 
156
-         echo " rm -f $(DESTDIR)$(sbindir)/$$f"; \
 
157
-         rm -f $(DESTDIR)$(sbindir)/$$f; \
 
158
+         echo " rm -f $(DESTDIR)$(libexecdir)/$$f"; \
 
159
+         rm -f $(DESTDIR)$(libexecdir)/$$f; \
 
160
        done
 
161
 
 
162
 mostlyclean-compile:
 
163
@@ -486,7 +486,7 @@
 
164
 all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA)
 
165
 
 
166
 installdirs:
 
167
-       $(mkinstalldirs) $(DESTDIR)$(sbindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(pkgdatadir)
 
168
+       $(mkinstalldirs) $(DESTDIR)$(libexecdir) $(DESTDIR)$(libexecdir) $(DESTDIR)$(pkgdatadir)
 
169
 install: install-am
 
170
 install-exec: install-exec-am
 
171
 install-data: install-data-am
 
172
@@ -514,7 +514,8 @@
 
173
        @echo "it deletes files that may require special tools to rebuild."
 
174
 clean: clean-am
 
175
 
 
176
-clean-am: clean-generic clean-libtool clean-sbinPROGRAMS mostlyclean-am
 
177
+clean-am: clean-generic clean-libexecPROGRAMS clean-libtool \
 
178
+       mostlyclean-am
 
179
 
 
180
 distclean: distclean-am
 
181
        -rm -rf ./$(DEPDIR)
 
182
@@ -532,7 +533,7 @@
 
183
 
 
184
 install-data-am: install-pkgdataDATA
 
185
 
 
186
-install-exec-am: install-sbinPROGRAMS install-sbinSCRIPTS
 
187
+install-exec-am: install-libexecPROGRAMS install-libexecSCRIPTS
 
188
        @$(NORMAL_INSTALL)
 
189
        $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 
190
 
 
191
@@ -560,22 +561,22 @@
 
192
 
 
193
 ps-am:
 
194
 
 
195
-uninstall-am: uninstall-info-am uninstall-pkgdataDATA \
 
196
-       uninstall-sbinPROGRAMS uninstall-sbinSCRIPTS
 
197
+uninstall-am: uninstall-info-am uninstall-libexecPROGRAMS \
 
198
+       uninstall-libexecSCRIPTS uninstall-pkgdataDATA
 
199
 
 
200
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 
201
-       clean-libtool clean-sbinPROGRAMS ctags distclean \
 
202
+       clean-libexecPROGRAMS clean-libtool ctags distclean \
 
203
        distclean-compile distclean-generic distclean-libtool \
 
204
        distclean-tags distdir dvi dvi-am info info-am install \
 
205
        install-am install-data install-data-am install-exec \
 
206
-       install-exec-am install-info install-info-am install-man \
 
207
-       install-pkgdataDATA install-sbinPROGRAMS install-sbinSCRIPTS \
 
208
-       install-strip installcheck installcheck-am installdirs \
 
209
-       maintainer-clean maintainer-clean-generic mostlyclean \
 
210
-       mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
 
211
-       pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am \
 
212
-       uninstall-pkgdataDATA uninstall-sbinPROGRAMS \
 
213
-       uninstall-sbinSCRIPTS
 
214
+       install-exec-am install-info install-info-am \
 
215
+       install-libexecPROGRAMS install-libexecSCRIPTS install-man \
 
216
+       install-pkgdataDATA install-strip installcheck installcheck-am \
 
217
+       installdirs maintainer-clean maintainer-clean-generic \
 
218
+       mostlyclean mostlyclean-compile mostlyclean-generic \
 
219
+       mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
 
220
+       uninstall-am uninstall-info-am uninstall-libexecPROGRAMS \
 
221
+       uninstall-libexecSCRIPTS uninstall-pkgdataDATA
 
222
 
 
223
 
 
224
 #
 
225
@@ -584,8 +585,8 @@
 
226
 
 
227
 install-exec-hook:
 
228
        @list='$(psf_LINKS)'; for l in $$list; do \
 
229
-               rm $(DESTDIR)$(sbindir)/$$l 2>/dev/null || true; \
 
230
-               (cd $(DESTDIR)$(sbindir) && $(LN_S) psf $$l);  \
 
231
+               rm $(DESTDIR)$(libexecdir)/$$l 2>/dev/null || true; \
 
232
+               (cd $(DESTDIR)$(libexecdir) && $(LN_S) psf $$l);  \
 
233
        done
 
234
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 
235
 # Otherwise a system limit (for SysV at least) may be exceeded.