Save work

7 files changed, 49 insertions, 14 deletions

diff --git a/.bzrignore b/.bzrignore
new file mode 100644
index 0000000..2386f62
--- /dev/null
+++ b/.bzrignore
@@ -0,0 +1,3 @@
+.git
+**/.git
+**/.pc
diff --git a/debian/changelog b/debian/changelog
index 28b487b..ede3acd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xbase64 (4.0.2-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Wed, 07 Dec 2022 13:17:50 +0100
+
 xbase64 (3.1.2-14) unstable; urgency=medium
 
   * Migrate to debhelper-compat 13:
diff --git a/debian/control b/debian/control
index 2b02071..d7ea41c 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Jörg Frings-Fürst <debian@jff.email>
 Standards-Version: 4.6.1.0
 Rules-Requires-Root: no
 Build-Depends:
+ cmake,
  debhelper-compat (= 13),
  doxygen
 Homepage: http://sourceforge.net/projects/xdb/
diff --git a/debian/patches/0140-Select_build_system.patch b/debian/patches/0140-Select_build_system.patch
new file mode 100644
index 0000000..c59b138
--- /dev/null
+++ b/debian/patches/0140-Select_build_system.patch
@@ -0,0 +1,7 @@
+Index: trunk/CMakeLists.txt
+===================================================================
+--- /dev/null
++++ trunk/CMakeLists.txt
+@@ -0,0 +1,2 @@
++cmake_minimum_required(VERSION 3.0)
++include(${CMAKE_CURRENT_SOURCE_DIR}/build/linux64/CMakeLists.txt)
diff --git a/debian/patches/0145-int64.patch b/debian/patches/0145-int64.patch
new file mode 100644
index 0000000..127b20f
--- /dev/null
+++ b/debian/patches/0145-int64.patch
@@ -0,0 +1,14 @@
+Index: trunk/src/include/xbase.h
+===================================================================
+--- trunk.orig/src/include/xbase.h
++++ trunk/src/include/xbase.h
+@@ -20,6 +20,9 @@ Email Contact:
+ #include <time.h>
+ #include <math.h>
+ 
++typedef long long __int64;
++typedef int int __int32;
++
+ #ifdef HAVE_INTTYPES_H
+ #include <inttypes.h>
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
index a362949..5cd5734 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,11 +1,13 @@
-0125-gcc6.patch
-0130-typos.patch
-0700-ReproducibleBuilds.patch
-0100-typo.patch
-0001-fixconfig.diff
-0005-autoconf-updates.diff
-0105-lesserg.diff
-0110-c++-includes.diff
-0115-gcc-fixes.diff
-0120-fix-types-include.diff
-0135-replace_gets.patch
+#0125-gcc6.patch
+#0130-typos.patch
+#0700-ReproducibleBuilds.patch
+#0100-typo.patch
+#0001-fixconfig.diff
+#0005-autoconf-updates.diff
+#0105-lesserg.diff
+#0110-c++-includes.diff
+#0115-gcc-fixes.diff
+#0120-fix-types-include.diff
+#0135-replace_gets.patch
+0145-int64.patch
+0140-Select_build_system.patch
diff --git a/debian/rules b/debian/rules
index 6424b10..e91a627 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,10 +21,12 @@ CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-static
+	#dh_auto_configure -- --enable-static
+	cd build/linux64/
+	dh_auto_configure --buildsystem=cmake
 
 override_dh_install-arch:
-	chmod -x examples/*.cpp
+	# chmod -x examples/*.cpp
 	dh_install
 	#
 	# rename arch-dependent file to name-MULTIARCH.ext
@@ -34,7 +36,7 @@ override_dh_install-arch:
 	cd $(CURDIR)/debian/libxbase64-dev/usr/include/xbase64 && ln -rs xbconfig-$(DEB_HOST_MULTIARCH).h xbconfig.h
 
 override_dh_install-indep:
-	chmod -x examples/*.cpp
+	# chmod -x examples/*.cpp
 	dh_install
 
 override_dh_makeshlibs: