r46503 - in /packages/wordnet/trunk/debian: changelog control copyright goldendict-wordnet.bmp goldendict-wordnet.install goldendict-wordnet.xpm rules source/include-binaries
tille at users.alioth.debian.org
tille at users.alioth.debian.org
Wed Jan 29 19:59:18 UTC 2014
Author: tille
Date: Wed Jan 29 19:59:18 2014
New Revision: 46503
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46503
Log:
cdbs -> dh
Added:
packages/wordnet/trunk/debian/goldendict-wordnet.bmp (with props)
Removed:
packages/wordnet/trunk/debian/goldendict-wordnet.xpm
Modified:
packages/wordnet/trunk/debian/changelog
packages/wordnet/trunk/debian/control
packages/wordnet/trunk/debian/copyright
packages/wordnet/trunk/debian/goldendict-wordnet.install
packages/wordnet/trunk/debian/rules
packages/wordnet/trunk/debian/source/include-binaries
Modified: packages/wordnet/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/changelog?rev=46503&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/changelog (original)
+++ packages/wordnet/trunk/debian/changelog Wed Jan 29 19:59:18 2014
@@ -8,6 +8,9 @@
* debian/changelog.old_dict-wn: removed
* Remove redundant parts from long description
Closes: #736371
+ * Do not Build-Depend from imagemagick any more and simply provide the
+ BMP version of goldendict icon in the debian/ dir
+ * cdbs -> dh
-- Andreas Tille <tille at debian.org> Tue, 28 Jan 2014 13:59:14 +0100
Modified: packages/wordnet/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/control?rev=46503&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/control (original)
+++ packages/wordnet/trunk/debian/control Wed Jan 29 19:59:18 2014
@@ -4,10 +4,8 @@
Dmitry E. Oboukhov <unera at debian.org>
Section: text
Priority: optional
-Build-Depends: cdbs,
- autotools-dev,
+Build-Depends: autotools-dev,
debhelper (>= 9),
- quilt,
tk8.5-dev,
tcl8.5-dev,
libxaw7-dev,
@@ -22,8 +20,7 @@
man-db,
libxss-dev,
libxft-dev,
- ruby,
- imagemagick
+ ruby
Standards-Version: 3.9.5
Vcs-Browser: http://anonscm.debian.org/viewvc/debian-science/packages/wordnet/trunk/
Vcs-Svn: svn://anonscm.debian.org/debian-science/packages/wordnet/trunk/
Modified: packages/wordnet/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/copyright?rev=46503&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/copyright (original)
+++ packages/wordnet/trunk/debian/copyright Wed Jan 29 19:59:18 2014
@@ -39,6 +39,6 @@
Files: debian/*
Copyright: © 2001-2014 Andreas Tille <tille at debian.org>
License: GPL2+
- On Debian systems you can find the text of the GNU Public License
- version 2 at /usr/share/common-licenses/GPL-2.
+ On Debian systems you can find the text of the GNU General Public
+ License version 2 at /usr/share/common-licenses/GPL-2.
Added: packages/wordnet/trunk/debian/goldendict-wordnet.bmp
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/goldendict-wordnet.bmp?rev=46503&op=file
==============================================================================
Binary file - no diff available.
Propchange: packages/wordnet/trunk/debian/goldendict-wordnet.bmp
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: packages/wordnet/trunk/debian/goldendict-wordnet.install
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/goldendict-wordnet.install?rev=46503&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/goldendict-wordnet.install (original)
+++ packages/wordnet/trunk/debian/goldendict-wordnet.install Wed Jan 29 19:59:18 2014
@@ -1,3 +1,3 @@
-goldendict-wordnet.dsl.dz /usr/share/goldendict-wordnet/
-goldendict-wordnet_abrv.dsl /usr/share/goldendict-wordnet/
-goldendict-wordnet.bmp /usr/share/goldendict-wordnet/
+goldendict-wordnet.dsl.dz /usr/share/goldendict-wordnet/
+goldendict-wordnet_abrv.dsl /usr/share/goldendict-wordnet/
+debian/goldendict-wordnet.bmp /usr/share/goldendict-wordnet/
Modified: packages/wordnet/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/rules?rev=46503&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/rules (original)
+++ packages/wordnet/trunk/debian/rules Wed Jan 29 19:59:18 2014
@@ -1,31 +1,13 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+%:
+ dh $@ --with autotools_dev
-DEB_CONFIGURE_EXTRA_FLAGS := --with-tclconfig=/usr/lib/tcl8.5 --with-tkconfig=/usr/lib/tk8.5
+override_dh_auto_configure:
+ dh_auto_configure -- --with-tclconfig=/usr/lib/tcl8.5 --with-tkconfig=/usr/lib/tk8.5
-pkg=wordnet
-pkg-dev=$(pkg)-dev
-pkg-sense=$(pkg)-sense-index
-
-# DEB_INSTALL_DOCS_$(pkg) := --no-act
-DEB_INSTALL_DOCS_$(pkg-dev) := --no-act
-# DEB_INSTALL_DOCS_$(pkg-sense) := --no-act
-
-## Work with the patch for DEFAULTPATH
-## DEB_MAKE_ENVVARS := DEFAULTPATH="/usr/share/wordnet"
-## DEB_MAKEMAKER_USER_FLAGS := -DDEFAULTPATH="/usr/share/wordnet"
-
-#DEB_INSTALL_CHANGELOGS_$(pkg) := --no-act
-#DEB_INSTALL_CHANGELOGS_$(pkg-dev) := --no-act
-#DEB_INSTALL_CHANGELOGS_$(pkg-sense) := --no-act
-
-# Use xz compression.
-DEB_DH_BUILDDEB_ARGS := -u-Zxz
-
-clean::
+override_dh_auto_clean:
+ dh_auto_clean
if [ -d contrib/wordnet_structures -a -e contrib/wordnet_structures/Makefile ] ; then cd contrib/wordnet_structures; make clean; fi
rm -rf autom4te.cache
rm -rf src/grind/grind-wnparse.[ch] src/grind/grind-wnlex.c
@@ -34,8 +16,12 @@
rm -f goldendict-wordnet.dsl goldendict-wordnet.dsl.dz
rm -f goldendict-wordnet_abrv.dsl goldendict-wordnet.bmp
-build/goldendict-wordnet:: goldendict-wordnet.dsl.dz goldendict-wordnet_abrv.dsl
- convert debian/goldendict-wordnet.xpm goldendict-wordnet.bmp
+override_dh_auto_install-indep: goldendict-wordnet.dsl.dz goldendict-wordnet_abrv.dsl
+ dh_auto_install
+
+override_dh_auto_install-arch:
+ dh_auto_install
+ find debian -name "*.la" -delete
goldendict-wordnet_abrv.dsl: debian/goldendict-wordnet_abrv.dsl
perl -e 'print "\xff\xfe"' > $@
@@ -58,3 +44,4 @@
else \
ruby debian/wn-for-goldendict.rb > $@ || ($(RM) $@; false); \
fi
+
Modified: packages/wordnet/trunk/debian/source/include-binaries
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/source/include-binaries?rev=46503&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/source/include-binaries (original)
+++ packages/wordnet/trunk/debian/source/include-binaries Wed Jan 29 19:59:18 2014
@@ -1 +1,2 @@
debian/wn.png
+debian/goldendict-wordnet.bmp
More information about the debian-science-commits
mailing list