Bug#832150: xmacro adoption

2017-01-05 Thread Vincent Carluer 
Hello,

The first reason I do it is to help.
I have already done modification but no one integrated my RFS:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=848384
And now I think Andreas Beckman from QA as uploaded another version...
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=831195

I don't really understand, I am new to the process.

Regards,

Vincent Carluer

2016-12-31 18:04 GMT+01:00 Eduard Bloch :
> On Wed, 7 Dec 2016 21:05:24 +0100 Vincent Carluer  wrote:
>> Hello,
>>
>> I would be glad to adopt this package if it is OK with you.
>> I am a senior dev newbie with Debian dev/packaging but motivated :D
>>
>> I've talked about the idea to adopt this package to debian-mentors and it
>> seems they agree it could be a good idea.
>>
>> They said to me there is a RC bug (Fails To Build From Source) I should
>> start to fix and than the stretch freeze is close.
>>
>> So do you agree than I adopt xmacro?
>> Can you help me a little to start?
>> What is the next step?
>> Do you have any other advice?
>
> Hello,
>
> no special advice. You can take it if you want but I really hope that
> you actually use it and don't take it as a sandbox for practicing.
>
> You can find the diff attached. This is something I wanted to upload
> today (in the hope that it will make it before freeze) since I forgot
> about your mail (and I cannot find it anymore in my mailbox, sorry).
>
> It's not perfect way of solving this in terms of best packaging
> practices (inline patch instead of patch series, installed as
> auto-generated single-debian-patch). But I wouldn't mess with patch
> series maintenance for such trivial changes.
>
> Regards,
> Eduard.

Bug#832150: xmacro adoption

2016-12-31 Thread Eduard Bloch 
On Wed, 7 Dec 2016 21:05:24 +0100 Vincent Carluer  wrote:
> Hello,
> 
> I would be glad to adopt this package if it is OK with you.
> I am a senior dev newbie with Debian dev/packaging but motivated :D
> 
> I've talked about the idea to adopt this package to debian-mentors and it
> seems they agree it could be a good idea.
> 
> They said to me there is a RC bug (Fails To Build From Source) I should
> start to fix and than the stretch freeze is close.
> 
> So do you agree than I adopt xmacro?
> Can you help me a little to start?
> What is the next step?
> Do you have any other advice?

Hello,

no special advice. You can take it if you want but I really hope that
you actually use it and don't take it as a sandbox for practicing.

You can find the diff attached. This is something I wanted to upload
today (in the hope that it will make it before freeze) since I forgot
about your mail (and I cannot find it anymore in my mailbox, sorry).

It's not perfect way of solving this in terms of best packaging
practices (inline patch instead of patch series, installed as
auto-generated single-debian-patch). But I wouldn't mess with patch
series maintenance for such trivial changes.

Regards,
Eduard.
diff --git a/debian/changelog b/debian/changelog
index a400044..c19da21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xmacro (0.3pre-2911-7) unstable; urgency=medium
+
+  * Fixing build failure with GCC-6 via rearanging the header order
+(closes: #831195)
+  * Align DH compat level and build dependency, require 9+
+
+ -- Eduard Bloch   Fri, 22 Jul 2016 22:26:14 +0200
+
 xmacro (0.3pre-2911-6) unstable; urgency=low
 
   * Proper build with original tarball
diff --git a/debian/compat b/debian/compat
index f599e28..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+9
diff --git a/debian/control b/debian/control
index 9263595..3945804 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xmacro
 Section: utils
 Priority: optional
 Maintainer: Eduard Bloch 
-Build-Depends: debhelper (>> 5.0), libx11-dev, libxtst-dev
+Build-Depends: debhelper (>> 9), libx11-dev, libxtst-dev
 Standards-Version: 3.9.2
 
 Package: xmacro
diff --git a/debian/rules b/debian/rules
index 84df31e..cd9d3c8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,87 +1,16 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+-include /usr/share/quilt/quilt.make
 
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-   CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-   INSTALL_PROGRAM += -s
-endif
+%:
+   dh $@ --parallel --with quilt
 
-CXXFLAGS=-g -O2
-export CXXFLAGS
-
-configure: configure-stamp
-configure-stamp:
-   dh_testdir
-   # Add here commands to configure the package.
-
-   touch configure-stamp
-
-
-build: build-stamp
-
-build-stamp: configure-stamp 
-   dh_testdir
-
-   # Add here commands to compile the package.
-   $(MAKE)
-   #/usr/bin/docbook-to-man debian/xmacro-0.3pre.sgml > xmacro-0.3pre.1
-
-   touch build-stamp
-
-clean:
+override_dh_install:
dh_testdir
dh_testroot
-   rm -f build-stamp configure-stamp
-
-   # Add here commands to clean up after the build process.
-   $(MAKE) clean
-
-   dh_clean
-
-install: build
-   dh_testdir
-   dh_testroot
-   dh_clean -k
+   dh_prep  
dh_installdirs
-
-   # Add here commands to install the package into debian/xmacro-0.3pre.
-   install -Dpv xmacroplay-keys xmacroplay xmacrorec xmacrorec2 
$(CURDIR)/debian/xmacro/usr/bin
-
-build-arch: build
-
-build-indep: build
-
-# 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_installdocs
-   dh_installexamples
-   dh_installmenu
-   dh_installcron
-   dh_installman
-   dh_installinfo
-   dh_installchangelogs 
-   dh_link
-   dh_strip
-   dh_compress
-   dh_fixperms
-   chmod -x $(CURDIR)/debian/xmacro/usr/share/doc/xmacro/examples/*
-   dh_installdeb
-   dh_shlibdeps
-   dh_gencontrol
-   dh_md5sums
-   dh_builddeb -- -Zxz
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+   install -Dpv xmacroplay-keys xmacroplay xmacrorec xmacrorec2 
debian/xmacro/usr/bin
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/source/options

Bug#832150: xmacro adoption

2016-12-07 Thread Vincent Carluer 
Hello,

I would be glad to adopt this package if it is OK with you.
I am a senior dev newbie with Debian dev/packaging but motivated :D

I've talked about the idea to adopt this package to debian-mentors and it
seems they agree it could be a good idea.

They said to me there is a RC bug (Fails To Build From Source) I should
start to fix and than the stretch freeze is close.

So do you agree than I adopt xmacro?
Can you help me a little to start?
What is the next step?
Do you have any other advice?

Thank you very much for your time.

Vincent Carluer