Skip to content

Instantly share code, notes, and snippets.

@mariuz
Created February 28, 2014 10:48
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save mariuz/9269041 to your computer and use it in GitHub Desktop.
Save mariuz/9269041 to your computer and use it in GitHub Desktop.
ubuntu lucid builld patch for debian building
diff -Nru firebird2.5-2.5.2.26540.ds4/debian/compat firebird2.5-2.5.2.26540.ds4/debian/compat
--- firebird2.5-2.5.2.26540.ds4/debian/compat 2013-10-06 23:12:41.000000000 +0300
+++ firebird2.5-2.5.2.26540.ds4/debian/compat 2013-11-08 11:07:31.000000000 +0200
@@ -1 +1 @@
-9
+7
diff -Nru firebird2.5-2.5.2.26540.ds4/debian/control firebird2.5-2.5.2.26540.ds4/debian/control
--- firebird2.5-2.5.2.26540.ds4/debian/control 2013-10-10 20:52:48.000000000 +0300
+++ firebird2.5-2.5.2.26540.ds4/debian/control 2013-11-08 10:29:32.000000000 +0200
@@ -1,18 +1,17 @@
Source: firebird2.5
Section: database
Priority: optional
-Maintainer: Debian Firebird Group <pkg-firebird-general@lists.alioth.debian.org>
+Maintainer: Popa Adrian Marius (Mariuz) <mapopa@gmail.com>
Uploaders: Damyan Ivanov <dmn@debian.org>
Build-Depends:
autoconf,
automake,
bison,
- debhelper (>= 9),
- docbook-to-man,
- dpkg-dev (>= 1.16.1),
+ debhelper,
+ docbook-to-man,
gawk,
help2man,
- libatomic-ops-dev (>= 1.2+cvs20091005),
+ libatomic-ops-dev,
libedit-dev,
libicu-dev,
libtool,
@@ -122,7 +121,6 @@
Package: libfbclient2
Section: libs
Architecture: any
-Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, firebird2.5-common (= ${source:Version}),
${misc:Depends},
@@ -171,7 +169,6 @@
Package: libib-util
Section: libs
Architecture: any
-Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends},
firebird2.5-common-doc (= ${source:Version})
@@ -187,7 +184,6 @@
Package: firebird2.5-common
Architecture: all
-Multi-Arch: foreign
Depends: ${misc:Depends},
firebird2.5-common-doc (= ${source:Version})
Description: common files for firebird 2.5 servers and clients
@@ -288,7 +284,6 @@
Package: firebird2.5-common-doc
Section: doc
Architecture: all
-Multi-Arch: foreign
Depends: ${misc:Depends}
Description: copyright, licensing and changelogs of firebird2.5
This is an (otherwise) empty package contains the copyright and licensing
@@ -339,7 +334,6 @@
Section: debug
Priority: extra
Architecture: any
-Multi-Arch: same
Depends: ${misc:Depends},
firebird2.5-common-doc (= ${source:Version}),
libfbclient2 (= ${binary:Version})
diff -Nru firebird2.5-2.5.2.26540.ds4/debian/rules firebird2.5-2.5.2.26540.ds4/debian/rules
--- firebird2.5-2.5.2.26540.ds4/debian/rules 2013-10-06 23:12:41.000000000 +0300
+++ firebird2.5-2.5.2.26540.ds4/debian/rules 2013-11-08 14:14:15.000000000 +0200
@@ -61,15 +61,14 @@
confflags += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
--disable-static --with-gpre-cobol --with-system-icu \
--with-system-editline --prefix=/usr --with-fbsbin=/usr/sbin \
- --with-fblib=/usr/lib/$(DEB_HOST_MULTIARCH) \
+ --with-fblib=/usr/lib \
--with-fbconf=/etc/firebird/${FB_VER} --with-fbdoc=${DOC} \
--with-fbudf=${ULFB}/UDF --with-fbsample=${DOC}/examples \
--with-fbsample-db=${DOC}/examples/empbuild \
--with-fbhelp=${VAR}/system --with-fbintl=${ULFB}/intl \
--with-fbmisc=${ULFB}/misc --with-fbsecure-db=${VAR}/system \
--with-fbmsg=${USFB} --with-fblog=/var/log --with-fbglock=${RUN} \
- --with-fbplugins=${ULFB}/plugins \
- $(shell dpkg-buildflags --export=configure)
+ --with-fbplugins=${ULFB}/plugins
# see #575564
export FIREBIRD_LOCK=$(CURDIR)/debian/tmp-lock
@@ -163,7 +162,7 @@
echo Starting build-super-server
dh_testdir
[ -d $(FIREBIRD_TMP) ] || mkdir $(FIREBIRD_TMP)
- $(shell dpkg-buildflags --export=sh); $(MAKE) $(NJOBS)
+ $(MAKE)
# moving to SuperServer target
rm -rf ./debian/firebird-super
@@ -178,7 +177,7 @@
echo Starting build-classic-server
dh_testdir
[ -d $(FIREBIRD_TMP) ] || mkdir $(FIREBIRD_TMP)
- $(shell dpkg-buildflags --export=sh); $(MAKE) $(NJOBS)
+ $(MAKE)
# moving to ClassicServer target
rm -rf ./debian/firebird-classic
@@ -280,7 +279,7 @@
dh_installdeb -i
dh_gencontrol -i
dh_md5sums -i
- dh_builddeb -i -- -Zxz
+ dh_builddeb -i -- -Zgzip
.PHONY: binary-arch
@@ -324,7 +323,7 @@
dh_shlibdeps -a
dh_gencontrol -a
dh_md5sums -a
- dh_builddeb -a -- -Zxz
+ dh_builddeb -a -- -Zgzip
.PHONY: binary
binary: binary-indep binary-arch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment