[med-svn] [Git][med-team/cycle][master] 7 commits: debhelper-compat 12

Andreas Tille gitlab at salsa.debian.org
Mon Sep 9 16:25:20 BST 2019



Andreas Tille pushed to branch master at Debian Med / cycle


Commits:
e8960411 by Andreas Tille at 2019-09-09T14:10:23Z
debhelper-compat 12

- - - - -
65b4553d by Andreas Tille at 2019-09-09T14:10:26Z
Standards-Version: 4.4.0

- - - - -
9709facc by Andreas Tille at 2019-09-09T14:10:28Z
Trim trailing whitespace.

Fixes lintian: file-contains-trailing-whitespace
See https://lintian.debian.org/tags/file-contains-trailing-whitespace.html for more details.

- - - - -
764c68ff by Andreas Tille at 2019-09-09T14:10:31Z
Use secure URI in debian/watch.

Fixes lintian: debian-watch-uses-insecure-uri
See https://lintian.debian.org/tags/debian-watch-uses-insecure-uri.html for more details.

- - - - -
613c75f4 by Andreas Tille at 2019-09-09T14:10:33Z
Set upstream metadata fields: Archive.

Fixes lintian: upstream-metadata-file-is-missing
See https://lintian.debian.org/tags/upstream-metadata-file-is-missing.html for more details.

- - - - -
097b77c1 by Andreas Tille at 2019-09-09T14:18:05Z
Switch build system to Python3

- - - - -
91a3da9f by Andreas Tille at 2019-09-09T14:38:41Z
Upload to unstable

- - - - -


6 changed files:

- debian/changelog
- − debian/compat
- debian/control
- debian/rules
- + debian/upstream/metadata
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,10 +1,15 @@
-cycle (0.3.1-15) UNRELEASED; urgency=medium
+cycle (0.3.1-15) unstable; urgency=medium
 
   * Team upload.
   * Use 2to3 to port to Python3
     Closes: #939181
+  * debhelper-compat 12
+  * Standards-Version: 4.4.0
+  * Trim trailing whitespace.
+  * Use secure URI in debian/watch.
+  * Set upstream metadata fields: Archive.
 
- -- Andreas Tille <tille at debian.org>  Fri, 06 Sep 2019 14:57:13 +0200
+ -- Andreas Tille <tille at debian.org>  Mon, 09 Sep 2019 16:37:24 +0200
 
 cycle (0.3.1-14) unstable; urgency=medium
 
@@ -227,4 +232,3 @@ cycle (0.3.0-1) unstable; urgency=low
     time a new user is created.
 
  -- Miriam Ruiz <little_miry at yahoo.es>  Mon,  4 Apr 2005 20:19:46 +0000
-


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11


=====================================
debian/control
=====================================
@@ -3,19 +3,19 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
 Uploaders: Miriam Ruiz <miriam at debian.org>
 Section: utils
 Priority: optional
-Build-Depends: debhelper (>= 11~)
-Build-Depends-Indep: python,
+Build-Depends: debhelper-compat (= 12)
+Build-Depends-Indep: python3,
                      dh-python
-Standards-Version: 4.3.0
+Standards-Version: 4.4.0
 Vcs-Browser: https://salsa.debian.org/med-team/cycle
 Vcs-Git: https://salsa.debian.org/med-team/cycle.git
 Homepage: http://cycle.sourceforge.net/
 
 Package: cycle
 Architecture: all
-Depends: python,
+Depends: ${python3:Depends},
          ${misc:Depends},
-         python-wxgtk3.0
+         python3-wxgtk4.0
 Description: calendar program for women
  Cycle is a calendar for women. Given a cycle length or statistics for
  several periods, it can calculate the days until menstruation, the days


=====================================
debian/rules
=====================================
@@ -4,7 +4,7 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@ --with python2
+	dh $@ --with python3 --buildsystem=pybuild
 
 override_dh_auto_build:
 	dh_auto_build
@@ -18,8 +18,5 @@ override_dh_install:
 	dh_install
 	cd debian/msg; make install DESTDIR=../cycle/usr/share/locale/
 
-override_dh_python2:
-	dh_python2
-	# the code is installed to /usr/share/cycle - no idea why there is a copy of the main program in /usr/lib/python2.7
-	rm -rf debian/*/usr/lib/python*
-	find debian -name "lib" -type d -empty | xargs rmdir
+override_dh_python3:
+	dh_python3 --no-ext-rename


=====================================
debian/upstream/metadata
=====================================
@@ -0,0 +1 @@
+Archive: SourceForge


=====================================
debian/watch
=====================================
@@ -1,2 +1,2 @@
 version=3
-http://sf.net/cycle/cycle-(.+)\.tar\.bz2
+https://sf.net/cycle/cycle-(.+)\.tar\.bz2



View it on GitLab: https://salsa.debian.org/med-team/cycle/compare/4409d6a6235345da4ed874a9593516683a2d0239...91a3da9f2a1c19ab89ad16e1834086c91ddee65e

-- 
View it on GitLab: https://salsa.debian.org/med-team/cycle/compare/4409d6a6235345da4ed874a9593516683a2d0239...91a3da9f2a1c19ab89ad16e1834086c91ddee65e
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20190909/23c71739/attachment-0001.html>


More information about the debian-med-commit mailing list