augeas (1.2.0-1) UNRELEASED; urgency=medium

  * Non-maintainer upload.
  * Updated debian/libaugeas0.symbols
  * Switched to multiarch
  * Use debhelper sequencer (bump compat to 9)

7 files changed, 39 insertions, 105 deletions

diff --git a/debian/changelog b/debian/changelog
index 1a60738..e419830 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+augeas (1.2.0-1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Updated debian/libaugeas0.symbols
+  * Switched to multiarch
+  * Use debhelper sequencer (bump compat to 9)
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Sun, 09 Feb 2014 02:13:02 +0400
+
 augeas (1.2.0-0ubuntu1) trusty; urgency=low
 
   * New upstream release.
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 8c35a41..4b2121d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,13 @@
 Source: augeas
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Nicolas Valcárcel Scerpella <nvalcarcel@gmail.com>
+Maintainer: Nicolas Valcárcel Scerpella <nvalcarcel@gmail.com>
 Uploaders: Free Ekanayaka <freee@debian.org>, Micah Anderson <micah@debian.org>
-Build-Depends: debhelper (>= 5), dh-autoreconf, libreadline-dev, chrpath, 
+Build-Depends: debhelper (>= 9), dh-autoreconf, libreadline-dev, chrpath,
  naturaldocs (>= 1.51), texlive-latex-base,
  libxml2-dev, pkg-config
 Standards-Version: 3.9.3
 Section: libs
 Homepage: http://augeas.net/
-DM-Upload-Allowed: yes
 
 Package: augeas-tools
 Section: admin
@@ -27,6 +25,7 @@ Description: Augeas command line tools
 Package: libaugeas-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: libaugeas0 (= ${binary:Version}), libxml2-dev, ${shlibs:Depends},
  ${misc:Depends}
 Description: Development files for writing applications based on libaugeas0
@@ -40,6 +39,7 @@ Description: Development files for writing applications based on libaugeas0
 Package: libaugeas0
 Section: libs
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}, augeas-lenses
 Suggests: augeas-tools
 Description: Augeas configuration editing library and API
diff --git a/debian/libaugeas-dev.install b/debian/libaugeas-dev.install
index e0b94a5..b0a58e1 100644
--- a/debian/libaugeas-dev.install
+++ b/debian/libaugeas-dev.install
@@ -1,3 +1,3 @@
 usr/include/*
-usr/lib/*.so
-usr/lib/pkgconfig/augeas.pc
+usr/lib/*/*.so
+usr/lib/*/pkgconfig/augeas.pc
diff --git a/debian/libaugeas0.install b/debian/libaugeas0.install
index 093956b..3de3b10 100644
--- a/debian/libaugeas0.install
+++ b/debian/libaugeas0.install
@@ -1 +1 @@
-usr/lib/*.so.*
+usr/lib/*/*.so.*
diff --git a/debian/libaugeas0.symbols b/debian/libaugeas0.symbols
index c08f93e..a936d12 100644
--- a/debian/libaugeas0.symbols
+++ b/debian/libaugeas0.symbols
@@ -5,11 +5,14 @@ libaugeas.so.0 libaugeas0 #MINVER#
  AUGEAS_0.12.0@AUGEAS_0.12.0 0.8.1
  AUGEAS_0.14.0@AUGEAS_0.14.0 0.10.0
  AUGEAS_0.15.0@AUGEAS_0.15.0 0.10.0
+ AUGEAS_0.16.0@AUGEAS_0.16.0 1.2.0
+ AUGEAS_0.18.0@AUGEAS_0.18.0 1.2.0
  AUGEAS_0.8.0@AUGEAS_0.8.0 0.6.0
  __aug_close_memstream@AUGEAS_0.14.0 0.10.0
  __aug_init_memstream@AUGEAS_0.14.0 0.10.0
  __aug_load_module_file@AUGEAS_0.1.0 0.6.0
  aug_close@AUGEAS_0.1.0 0.6.0
+ aug_cp@AUGEAS_0.18.0 1.2.0
  aug_defnode@AUGEAS_0.8.0 0.6.0
  aug_defvar@AUGEAS_0.8.0 0.6.0
  aug_error@AUGEAS_0.10.0 0.6.0
@@ -19,20 +22,26 @@ libaugeas.so.0 libaugeas0 #MINVER#
  aug_get@AUGEAS_0.1.0 0.6.0
  aug_init@AUGEAS_0.1.0 0.6.0
  aug_insert@AUGEAS_0.1.0 0.6.0
