Skip to content

Commit

Permalink
Remove debian from sources
Browse files Browse the repository at this point in the history
Debian does it's own thing and doesn't want a debian directory
in the dist tarball.

It's too tricky to do it optional, so just nuke everything and
revisit after the package lands in debian proper.

Signed-off-by: Pantelis Antoniou <[email protected]>
  • Loading branch information
pantoniou committed Nov 15, 2021
1 parent aa4916c commit d21b1fb
Show file tree
Hide file tree
Showing 11 changed files with 1 addition and 219 deletions.
47 changes: 1 addition & 46 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ EXTRA_DIST=bootstrap.sh \
build-aux/shave.in build-aux/shave-libtool.in \
build-aux/git-version-gen \
README.md LICENSE \
debian \
Dockerfile Dockerfile-build-deb \
Dockerfile.alpine Dockerfile.centos

Expand All @@ -30,9 +29,7 @@ MAINTAINERCLEANFILES = \
build-aux/ltmain.sh build-aux/missing build-aux/tap-driver.sh

DISTCLEANFILES = \
.version \
debian/changelog debian/control debian/copyright \
debian/libfyaml-dev.install debian/libfyaml-utils.install debian/libfyaml-$(DEBVERSION).install
.version

clean-local:

Expand All @@ -41,24 +38,8 @@ SUBDIRS = src test doc
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libfyaml.pc

if HAVE_DPKG
DEB_ARTIFACTS= \
$(PACKAGE_NAME)-$(DEBVERSION)_$(DEBVERSION)_$(DPKG_ARCH).deb \
$(PACKAGE_NAME)-dev_$(DEBVERSION)_$(DPKG_ARCH).deb \
$(PACKAGE_NAME)-utils_$(DEBVERSION)_$(DPKG_ARCH).deb \
$(PACKAGE_NAME)_$(DEBVERSION).dsc \
$(PACKAGE_NAME)_$(DEBVERSION).tar.xz \
$(PACKAGE_NAME)_$(DEBVERSION)_$(DPKG_ARCH).build \
$(PACKAGE_NAME)_$(DEBVERSION)_$(DPKG_ARCH).changes
endif

maintainer-clean-local:
@rm -rf install sphinx
if HAVE_DPKG
@rm -rf $(DEB_ARTIFACTS)
@rm -rf $(PACKAGE_NAME)_$(DEBVERSION).orig.tar.gz
@rm -rf $(PACKAGE_NAME)-$(VERSION).tar.gz
endif
@rm -rf install artifacts

# extra file to put in the distribution
Expand All @@ -83,29 +64,3 @@ if HAVE_DOCKER
docker: Dockerfile
@DOCKER@ build -t libfyaml:$(VERSION) $(top_srcdir)
endif

if HAVE_DPKG

# note the package will not be signed
# deb: dist
# @cp $(PACKAGE_NAME)-$(VERSION).tar.gz $(PACKAGE_NAME)_$(DEBVERSION).orig.tar.gz
# @rm -rf $(PACKAGE_NAME)-$(VERSION)
# @tar zxf $(PACKAGE_NAME)-$(VERSION).tar.gz
# @(cd $(PACKAGE_NAME)-$(VERSION) && debuild -us -uc)

deb: $(DEB_ARTIFACTS)
@mkdir -p artifacts && mv $(DEB_ARTIFACTS) artifacts/
@rm -rf $(PACKAGE_NAME)-$(VERSION).tar.gz $(PACKAGE_NAME)-$(VERSION)/

$(PACKAGE_NAME)-$(VERSION).tar.gz: dist

$(PACKAGE_NAME)_$(DEBVERSION).orig.tar.gz: $(PACKAGE_NAME)-$(VERSION).tar.gz
@cp $< $@

$(PACKAGE_NAME)-$(VERSION)/: $(PACKAGE_NAME)-$(VERSION).tar.gz
@tar zxf $<

$(DEB_ARTIFACTS): $(PACKAGE_NAME)-$(VERSION)/
@(cd $< && debuild -us -uc)

endif
28 changes: 0 additions & 28 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -260,26 +260,6 @@ else
fi
AM_CONDITIONAL([HAVE_DOCKER], [ test x$HAVE_DOCKER = x1 ])

# note that debian does not support cross compilation
# so do not use it to build cross packages

# check for dpkg
AC_PATH_PROG([DPKG], [dpkg])
if test "x$DPKG" != "x" ; then
HAVE_DPKG=1
else
HAVE_DPKG=0
fi
AC_DEFINE_UNQUOTED([HAVE_DPKG], [$HAVE_DPKG], [Define to 1 if you have dpkg available])
AM_CONDITIONAL([HAVE_DPKG], [ test x$HAVE_DPKG = x1 ])

if test "x$HAVE_DPKG" = "x1" ; then
DPKG_ARCH=`$DPKG --print-architecture`
else
DPKG_ARCH="unknown"
fi
AC_SUBST(DPKG_ARCH, "$DPKG_ARCH")

# check for jq
AC_PATH_PROG([JQ], [jq])
if test "x$JQ" != "x" ; then
Expand All @@ -303,12 +283,6 @@ AC_CONFIG_FILES([
test/Makefile
doc/Makefile
libfyaml.pc
debian/changelog
debian/control
debian/copyright
debian/$PACKAGE_NAME-$DEBVERSION.install:debian/$PACKAGE_NAME.install.in
debian/$PACKAGE_NAME-dev.install
debian/$PACKAGE_NAME-utils.install
])

AC_REQUIRE_AUX_FILE([tap-driver.sh])
Expand All @@ -334,8 +308,6 @@ echo "
HAVE_SPHINX: ${HAVE_SPHINX}
GIT: $GIT
DOCKER: $DOCKER
HAVE_DPKG: $HAVE_DPKG
DPKG_ARCH: $DPKG_ARCH
TESTSUITEURL: $TESTSUITEURL
TESTSUITECHECKOUT: $TESTSUITECHECKOUT
JSONTESTSUITEURL: $JSONTESTSUITEURL
Expand Down
32 changes: 0 additions & 32 deletions debian/changelog.in

This file was deleted.

1 change: 0 additions & 1 deletion debian/compat

This file was deleted.

50 changes: 0 additions & 50 deletions debian/control.in

This file was deleted.

31 changes: 0 additions & 31 deletions debian/copyright.in

This file was deleted.

4 changes: 0 additions & 4 deletions debian/libfyaml-dev.install.in

This file was deleted.

1 change: 0 additions & 1 deletion debian/libfyaml-utils.install.in

This file was deleted.

1 change: 0 additions & 1 deletion debian/libfyaml.install.in

This file was deleted.

24 changes: 0 additions & 24 deletions debian/rules

This file was deleted.

1 change: 0 additions & 1 deletion debian/source/format

This file was deleted.

0 comments on commit d21b1fb

Please sign in to comment.