Browse Source

Update own dogfood

Alois Mahdal 7 years ago
parent
commit
a78a768661
2 changed files with 16 additions and 19 deletions
  1. 1
    1
      utils/mkit/include/vars.sh
  2. 15
    18
      utils/mkit/stub

+ 1
- 1
utils/mkit/include/vars.sh View File

58
 #
58
 #
59
 # This MKit version
59
 # This MKit version
60
 #
60
 #
61
-MKIT_VERSION=0.0.26+master.gd8016d5
61
+MKIT_VERSION=0.0.27+master.gfa49a61

+ 15
- 18
utils/mkit/stub View File

58
             echo "$any_name"
58
             echo "$any_name"
59
             tr -c '=\n' '=' <<<"$any_name"
59
             tr -c '=\n' '=' <<<"$any_name"
60
             echo ''
60
             echo ''
61
-            echo ''
62
             if test -n "$Tagline"; then
61
             if test -n "$Tagline"; then
63
                 echo "$Tagline"
62
                 echo "$Tagline"
64
             else
63
             else
136
             ;;
135
             ;;
137
 
136
 
138
         packaging/template.spec)
137
         packaging/template.spec)
139
-            echo 'Name:     __MKIT_PROJ_PKGNAME__'
140
-            echo 'Version:  __MKIT_PROJ_VERSION__'
141
-            echo 'Release:  1%{?dist}'
142
-            echo 'Summary:  __MKIT_PROJ_NAME__ - __MKIT_PROJ_TAGLINE__'
143
-            $MkLicense && echo "License:  $License"
138
+            echo 'Name:       __MKIT_PROJ_PKGNAME__'
139
+            echo 'Version:    __MKIT_PROJ_VERSION__'
140
+            echo 'Release:    1%{?dist}'
141
+            echo 'Summary:    __MKIT_PROJ_NAME__ - __MKIT_PROJ_TAGLINE__'
142
+            test -n "$VcsBrowser" && echo 'URL:        __MKIT_PROJ_VCS_BROWSER__'
143
+            $MkLicense && echo "License:    $License"
144
             echo ''
144
             echo ''
145
-            echo 'Source0:       %{name}-%{version}.tar.gz'
146
-            echo 'BuildArch:     noarch'
145
+            echo 'Source0:    %{name}-%{version}.tar.gz'
146
+            echo 'BuildArch:  noarch'
147
             echo ''
147
             echo ''
148
             echo 'Requires: MKIT_STUB_REQUIRES'
148
             echo 'Requires: MKIT_STUB_REQUIRES'
149
             echo '%description'
149
             echo '%description'
210
             echo 'override_dh_auto_install:'
210
             echo 'override_dh_auto_install:'
211
             echo ''
211
             echo ''
212
             echo '	make install PREFIX=/usr DESTDIR=debian/tmp'
212
             echo '	make install PREFIX=/usr DESTDIR=debian/tmp'
213
-            echo ''
214
-            echo 'override_dh_usrlocal:'
215
-            echo ''
216
-            echo '	@true'
217
             ;;
213
             ;;
218
 
214
 
219
         packaging/debian/source/format)
215
         packaging/debian/source/format)
220
             echo '3.0 (quilt)'
216
             echo '3.0 (quilt)'
221
             ;;
217
             ;;
222
 
218
 
223
-        packaging/debian/*.install)
219
+        packaging/debian/install)
224
             echo MKIT_STUB_FILELIST
220
             echo MKIT_STUB_FILELIST
225
             ;;
221
             ;;
226
 
222
 
330
             echo "     *  \`MKIT_STUB_FILELIST\` - List of full paths to"
326
             echo "     *  \`MKIT_STUB_FILELIST\` - List of full paths to"
331
             echo "        your files after installation."
327
             echo "        your files after installation."
332
             echo ""
328
             echo ""
333
-            echo "        Note that in case of debian/package.install files,"
334
-            echo "        PREFIX based paths (eg. /usr/bin) in this file should"
335
-            echo "        should be as if PREFIX was /usr."
329
+            echo "        Note that in case of debian/install files, PREFIX"
330
+            echo "        based paths (eg. /usr/bin) in this file should be as"
331
+            echo "        if PREFIX was /usr."
336
             echo ""
332
             echo ""
337
             echo "        In case of Fedora-based distro, you should make use"
333
             echo "        In case of Fedora-based distro, you should make use"
338
             echo "        of RPM macros:"
334
             echo "        of RPM macros:"
563
     deploy packaging/debian/control
559
     deploy packaging/debian/control
564
     deploy packaging/debian/changelog
560
     deploy packaging/debian/changelog
565
     deploy packaging/debian/compat
561
     deploy packaging/debian/compat
562
+    deploy packaging/debian/install
566
     deploy packaging/debian/rules
563
     deploy packaging/debian/rules
567
     deploy packaging/debian/source/format
564
     deploy packaging/debian/source/format
568
-    deploy packaging/debian/"$PackageName".install
569
 }
565
 }
570
 
566
 
571
 init_from_existing() {
567
 init_from_existing() {
644
         }
640
         }
645
         echo "$key = $value"
641
         echo "$key = $value"
646
     done \
642
     done \
647
-      | column -to' ' \
643
+      | sed 's/ *= */=/; s/^ *//; s/ *$//' \
644
+      | column -t -s= -o' = ' \
648
       | sed 's/^/    /'
645
       | sed 's/^/    /'
649
 }
646
 }
650
 
647