Download as
Browse Code »

Commit d63525e8d69c290601aa96916b7de2cf43bf9db8

Authored by perry.werneck@gmail.com
1 parent 0a2afbd5
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Corrigindo empacotamento debian

Showing 6 changed files with 25 additions and 33 deletions   Show diff stats
@@ -133,13 +133,10 @@ $(BINDIR)/Release/plugins/%@DLLEXT@: src/plugins/%/* $(BINDIR)/Release/$(PACKAGE @@ -133,13 +133,10 @@ $(BINDIR)/Release/plugins/%@DLLEXT@: src/plugins/%/* $(BINDIR)/Release/$(PACKAGE
133 133
134 #---[ Release targets ]-------------------------------------------------------- 134 #---[ Release targets ]--------------------------------------------------------
135 135
136 -all: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) \  
137 - $(foreach PLUGIN, $(PLUGINS), $(BINDIR)/Release/plugins/$(PLUGIN)@DLLEXT@) \  
138 - locale pixmaps filelist 136 +all: Release
139 137
140 -Release: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) \  
141 - $(foreach PLUGIN, $(PLUGINS), $(BINDIR)/Release/plugins/$(PLUGIN)@DLLEXT@) \  
142 - locale pixmaps 138 +Release: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) $(foreach PLUGIN, $(PLUGINS), $(BINDIR)/Release/plugins/$(PLUGIN)@DLLEXT@) \
  139 + locale pixmaps filelist
143 140
144 $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT): src/pw3270/* $(BINDIR)/Release@DLLDIR@/@DLLPREFIX@3270@DLLEXT@ $(DEPENDS) 141 $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT): src/pw3270/* $(BINDIR)/Release@DLLDIR@/@DLLPREFIX@3270@DLLEXT@ $(DEPENDS)
145 @$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 ../../$(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) 142 @$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 ../../$(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT)
@@ -193,12 +190,6 @@ ifneq ($(RPMBUILD),no) @@ -193,12 +190,6 @@ ifneq ($(RPMBUILD),no)
193 @rm -fr $(PWD)/$(TMPDIR)/rpmbuild 190 @rm -fr $(PWD)/$(TMPDIR)/rpmbuild
194 endif 191 endif
195 192
196 -deb: clean  
197 -ifneq ($(DPKGBUILD),no)  
198 - $(DPKGBUILD) -rfakeroot -uc -us  
199 -endif  
200 -  
201 -  
202 srpm: $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2 193 srpm: $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2
203 ifneq ($(RPMBUILD),no) 194 ifneq ($(RPMBUILD),no)
204 @$(RPMBUILD) --define="_srcrpmdir $(PWD)" -bs $(PACKAGE_TARNAME).spec 195 @$(RPMBUILD) --define="_srcrpmdir $(PWD)" -bs $(PACKAGE_TARNAME).spec
@@ -263,12 +254,12 @@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar: clean pixmaps filelist @@ -263,12 +254,12 @@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar: clean pixmaps filelist
263 install: install-sdk install-lib install-app install-man 254 install: install-sdk install-lib install-app install-man
264 255
265 install-app: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) install-locale 256 install-app: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) install-locale
266 - @$(MAKE) DESTDIR=$(DESTDIR) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 install 257 + @$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 install
267 @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/ui 258 @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/ui
268 @$(INSTALL_DATA) ui/*.xml $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/ui 259 @$(INSTALL_DATA) ui/*.xml $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/ui
269 260
270 install-lib: $(BINDIR)/Release@DLLDIR@/@DLLPREFIX@3270@DLLEXT@ 261 install-lib: $(BINDIR)/Release@DLLDIR@/@DLLPREFIX@3270@DLLEXT@
271 - @$(MAKE) DESTDIR=$(DESTDIR) BINRLS="../../.bin/Release@DLLDIR@" -C src/lib3270 install 262 + @$(MAKE) BINRLS="../../.bin/Release@DLLDIR@" -C src/lib3270 install
272 263
273 locale: $(foreach MO, $(basename $(LANG_FILES)), $(BINDIR)/Release/$(localedir)/$(notdir $(MO))/LC_MESSAGES/$(PACKAGE_NAME).mo) 264 locale: $(foreach MO, $(basename $(LANG_FILES)), $(BINDIR)/Release/$(localedir)/$(notdir $(MO))/LC_MESSAGES/$(PACKAGE_NAME).mo)
274 265
@@ -307,7 +298,6 @@ clean: @@ -307,7 +298,6 @@ clean:
307 @rm -f $(PACKAGE_NAME).png 298 @rm -f $(PACKAGE_NAME).png
308 @rm -f $(PACKAGE_NAME)-logo.png 299 @rm -f $(PACKAGE_NAME)-logo.png
309 @rm -f *.log 300 @rm -f *.log
310 - @rm -fr debian  
311 @echo "$@" 301 @echo "$@"
312 302
313 cleanDebug: clean 303 cleanDebug: clean
@@ -22,8 +22,7 @@ build-stamp: @@ -22,8 +22,7 @@ build-stamp:
22 # Add here commands to compile the package. 22 # Add here commands to compile the package.
23 ./configure --prefix=/usr 23 ./configure --prefix=/usr
24 rm -f debian/*.install 24 rm -f debian/*.install
25 - make filelist  
26 - make all 25 + make Release
27 # --- end custom part for compiling 26 # --- end custom part for compiling
28 27
29 touch build-stamp 28 touch build-stamp
@@ -34,7 +33,7 @@ clean: @@ -34,7 +33,7 @@ clean:
34 rm -f build-stamp 33 rm -f build-stamp
35 34
36 # Add here commands to clean up after the build process. 35 # Add here commands to clean up after the build process.
37 - make clean || true 36 + if [ -e Makefile ]; then make clean; fi
38 # --- end custom part for cleaning up 37 # --- end custom part for cleaning up
39 38
40 dh_clean 39 dh_clean
@@ -46,9 +45,11 @@ install: build @@ -46,9 +45,11 @@ install: build
46 dh_installdirs 45 dh_installdirs
47 46
48 # Add here commands to install the packages 47 # Add here commands to install the packages
49 - make DESTDIR=/usr/src/packages/BUILD/debian/lib3270 install-lib  
50 - make DESTDIR=/usr/src/packages/BUILD/debian/lib3270-dev install-sdk  
51 - make DESTDIR=/usr/src/packages/BUILD/debian/pw3270 install-app 48 + make DESTDIR=$(PWD)/debian/lib3270 install-lib
  49 + make DESTDIR=$(PWD)/debian/lib3270-dev install-sdk
  50 + make DESTDIR=$(PWD)/debian/pw3270 install-app
  51 +
  52 + find debian
52 # --- end custom part for installing 53 # --- end custom part for installing
53 54
54 # Build architecture-independent files here. 55 # Build architecture-independent files here.
@@ -80,7 +81,7 @@ binary-arch: build install @@ -80,7 +81,7 @@ binary-arch: build install
80 # dh_makeshlibs 81 # dh_makeshlibs
81 dh_installdeb 82 dh_installdeb
82 # dh_perl 83 # dh_perl
83 - dh_shlibdeps 84 +# dh_shlibdeps
84 dh_gencontrol 85 dh_gencontrol
85 dh_md5sums 86 dh_md5sums
86 dh_builddeb 87 dh_builddeb
@@ -11,6 +11,7 @@ mkdir debian @@ -11,6 +11,7 @@ mkdir debian
11 echo 7 > debian/compat 11 echo 7 > debian/compat
12 cp debian.control debian/control 12 cp debian.control debian/control
13 cp debian.rules debian/rules 13 cp debian.rules debian/rules
  14 +chmod +x debian/rules
14 15
15 EDITOR=true dch --preserve -v $VERSION-$PACKAGE_LEVEL -u low --create --package pw3270 16 EDITOR=true dch --preserve -v $VERSION-$PACKAGE_LEVEL -u low --create --package pw3270
16 sed -i "s@UNRELEASED@unstable@;s@Initial release. (Closes: #XXXXXX)@SVN Revision $PACKAGE_REVISION@" debian/changelog 17 sed -i "s@UNRELEASED@unstable@;s@Initial release. (Closes: #XXXXXX)@SVN Revision $PACKAGE_REVISION@" debian/changelog
@@ -5,7 +5,7 @@ msgid "" @@ -5,7 +5,7 @@ msgid ""
5 msgstr "" 5 msgstr ""
6 "Project-Id-Version: pw3270 5.0\n" 6 "Project-Id-Version: pw3270 5.0\n"
7 "Report-Msgid-Bugs-To: \n" 7 "Report-Msgid-Bugs-To: \n"
8 -"POT-Creation-Date: 2012-09-13 15:45-0300\n" 8 +"POT-Creation-Date: 2012-09-13 16:59-0300\n"
9 "PO-Revision-Date: 2012-09-05 09:05-0300\n" 9 "PO-Revision-Date: 2012-09-05 09:05-0300\n"
10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n" 10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
11 "Language-Team: Português do Brasil <>\n" 11 "Language-Team: Português do Brasil <>\n"
src/lib3270/Makefile.in
  Diff comments   View file @d63525e
@@ -111,10 +111,10 @@ include sources.mak @@ -111,10 +111,10 @@ include sources.mak
111 Release: $(BINRLS)/@DLLPREFIX@3270@DLLEXT@ 111 Release: $(BINRLS)/@DLLPREFIX@3270@DLLEXT@
112 112
113 install: Release 113 install: Release
114 - @$(MKDIR) $(DESTDIR)$(libdir)  
115 - @$(INSTALL_PROGRAM) $(BINRLS)/@DLLPREFIX@3270@DLLEXT@.@VERSION@ $(DESTDIR)$(libdir)  
116 - @$(LN_S) @DLLPREFIX@3270@DLLEXT@.@VERSION@ $(DESTDIR)$(libdir)/@DLLPREFIX@3270@DLLEXT@.@MAJOR_VERSION@  
117 - @$(LN_S) @DLLPREFIX@3270@DLLEXT@.@MAJOR_VERSION@ $(DESTDIR)$(libdir)/@DLLPREFIX@3270@DLLEXT@ 114 + $(MKDIR) $(DESTDIR)$(libdir)
  115 + $(INSTALL_PROGRAM) $(BINRLS)/@DLLPREFIX@3270@DLLEXT@.@VERSION@ $(DESTDIR)$(libdir)
  116 + $(LN_S) @DLLPREFIX@3270@DLLEXT@.@VERSION@ $(DESTDIR)$(libdir)/@DLLPREFIX@3270@DLLEXT@.@MAJOR_VERSION@
  117 + $(LN_S) @DLLPREFIX@3270@DLLEXT@.@MAJOR_VERSION@ $(DESTDIR)$(libdir)/@DLLPREFIX@3270@DLLEXT@
118 118
119 Debug: $(BINDBG)/@DLLPREFIX@3270@DLLEXT@ 119 Debug: $(BINDBG)/@DLLPREFIX@3270@DLLEXT@
120 120
src/pw3270/Makefile.in
  Diff comments   View file @d63525e
@@ -88,13 +88,13 @@ endif @@ -88,13 +88,13 @@ endif
88 Release: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) 88 Release: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT)
89 89
90 install: Release $(PACKAGE_NAME).desktop $(PACKAGE_NAME)-logo.png 90 install: Release $(PACKAGE_NAME).desktop $(PACKAGE_NAME)-logo.png
91 - @$(MKDIR) $(DESTDIR)$(bindir)  
92 - @$(INSTALL_PROGRAM) $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) $(DESTDIR)$(bindir) 91 + $(MKDIR) $(DESTDIR)$(bindir)
  92 + $(INSTALL_PROGRAM) $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) $(DESTDIR)$(bindir)
93 93
94 - @$(MKDIR) $(DESTDIR)$(libdir)  
95 - @$(INSTALL_PROGRAM) $(BINRLS)/lib/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@ $(DESTDIR)$(libdir)  
96 - @$(LN_S) @DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@ $(DESTDIR)$(libdir)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@MAJOR_VERSION@  
97 - @$(LN_S) @DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@MAJOR_VERSION@ $(DESTDIR)$(libdir)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@ 94 + $(MKDIR) $(DESTDIR)$(libdir)
  95 + $(INSTALL_PROGRAM) $(BINRLS)/lib/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@ $(DESTDIR)$(libdir)
  96 + $(LN_S) @DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@ $(DESTDIR)$(libdir)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@MAJOR_VERSION@
  97 + $(LN_S) @DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@MAJOR_VERSION@ $(DESTDIR)$(libdir)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@
98 98
99 @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME) 99 @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)
100 @$(INSTALL_DATA) $(PACKAGE_NAME).png $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME) 100 @$(INSTALL_DATA) $(PACKAGE_NAME).png $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)