summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorAaron M. Ucko <ucko@debian.org>2015-07-07 01:41:41 -0400
committerAaron M. Ucko <ucko@debian.org>2015-07-07 01:42:53 -0400
commiteb8f700223cf3b3d58d5ec08faa6a1d54cd590f0 (patch)
tree64a775bf053f30eddefb9e585b3362de6a28243b /debian
parent574b357ee8bd5c44a1511a5a29f60b2d659b263f (diff)
d/rules: Reflect changes in the sets of generated and shipped files.
Stop trying to preserve upstream's original fltk.spec; simply clean it up, along with documentation/doxygen_sqlite3.db.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog4
-rwxr-xr-xdebian/rules10
2 files changed, 5 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog
index bfcc079..67e77fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
fltk1.3 (1.3.3-1) UNRELEASED; urgency=medium
* New upstream release. (Closes: #791346.) (NOT RELEASED YET.)
+ * debian/rules: Stop trying to preserve upstream's original fltk.spec;
+ simply clean it up, along with documentation/doxygen_sqlite3.db.
- -- Aaron M. Ucko <ucko@debian.org> Tue, 07 Jul 2015 01:32:55 -0400
+ -- Aaron M. Ucko <ucko@debian.org> Tue, 07 Jul 2015 01:41:38 -0400
fltk1.3 (1.3.2-6) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index 0781fa8..2419208 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,16 +17,11 @@ libdir = /usr/lib/$(DEB_HOST_MULTIARCH)
%:
dh $@
-override_dh_auto_clean:
- mv fltk.spec fltk.spec.saved
- dh_auto_clean
- mv fltk.spec.saved fltk.spec
-
override_dh_clean:
- dh_clean fltk-config.unhardened
+ dh_clean documentation/doxygen_sqlite3.db \
+ fltk-config.unhardened fltk.spec
override_dh_auto_configure:
- mv fltk.spec fltk.spec.saved
dh_auto_configure -- CC="$(CC)" CXX="$(CXX)" \
--enable-shared --enable-cairo --enable-cp936 --libdir=$(libdir) \
$(shell DEB_BUILD_MAINT_OPTIONS=hardening=-all \
@@ -36,7 +31,6 @@ override_dh_auto_configure:
DSOFLAGS="$(filter-out -fPIE -pie,$(LDFLAGS))" \
--enable-shared --enable-cairo --enable-cp936 --with-links \
--libdir=$(libdir)
- mv fltk.spec.saved fltk.spec
override_dh_auto_build:
dh_auto_build -- OPTIM="$(CFLAGS) $(XCFLAGS)" STRIP=@: CAIROLIBS=-lcairo