Download as
Browse Code »

Commit cf350d2c73d65c52a4fb1988488e2b232eed1709

Authored by Perry Werneck
2 parents 993bf1d8 8a614fc1
Exists in master and in 1 other branch develop

Merge branch 'master' into develop

Showing 4 changed files with 12 additions and 24 deletions   Show diff stats
debian/control
  Diff comments   View file @cf350d2
@@ -2,24 +2,18 @@ Source: pw3270 @@ -2,24 +2,18 @@ Source: pw3270
2 Section: unknown 2 Section: unknown
3 Priority: optional 3 Priority: optional
4 Maintainer: Perry Werneck <perry.werneck@gmail.com> 4 Maintainer: Perry Werneck <perry.werneck@gmail.com>
5 -Build-Depends: debhelper (>= 7), autotools-dev, autoconf, libgtk-3-dev, gettext, desktop-file-utils, imagemagick, librsvg2-bin, libv3270-dev 5 +Build-Depends: debhelper (>= 7), lib3270-dev, libv3270-dev, autotools-dev, autoconf, libgtk-3-dev, gettext, desktop-file-utils
6 6
7 Package: pw3270 7 Package: pw3270
8 Architecture: any 8 Architecture: any
9 -Depends: ${misc:Depends}, ${shlibs:Depends} 9 +Depends: lib3270, libv3270, ${shlibs:Depends}, ${misc:Depends}
10 Description: IBM 3270 Terminal emulator for gtk 10 Description: IBM 3270 Terminal emulator for gtk
11 IBM 3270 terminal emulator gtk. It can be used to communicate with 11 IBM 3270 terminal emulator gtk. It can be used to communicate with
12 any IBM host that supports 3270-style connections over TELNET. 12 any IBM host that supports 3270-style connections over TELNET.
13 13
14 -Package: pw3270-keypads  
15 -Architecture: any  
16 -Depends: pw3270 (= ${binary:Version})  
17 -Description: Keypads for pw3270  
18 - This package provides optional keypads for pw3270 application.  
19 -  
20 Package: pw3270-dbg 14 Package: pw3270-dbg
21 Architecture: any 15 Architecture: any
22 Depends: pw3270 (= ${binary:Version}) 16 Depends: pw3270 (= ${binary:Version})
23 -Description: Debugging symbols for pw3270/lib3270 17 +Description: Debugging symbols for pw3270
24 This package contains the debugging symbols for pw3270's internal libs. 18 This package contains the debugging symbols for pw3270's internal libs.
25 19
debian/pw3270.dsc
  Diff comments   View file @cf350d2
@@ -4,10 +4,10 @@ Version: 5.4-0 @@ -4,10 +4,10 @@ Version: 5.4-0
4 Binary: pw3270 4 Binary: pw3270
5 Maintainer: Perry Werneck <perry.werneck@gmail.com> 5 Maintainer: Perry Werneck <perry.werneck@gmail.com>
6 Architecture: any 6 Architecture: any
7 -Build-Depends: debhelper (>= 7), autotools-dev, autoconf, automake, pkg-config, libgtk-3-dev, gettext, desktop-file-utils, imagemagick, librsvg2-bin, optipng, libv3270-dev 7 +Build-Depends: debhelper (>= 7), lib3270-dev, libv3270-dev, autotools-dev, autoconf, automake, pkg-config, libgtk-3-dev, gettext, desktop-file-utils, imagemagick, librsvg2-bin, optipng
8 Standards-Version: 3.9.1.0 8 Standards-Version: 3.9.1.0
9 DEBTRANSFORM-RELEASE: 1 9 DEBTRANSFORM-RELEASE: 1
10 Files: 10 Files:
11 - 00000000000000000000000000000000 000000 pw3270-5.3.tar.xz 11 + 00000000000000000000000000000000 000000 pw3270-unstable-5.3.tar.xz
12 12
13 13
@@ -27,17 +27,10 @@ build-stamp: @@ -27,17 +27,10 @@ build-stamp:
27 dh_testdir 27 dh_testdir
28 28
29 # Add here commands to compile the package. 29 # Add here commands to compile the package.
30 -  
31 - aclocal  
32 - autoconf  
33 -  
34 - mkdir -p scripts  
35 - automake --add-missing 2> /dev/null | true  
36 -  
37 - ./configure --prefix=/usr  
38 - 30 + NOCONFIGURE=1 ./autogen.sh
  31 + ./configure --prefix=/usr --enable-unstable --with-application-id=br.com.bb.pw3270.unstable
39 rm -f debian/*.install 32 rm -f debian/*.install
40 - make Release 33 + make all
41 34
42 # --- end custom part for compiling 35 # --- end custom part for compiling
43 36
@@ -66,8 +59,6 @@ install: build @@ -66,8 +59,6 @@ install: build
66 # Install main application 59 # Install main application
67 make DESTDIR=$(PWD)/debian/$(PACKAGE_NAME) install-application 60 make DESTDIR=$(PWD)/debian/$(PACKAGE_NAME) install-application
68 61
69 - # --- end custom part for installing  
70 -  
71 # Build architecture-independent files here. 62 # Build architecture-independent files here.
72 binary-indep: build install 63 binary-indep: build install
73 # We have nothing to do by default. 64 # We have nothing to do by default.
@@ -104,3 +95,4 @@ binary-arch: build install @@ -104,3 +95,4 @@ binary-arch: build install
104 95
105 binary: binary-indep binary-arch 96 binary: binary-indep binary-arch
106 .PHONY: build clean binary-indep binary-arch binary install 97 .PHONY: build clean binary-indep binary-arch binary install
  98 +
@@ -136,8 +136,10 @@ cp &quot;$(brew --prefix)/share/pw3270/colors.conf&quot; &quot;${res_path}&quot; @@ -136,8 +136,10 @@ cp &quot;$(brew --prefix)/share/pw3270/colors.conf&quot; &quot;${res_path}&quot;
136 # Bundle GLib schemas 136 # Bundle GLib schemas
137 echo "Bundling GLib schemas" 137 echo "Bundling GLib schemas"
138 mkdir -p "${tmp}/schemas" 138 mkdir -p "${tmp}/schemas"
139 -cp "../schemas/linux/"*".xml" "${tmp}/schemas" 139 +
  140 +cp "$(brew --prefix)$(pkg-config gtk+-3.0 --variable=prefix)/share/glib-2.0/schemas/pw3270*.gschema.xml" "${tmp}/schemas"
140 cp "$(pkg-config gtk+-3.0 --variable=prefix)/share/glib-2.0/schemas/org.gtk.Settings."*".gschema.xml" "${tmp}/schemas" 141 cp "$(pkg-config gtk+-3.0 --variable=prefix)/share/glib-2.0/schemas/org.gtk.Settings."*".gschema.xml" "${tmp}/schemas"
  142 +
141 glib-compile-schemas --targetdir="${res_path}" "${tmp}/schemas" 143 glib-compile-schemas --targetdir="${res_path}" "${tmp}/schemas"
142 144
143 # Create the GTK settings file 145 # Create the GTK settings file