+ aug_label@AUGEAS_0.16.0 1.2.0
  aug_load@AUGEAS_0.8.0 0.6.0
  aug_match@AUGEAS_0.1.0 0.6.0
  aug_mv@AUGEAS_0.1.0 0.6.0
  aug_print@AUGEAS_0.1.0 0.6.0
+ aug_rename@AUGEAS_0.16.0 1.2.0
  aug_rm@AUGEAS_0.1.0 0.6.0
  aug_save@AUGEAS_0.1.0 0.6.0
  aug_set@AUGEAS_0.1.0 0.6.0
  aug_setm@AUGEAS_0.11.0 0.7.2
  aug_span@AUGEAS_0.12.0 0.8.1
  aug_srun@AUGEAS_0.14.0 0.10.0
+ aug_text_retrieve@AUGEAS_0.16.0 1.2.0
+ aug_text_store@AUGEAS_0.16.0 1.2.0
  aug_to_xml@AUGEAS_0.15.0 0.10.0
+ aug_transform@AUGEAS_0.16.0 1.2.0
 libfa.so.1 libaugeas0 #MINVER#
  FA_1.0.0@FA_1.0.0 0.6.0
  FA_1.2.0@FA_1.2.0 0.7.0
+ FA_1.4.0@FA_1.4.0 1.2.0
  fa_ambig_example@FA_1.0.0 0.6.0
  fa_as_regexp@FA_1.0.0 0.6.0
  fa_compile@FA_1.0.0 0.6.0
@@ -40,6 +49,7 @@ libfa.so.1 libaugeas0 #MINVER#
  fa_concat@FA_1.0.0 0.6.0
  fa_contains@FA_1.0.0 0.6.0
  fa_dot@FA_1.0.0 0.6.0
+ fa_enumerate@FA_1.4.0 1.2.0
  fa_equals@FA_1.0.0 0.6.0
  fa_example@FA_1.0.0 0.6.0
  fa_expand_char_ranges@FA_1.0.0 0.6.0
diff --git a/debian/rules b/debian/rules
index 0c78b64..ff806ae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,109 +1,24 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-DEB_DH_MAKESHLIBS_ARGS = -- -c4
+include /usr/share/dpkg/default.mk
 
 ifeq ($(DEB_HOST_ARCH),armel)
 	CFLAGS += -O0
 endif
 
-config.status: configure
-	dh_testdir
-	
-	# Add here commands to configure the package.
-	LIBTOOLIZE=debian/preserving-libtoolize dh_autoreconf
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-		    --disable-silent-rules \
-                    --prefix=/usr --mandir=\$${prefix}/share/man \
-                    --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" \
-                    --enable-compile-warnings=yes \
-                    --with-naturaldocs-output=HTML \
-                    --with-pdfdocs
-
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp:  config.status
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-	
-	# Do non-regression tests
-	$(MAKE) check
-
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-
-	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) distclean
-	rm -f config.log
+%:
+	dh $@
 
-	dh_autoreconf_clean
-	dh_clean \
-	    --exclude=./tests/root/etc/group~ \
-	    --exclude=./tests/root/etc/multipath.conf~ \
-	    --exclude=./tests/root/etc/passwd~
+override_dh_auto_configure:
+	dh_auto_configure -- \
+			--enable-compile-warnings=yes \
+			--with-naturaldocs-output=HTML \
+			--with-pdfdocs
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k \
-	    --exclude=./tests/root/etc/group~ \
-	    --exclude=./tests/root/etc/multipath.conf~ \
-	    --exclude=./tests/root/etc/passwd~
-	dh_installdirs
+override_dh_makeshlibs:
+	dh_makeshlibs -- -c4
 
-	# Add here commands to install the package into debian/tmp
-	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
-	# Install vim syntax files
-	cp $(CURDIR)/doc/syntax/* \
-           $(CURDIR)/debian/augeas-doc/usr/share/vim/vimcurrent/syntax/
-	cp $(CURDIR)/doc/ftdetect/* \
-           $(CURDIR)/debian/augeas-doc/usr/share/vim/vimcurrent/ftdetect/
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs NEWS
-	dh_installdocs
-	dh_installexamples
-	dh_install --sourcedir=debian/tmp
-	dh_installman
-	dh_link
+override_dh_strip:
 	dh_strip --dbg-package augeas-dbg
-	#Strip rpath.
-	chrpath -d $(CURDIR)/debian/augeas-tools/usr/bin/augtool
-	chrpath -d $(CURDIR)/debian/augeas-tools/usr/bin/augparse
-	chrpath -d $(CURDIR)/debian/libaugeas0/usr/lib/libfa.so.*
-	chrpath -d $(CURDIR)/debian/libaugeas0/usr/lib/libaugeas.so.*
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs -V
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install