[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: New libode version



Hi, this is the patch I did:


--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ode (2:0.13.1+git20150309-1) UNRELEASED; urgency=low
+ode (2:0.13.1+git20150309-1) unstable; urgency=low

[ Jonathan Dowland ]
* Team upload.



--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+debian/ode-config.1


--- a/debian/control
+++ b/debian/control
@@ -4,10 +4,9 @@ Priority: optional
Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
Uploaders: Barry deFreese <bddebian@comcast.net>,
Leopold Palomo-Avellaneda <leo@alaxarxa.net>
-Build-Depends: debhelper (>= 9), docbook-to-man, autotools-dev,
- automake, libtool,
+Build-Depends: debhelper (>= 9), docbook-to-man, dh-autoreconf,
libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev,
- libccd-dev, pkg-config
+ libccd-dev
Standards-Version: 3.9.6
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/ode.git
Vcs-Git: git://anonscm.debian.org/pkg-games/ode.git


--- a/debian/rules
+++ b/debian/rules
@@ -28,18 +28,19 @@ else
CONFIG_OPTS = --enable-double-precision
endif

-CONFIG_OPTS += --prefix=/usr \
-                    --mandir=/usr/share/man \
+CONFIG_OPTS +=     --mandir=/usr/share/man \
--with-libccd=system \
--enable-libccd \
--enable-shared \
--enable-static

%:
-       dh $@ --parallel --with autotools-dev
+       dh $@ --parallel --with autoreconf
+
+override_dh_autoreconf:
+       dh_autoreconf ./bootstrap

override_dh_auto_configure:
-       ./bootstrap
dh_auto_configure -- $(CONFIG_OPTS)

override_dh_auto_build:


summary:
- set changelog to unstable
- remove manpage in clean target
- switch to dh-autoreconf and remove useless dependencies
- remove "prefix" and use autoreconf

everything seems good so far, note: I didn't test the binary
http://debomatic-amd64.debian.net/distribution#unstable/ode/0.13.1+git20150309-1/lintian

there are some lintian warnings about copyright, but everything seems good to me, not sure if they
are false positive or issues introduced by the spaces between License: and the description.

the other stuff looks good now

let me know how do you feel about this patch, and please test the result.

cheers,

G.
From 157313d366e1bf1724c0237e1310da39db104b61 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Tue, 13 Oct 2015 10:38:45 +0200
Subject: [PATCH] Fix packaging

---
 debian/changelog | 2 +-
 debian/clean     | 1 +
 debian/control   | 5 ++---
 debian/rules     | 9 +++++----
 4 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 debian/clean

diff --git a/debian/changelog b/debian/changelog
index a3e0ff1..cf92f81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ode (2:0.13.1+git20150309-1) UNRELEASED; urgency=low
+ode (2:0.13.1+git20150309-1) unstable; urgency=low
 
   [ Jonathan Dowland ]
   * Team upload.
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..9b4cd03
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+debian/ode-config.1
diff --git a/debian/control b/debian/control
index 9cee233..0256835 100644
--- a/debian/control
+++ b/debian/control
@@ -4,10 +4,9 @@ Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
 Uploaders: Barry deFreese <bddebian@comcast.net>, 
 	   Leopold Palomo-Avellaneda <leo@alaxarxa.net>
-Build-Depends: debhelper (>= 9), docbook-to-man, autotools-dev,
- automake, libtool,
+Build-Depends: debhelper (>= 9), docbook-to-man, dh-autoreconf,
  libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev,
- libccd-dev, pkg-config
+ libccd-dev
 Standards-Version: 3.9.6
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/ode.git
 Vcs-Git: git://anonscm.debian.org/pkg-games/ode.git
diff --git a/debian/rules b/debian/rules
index fbd35a3..f1cdb28 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,18 +28,19 @@ else
 	CONFIG_OPTS = --enable-double-precision
 endif
 
-CONFIG_OPTS += --prefix=/usr \
-                    --mandir=/usr/share/man \
+CONFIG_OPTS +=     --mandir=/usr/share/man \
                     --with-libccd=system \
 		    --enable-libccd \
                     --enable-shared \
 		    --enable-static
 
 %:
-	dh $@ --parallel --with autotools-dev
+	dh $@ --parallel --with autoreconf
+
+override_dh_autoreconf:
+	dh_autoreconf ./bootstrap
 
 override_dh_auto_configure:
-	./bootstrap
 	dh_auto_configure -- $(CONFIG_OPTS)
 
 override_dh_auto_build:
-- 
2.1.4


Reply to: