On Sun, 06 Apr 2008 at 21:38:30 +0200, Jonas Smedegaard wrote: > On Sun, Apr 06, 2008 at 08:16:23PM +0100, Simon McVittie wrote: > >OK, I take that back. Upstream's "make dist" misses out half the > >tarball, so no, it's not going to be easier to do it that way. > > > >I'll try to prepare a cleaned-up tarball with only unnecessary files > >missing. > > Great that you are looking into this. > > No need for you to prepare a new tarball: I already (in the form of a > cdbs snippet) have a mechanism for autorebuilding tarball by simply > listing the files that needs to be stripped.
I noticed. I attach a diff against collab-maint svn that sets up that
snippet to build version 1.4.1+dfsg1, which is what I'd have been asking
someone to NMU if you hadn't responded.
(I must admit that I don't much like the cdbs setup of this particular
package - the copyright-tracking stuff in particular seems incredibly fragile,
and I've been fighting with build systems for bug-squashing NMUs all weekend.
Still, it's your package...)
> And would you perhaps be interested in helping maintain this package in
> the future? I would be happy to grant you write access to the VCS used
> for the packaging, if you are interested.
I'm in collab-maint already (I have a package in bzr there), but to be honest
my only interest in libgtkol is that it had a release-goal bug that looked
easy! I didn't realise at that point that I'd be filing and fixing an RC bug
as a result...
Simon
Index: debian/control
===================================================================
--- debian/control (revision 9098)
+++ debian/control (working copy)
@@ -14,8 +14,8 @@
Provides: libgtkol-dev
Conflicts: libgtkol-dev
Architecture: any
-Description: GTK C++ Object Layer - development files
- GTK C++ Object Layer based on the libgenerics abstract services and the
+Description: GTK+ C++ Object Layer - development files
+ GTK+ C++ Object Layer based on the libgenerics abstract services and the
Gtk API.
.
Offers a complete intuitive object API without restricting access to
@@ -28,8 +28,8 @@
Depends: ${shlibs:Depends}
Suggests: libgd-docs
Architecture: any
-Description: GTK C++ Object Layer - shared libraries
- GTK C++ Object Layer based on the libgenerics abstract services and the
+Description: GTK+ C++ Object Layer - shared libraries
+ GTK+ C++ Object Layer based on the libgenerics abstract services and the
Gtk API.
.
Offers a complete intuitive object API without restricting access to
@@ -40,8 +40,8 @@
Package: libgtkol-docs
Section: doc
Architecture: all
-Description: GTK C++ Object Layer - documentation
- GTK C++ Object Layer based on the libgenerics abstract services and the
+Description: GTK+ C++ Object Layer - documentation
+ GTK+ C++ Object Layer based on the libgenerics abstract services and the
Gtk API.
.
Offers a complete intuitive object API without restricting access to
Index: debian/changelog
===================================================================
--- debian/changelog (revision 9098)
+++ debian/changelog (working copy)
@@ -1,3 +1,15 @@
+libgtkol (1.4.1+dfsg1-0.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix failure to double-build by restoring the (slightly strange) contents
+ of the upstream tarball during clean (Closes: #442637).
+ - Please attempt a double-build at least once per upstream release, since
+ you'll likely need to revert this if upstream start using 'make dist'
+ properly
+ * Quieten lintian by giving GTK+ its full title in debian/control
+
+ -- Simon McVittie <[EMAIL PROTECTED]> Sun, 06 Apr 2008 18:08:28 +0000
+
libgtkol (1.4.1-2) unstable; urgency=low
* Change debian/watch to use svn-upgrade (not uupdate invoked by default).
Index: debian/rules
===================================================================
--- debian/rules (revision 9098)
+++ debian/rules (working copy)
@@ -23,6 +23,26 @@
DEB_UPSTREAM_URL = http://prdownloads.sourceforge.net/$(pkgbasename)
DEB_UPSTREAM_TARBALL_MD5 = f8b7acc0fcd9da0a3931dc14d7d262ae
+DEB_UPSTREAM_REPACKAGE_DELIMITER = +
+DEB_UPSTREAM_REPACKAGE_TAG = dfsg1
+DEB_UPSTREAM_TARBALL_VERSION_MANGLE = s/\\+dfsg1$$//
+
+DEB_UPSTREAM_REPACKAGE_EXCLUDE = \
+ xml-reader \
+ source/xml-reader \
+ gtkol-demo/xml-reader \
+ config.log \
+ config.status \
+ *.pc \
+ autom4te.cache \
+ config.h \
+ Makefile \
+ */Makefile \
+ */.deps \
+ *.so \
+ *.loT \
+ stamp-h1
+
# Disable samples for now - it fails to build with "/usr/bin/ld: gtkol-runtime.o: relocation R_X86_64_32 against `a local symbol' can not be used when making a shared object; recompile with -fPIC"
#DEB_CONFIGURE_USER_FLAGS = --enable-examples
@@ -30,10 +50,6 @@
#DEB_INSTALL_EXAMPLES_$(pkgname)-dev = samples/*
-# Avoid binaries distributed with upstream tarball
-clean::
- rm -f xml-reader samples/gtkol-runtime/xml-reader
-
# Let d-shlibs calculate development package dependencies
# and handle shared library install
# Suppress wrongly resolved build-essential libstdc++6-dev (see bug#374049)
@@ -51,6 +67,12 @@
clean::
rm -f debian/install-libs-stamp
+ rm -f config.sub
+ rm -f config.guess
+ rm -f ltmain.sh
+ ln -nsf /usr/share/libtool/ltmain.sh ltmain.sh
+ ln -nsf /usr/share/libtool/config.guess config.guess
+ ln -nsf /usr/share/libtool/config.sub config.sub
# Needed by upstream build process
CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), libxml2-dev, libglib2.0-dev, libgtk2.0-dev, libgenerics-dev
Index: debian/copyright_hints
===================================================================
--- debian/copyright_hints (revision 9098)
+++ debian/copyright_hints (working copy)
@@ -12,12 +12,10 @@
include/Makefile.in: GENERATED FILE [1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002]
include/caboutdialog.h: UNKNOWN [("copyright");]
install-sh: MIT/X11 (BSD like) [and license / notice and this permission notice shall be included in / 1994 X Consortium]
+libtool: GPL-2+ GENERATED FILE [1996, 1997, 1998, 1999, 2000, 2001]
ltmain.sh: GPL-2+ GENERATED FILE [1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006]
missing: GPL GENERATED FILE [1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006]
samples/Makefile.in: GENERATED FILE [1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002]
-samples/Makefile: GENERATED FILE [1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002]
samples/gtkol-runtime/Makefile.in: GENERATED FILE [1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002]
-samples/gtkol-runtime/Makefile: GENERATED FILE [1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002]
samples/gtkol-runtime/modules/Makefile.in: GENERATED FILE [1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002]
-samples/gtkol-runtime/modules/Makefile: GENERATED FILE [1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002]
source/Makefile.in: GENERATED FILE [1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002]
signature.asc
Description: Digital signature
